diff --git a/configs/core/holoiso/README.md b/configs/core/holoiso/README.md deleted file mode 100644 index 868ccf86a..000000000 --- a/configs/core/holoiso/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Holoiso - -This configuration package enables [Holoiso] running in Skiff Core. - -It is intended to be used with the Steam Deck but can also be run elsewhere. - -```sh -$ export SKIFF_CONFIG=valve/deck,core/holoiso -$ make configure # configure the system -$ make compile # build the system -``` - -See the [valve/deck] docs for more information. - -[Holoiso]: https://github.com/theVakhovskeIsTaken/holoiso -[valve/deck]: ../../valve/deck diff --git a/configs/core/holoiso/buildroot/core b/configs/core/holoiso/buildroot/core deleted file mode 100644 index 7526be805..000000000 --- a/configs/core/holoiso/buildroot/core +++ /dev/null @@ -1 +0,0 @@ -BR2_PACKAGE_SKIFF_CORE_HOLOISO=y diff --git a/configs/core/holoiso/buildroot_ext/Config.in b/configs/core/holoiso/buildroot_ext/Config.in deleted file mode 100644 index 1be183878..000000000 --- a/configs/core/holoiso/buildroot_ext/Config.in +++ /dev/null @@ -1 +0,0 @@ -source "$BR2_EXTERNAL_CORE_HOLOISO_PATH/package/skiff-core-holoiso/Config.in" diff --git a/configs/core/holoiso/buildroot_ext/external.desc b/configs/core/holoiso/buildroot_ext/external.desc deleted file mode 100644 index ab269b73b..000000000 --- a/configs/core/holoiso/buildroot_ext/external.desc +++ /dev/null @@ -1,2 +0,0 @@ -name: CORE_HOLOISO -desc: Contains packages for skiff-core-holoiso. diff --git a/configs/core/holoiso/buildroot_ext/external.mk b/configs/core/holoiso/buildroot_ext/external.mk deleted file mode 100644 index 2366bf1be..000000000 --- a/configs/core/holoiso/buildroot_ext/external.mk +++ /dev/null @@ -1 +0,0 @@ -include $(sort $(wildcard $(BR2_EXTERNAL_CORE_HOLOISO_PATH)/package/*/*.mk)) diff --git a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/Config.in b/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/Config.in deleted file mode 100644 index bc8268920..000000000 --- a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_SKIFF_CORE_HOLOISO - bool "skiff-core-holoiso" - select BR2_PACKAGE_SKIFF_CORE - select BR2_PACKAGE_SKIFF_CORE_DEFCONFIG - help - Skiff Core environment with Holoiso for Steam Deck. - - https://github.com/theVakhovskeIsTaken/holoiso diff --git a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv-defconfig.yaml b/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv-defconfig.yaml deleted file mode 100644 index c59a1d7f2..000000000 --- a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv-defconfig.yaml +++ /dev/null @@ -1,51 +0,0 @@ -containers: - core: - image: skiffos/skiff-core-holoiso:latest - # systemd - entrypoint: ["/lib/systemd/systemd"] - env: - - "container=docker" - stopSignal: RTMIN+3 - tty: false - disableInit: true - workingDirectory: / - entrypoint: ["/lib/systemd/systemd"] - mounts: - - /dev:/dev - - /etc/hostname:/etc/hostname:ro - - /lib/modules:/lib/modules:ro - - /run/udev:/run/udev - - /mnt:/mnt - - /mnt/persist/holo:/home - - /mnt/persist/skiff/core/repos/tmp:/var/tmp - - /mnt/persist/skiff/core/repos/docker:/var/lib/docker - - /mnt/persist/skiff/core/repos/flatpak:/var/lib/flatpak - - /mnt/persist/skiff/core/repos/pacman:/var/cache/pacman - - /mnt/persist/skiff/core/repos/log:/var/log - privileged: true - startAfterCreate: true - restartPolicy: "always" - capAdd: - - ALL - hostIPC: true - hostUTS: true - hostNetwork: true - securityOpt: - - seccomp=unconfined - tmpFs: - /run: rw,noexec,nosuid,size=65536k - /run/lock: rw,noexec,nosuid,size=65536k -users: - core: - container: core - containerUser: core - containerShell: - - "/bin/bash" - auth: - copyRootKeys: true -images: - skiffos/skiff-core-holoiso:latest: - # https://github.com/theVakhovskeIsTaken/holoiso - pull: - policy: ifnotexists - registry: quay.io diff --git a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/Dockerfile b/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/Dockerfile deleted file mode 100644 index b0441e68d..000000000 --- a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/Dockerfile +++ /dev/null @@ -1,85 +0,0 @@ -# Imported from the holoiso release: -# losetup /dev/loop1 holoiso.iso -# partprobe /dev/loop1 -# mkdir mtpt iso -# mount /dev/loop1p1 ./mtpt -# unsquashfs ./mtpt/arch/x86_64/airootfs.sfs -# umount ./mtpt -# rmdir mtpt -# losetup -d /dev/loop1 -# cd ./squashfs-root/ -# tar -c . | docker import - skiffos/skiff-core-holoiso:base -FROM quay.io/skiffos/skiff-core-holoiso:base as stage1 - -# setup environment -ENV container=docker - -# update packages and add vim -RUN \ - echo "# " > /etc/fstab && \ - pacman --noconfirm -Syu vi \ - vim \ - sudo \ - base-devel \ - curl \ - git \ - htop \ - less \ - nano \ - net-tools \ - openssh \ - rsync \ - systemd \ - unzip \ - usbutils \ - wget \ - x11vnc \ - && rm -rf /var/cache/* - -RUN systemctl set-default graphical.target && \ - systemctl mask zswap.service NetworkManager.service firewalld.service console-getty.service \ - udisks2-zram-setup@.service udisks2-zram-setup@zram0.service cups.service cups.path cups.socket \ - systemd-firstboot.service systemd-remount-fs.service sdcard-mount@mmcblk0p1.service obex.service && \ - rm -rf /etc/sddm.conf.d && \ - mkdir -p /etc/skiffos /etc/sddm.conf.d && \ - rm -f /usr/bin/holoiso-firstboot-config - -# Add skiff core user. -RUN useradd -m core && \ - usermod -a -G wheel,rfkill core && \ - passwd -d core && \ - printf "# skiff core user\ncore ALL=(ALL) NOPASSWD: ALL\n" > \ - /etc/sudoers.d/10-skiff-core && \ - chmod 0400 /etc/sudoers.d/10-skiff-core && \ - visudo -c -f /etc/sudoers.d/10-skiff-core - -# Add startup script. -ADD init-skiff-core-holoiso.sh /etc/skiffos/init-skiff-core-holoiso.sh -ADD init-skiff-core-holoiso.service /etc/systemd/system/init-skiff-core-holoiso.service - -# Add autologin. -ADD autologin.conf /etc/sddm.conf.d/autologin.conf - -# Move the steam shortcuts to the desktop. -# Remove the entire "liveuser" user as well. -# Remove the install.desktop from the skel. -RUN \ - chmod +x /etc/skiffos/init-skiff-core-holoiso.sh && \ - systemctl enable init-skiff-core-holoiso.service && \ - userdel liveuser && \ - rm -rf /home/liveuser && \ - rm -f /usr/bin/holoiso-firstboot-config && \ - rm -f /etc/xdg/autostart/desktopshortcuts.desktop && \ - rm -f /etc/skel/Desktop/install.desktop && \ - cp /etc/holoinstall/post_install_shortcuts/steamos-gamemode.desktop \ - /etc/skel/Desktop && \ - ln -s /usr/share/applications/steam.desktop /etc/skel/Desktop/steam.desktop && \ - touch /etc/holoiso-oobe - -# minimize image size by squashing OS to 1 layer. -# FROM scratch -# ENV container=docker -# COPY --from=stage1 / / - -WORKDIR / -ENTRYPOINT ["/lib/systemd/systemd"] diff --git a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/autologin.conf b/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/autologin.conf deleted file mode 100644 index 074d50b89..000000000 --- a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/autologin.conf +++ /dev/null @@ -1,12 +0,0 @@ -[General] -DisplayServer=wayland - -[Autologin] -User=core -Session=gamescope-wayland.desktop -Relogin=true - -[X11] -# Janky workaround for wayland sessions not stopping in sddm, kills -# all active sddm-helper sessions on teardown -DisplayStopCommand=/usr/bin/gamescope-wayland-teardown-workaround diff --git a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/init-skiff-core-holoiso.service b/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/init-skiff-core-holoiso.service deleted file mode 100644 index acf88f010..000000000 --- a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/init-skiff-core-holoiso.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Initialize holoiso core user -DefaultDependencies=no -Before=basic.target - -[Service] -Type=oneshot -ExecStart=/etc/skiffos/init-skiff-core-holoiso.sh -RemainAfterExit=true -StandardOutput=journal -TimeoutStartSec=120 - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/init-skiff-core-holoiso.sh b/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/init-skiff-core-holoiso.sh deleted file mode 100644 index 9d752f3cc..000000000 --- a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/coreenv/init-skiff-core-holoiso.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -eo pipefail - -if [ ! -f /etc/holoiso-branch ]; then - echo "Non-holoiso machine detected! Exiting." - echo "This is meant to be run in the skiff-core-holoiso image." - exit 1 -fi - -mkdir -p /home/core -chown core:core /home/core -if [ ! -d /home/core/Desktop ]; then - echo "copying skeleton to /home/core" - rsync -ra --chown core:core /etc/skel/ /home/core/ -fi diff --git a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/skiff-core-holoiso.mk b/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/skiff-core-holoiso.mk deleted file mode 100644 index e6c64f1bd..000000000 --- a/configs/core/holoiso/buildroot_ext/package/skiff-core-holoiso/skiff-core-holoiso.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# skiff-core-holoiso -# -################################################################################ - -SKIFF_CORE_HOLOISO_DEPENDENCIES = skiff-core skiff-core-defconfig - -define SKIFF_CORE_HOLOISO_INSTALL_COREENV - mkdir -p $(TARGET_DIR)/opt/skiff/coreenv/skiff-core-holoiso - cp -r $(SKIFF_CORE_HOLOISO_PKGDIR)/coreenv/* $(TARGET_DIR)/opt/skiff/coreenv/skiff-core-holoiso/ - $(INSTALL) -m 0644 $(SKIFF_CORE_HOLOISO_PKGDIR)/coreenv-defconfig.yaml \ - $(TARGET_DIR)/opt/skiff/coreenv/defconfig.yaml - touch $(TARGET_DIR)/opt/skiff/coreenv/.overridden -endef - -SKIFF_CORE_HOLOISO_POST_INSTALL_TARGET_HOOKS += SKIFF_CORE_HOLOISO_INSTALL_COREENV - -$(eval $(generic-package)) diff --git a/configs/core/holoiso/metadata/dependencies b/configs/core/holoiso/metadata/dependencies deleted file mode 100644 index 97cb220dd..000000000 --- a/configs/core/holoiso/metadata/dependencies +++ /dev/null @@ -1 +0,0 @@ -skiff/core diff --git a/configs/core/holoiso/metadata/unlisted b/configs/core/holoiso/metadata/unlisted deleted file mode 100644 index e69de29bb..000000000