From 462c2d519d66aa06b28569d9ac6a46ea81a4aeee Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 1 Aug 2023 19:55:25 -0600 Subject: [PATCH] feat: Separate DE specific config from shared config --- Containerfile | 26 ++++++++++++++++-- .../bin/gamescope-wayland-teardown-workaround | 0 .../usr/bin/startplasma-steamos-oneshot | 0 .../{ => kde}/usr/bin/steamos-session-select | 0 .../plasma-steamos-wayland-oneshot.desktop | 0 .../xsessions/plasma-steamos-oneshot.desktop | 0 .../deck/{ => shared}/etc/bluetooth/main.conf | 0 .../deck/{ => shared}/etc/chrony.conf | 0 .../deck/{ => shared}/etc/default/deckswap | 0 .../deck/{ => shared}/etc/default/ryzenadj | 0 .../{ => shared}/etc/default/steamos-btrfs | 0 .../etc/pipewire/99-input-denoising.conf | 0 .../polkit-1/rules.d/40-system-tweaks.rules | 0 .../etc/polkit-1/rules.d/60-dmidecode.rules | 0 .../etc/sddm.conf.d/virtualkbd.conf | 0 .../{ => shared}/etc/sysctl.d/10-memory.conf | 0 .../etc/system76-scheduler/config.kdl | 0 .../00-journal-persistent.conf | 0 .../journald.conf.d/00-journal-size.conf | 0 .../logind.conf.d/killuserprocesses.conf | 0 .../etc/systemd/resolved.conf.conf | 0 .../{ => shared}/etc/systemd/system/ac.target | 0 .../etc/systemd/system/battery.target | 0 .../etc/systemd/system/deckswap.service | 0 .../etc/systemd/system/ryzenadj.service | 0 .../etc/systemd/zram-generator.conf | 0 .../etc/udev/rules.d/30-steamdeck.rules | 0 .../etc/udev/rules.d/60-schedulers.rules | 0 .../etc/udev/rules.d/99-powertargets.rules | 0 .../{ => shared}/usr/bin/gamescope-autologin | 0 .../deck/{ => shared}/usr/bin/steamos-logger | 0 .../deck/{ => shared}/usr/bin/steamos-update | 0 .../system/gamescope-autologin.service | 0 .../lib/tmpfiles.d/dmi-product-serial.conf | 0 .../share/polkit-1/actions/org.bazzite.policy | 0 .../actions/org.chimeraos.host.policy | 0 .../actions/org.chimeraos.priv.write.policy | 0 .../org.chimeraos.session.select.policy | 0 .../usr/share/ublue-os/bazzite/neofetch.conf | 0 .../ublue-os/firstboot/launcher/autostart.sh | 0 .../usr/share/ublue-os/firstboot/yafti.yml | 0 .../usr/share/ublue-os/just/custom.just | 0 .../usr/share/ublue-os/bazzite/vapor.json | 0 .../usr/share/ublue-os/bazzite/vgui2.json | 0 .../com.system76.Scheduler.dbusproxy.service | 0 .../{ => kde}/usr/bin/plasma-autologin | 0 .../usr/bin/system76-scheduler-dbus-proxy | 0 .../systemd/system/plasma-autologin.service | 0 .../{ => shared}/etc/default/duperemove | 0 .../desktop/{ => shared}/etc/environment | 0 .../desktop/{ => shared}/etc/flatpak/deck | 0 .../desktop/{ => shared}/etc/flatpak/install | 0 .../etc/polkit-1/rules.d/90-corectrl.rules | 0 .../{ => shared}/etc/profile.d/askpass.sh | 0 .../{ => shared}/etc/profile.d/neofetch.sh | 0 .../desktop/{ => shared}/etc/sddm.conf | 0 .../{ => shared}/etc/sysctl.d/10-memory.conf | 0 .../{ => shared}/etc/sysctl.d/20-gaming.conf | 0 .../etc/sysctl.d/30-networking.conf | 0 .../{ => shared}/etc/sysctl.d/40-inotify.conf | 0 .../systemd/system/duperemove-weekly@.timer | 0 .../etc/systemd/system/duperemove@.service | 0 .../system/flatpak-system-install.service | 0 .../etc/systemd/zram-generator.conf | 0 .../update.d/99-bazzite-arch-user-update.sh | 0 .../usr/bin/ublue-flatpak-system-install | 0 .../applications/org.mozilla.firefox.desktop | 0 .../hicolor/scalable/apps/install-firefox.svg | 0 .../usr/share/ublue-os/bazzite/logo.svg | 0 .../usr/share/ublue-os/bazzite/logo.txt | 0 .../usr/share/ublue-os/bazzite/neofetch.conf | 0 .../usr/share/ublue-os/distrobox/bazzite-arch | 0 .../ublue-os/distrobox/bazzite-arch-nvidia | 0 .../firstboot/launcher/autostart.desktop | 0 .../ublue-os/firstboot/launcher/autostart.sh | 0 .../firstboot/launcher/login-profile.sh | 0 .../usr/share/ublue-os/firstboot/yafti.yml | 0 .../usr/share/ublue-os/just/custom.just | 0 .../usr/share/wallpapers/VGUI2.jpg | Bin 79 files changed, 23 insertions(+), 3 deletions(-) rename system_files/deck/{ => kde}/usr/bin/gamescope-wayland-teardown-workaround (100%) rename system_files/deck/{ => kde}/usr/bin/startplasma-steamos-oneshot (100%) rename system_files/deck/{ => kde}/usr/bin/steamos-session-select (100%) rename system_files/deck/{ => kde}/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop (100%) rename system_files/deck/{ => kde}/usr/share/xsessions/plasma-steamos-oneshot.desktop (100%) rename system_files/deck/{ => shared}/etc/bluetooth/main.conf (100%) rename system_files/deck/{ => shared}/etc/chrony.conf (100%) rename system_files/deck/{ => shared}/etc/default/deckswap (100%) rename system_files/deck/{ => shared}/etc/default/ryzenadj (100%) rename system_files/deck/{ => shared}/etc/default/steamos-btrfs (100%) rename system_files/deck/{ => shared}/etc/pipewire/99-input-denoising.conf (100%) rename system_files/deck/{ => shared}/etc/polkit-1/rules.d/40-system-tweaks.rules (100%) rename system_files/deck/{ => shared}/etc/polkit-1/rules.d/60-dmidecode.rules (100%) rename system_files/deck/{ => shared}/etc/sddm.conf.d/virtualkbd.conf (100%) rename system_files/deck/{ => shared}/etc/sysctl.d/10-memory.conf (100%) rename system_files/deck/{ => shared}/etc/system76-scheduler/config.kdl (100%) rename system_files/deck/{ => shared}/etc/systemd/journald.conf.d/00-journal-persistent.conf (100%) rename system_files/deck/{ => shared}/etc/systemd/journald.conf.d/00-journal-size.conf (100%) rename system_files/deck/{ => shared}/etc/systemd/logind.conf.d/killuserprocesses.conf (100%) rename system_files/deck/{ => shared}/etc/systemd/resolved.conf.conf (100%) rename system_files/deck/{ => shared}/etc/systemd/system/ac.target (100%) rename system_files/deck/{ => shared}/etc/systemd/system/battery.target (100%) rename system_files/deck/{ => shared}/etc/systemd/system/deckswap.service (100%) rename system_files/deck/{ => shared}/etc/systemd/system/ryzenadj.service (100%) rename system_files/deck/{ => shared}/etc/systemd/zram-generator.conf (100%) rename system_files/deck/{ => shared}/etc/udev/rules.d/30-steamdeck.rules (100%) rename system_files/deck/{ => shared}/etc/udev/rules.d/60-schedulers.rules (100%) rename system_files/deck/{ => shared}/etc/udev/rules.d/99-powertargets.rules (100%) rename system_files/deck/{ => shared}/usr/bin/gamescope-autologin (100%) rename system_files/deck/{ => shared}/usr/bin/steamos-logger (100%) rename system_files/deck/{ => shared}/usr/bin/steamos-update (100%) rename system_files/deck/{ => shared}/usr/lib/systemd/system/gamescope-autologin.service (100%) rename system_files/deck/{ => shared}/usr/lib/tmpfiles.d/dmi-product-serial.conf (100%) rename system_files/deck/{ => shared}/usr/share/polkit-1/actions/org.bazzite.policy (100%) rename system_files/deck/{ => shared}/usr/share/polkit-1/actions/org.chimeraos.host.policy (100%) rename system_files/deck/{ => shared}/usr/share/polkit-1/actions/org.chimeraos.priv.write.policy (100%) rename system_files/deck/{ => shared}/usr/share/polkit-1/actions/org.chimeraos.session.select.policy (100%) rename system_files/deck/{ => shared}/usr/share/ublue-os/bazzite/neofetch.conf (100%) rename system_files/deck/{ => shared}/usr/share/ublue-os/firstboot/launcher/autostart.sh (100%) rename system_files/deck/{ => shared}/usr/share/ublue-os/firstboot/yafti.yml (100%) rename system_files/deck/{ => shared}/usr/share/ublue-os/just/custom.just (100%) rename system_files/desktop/{ => gnome}/usr/share/ublue-os/bazzite/vapor.json (100%) rename system_files/desktop/{ => gnome}/usr/share/ublue-os/bazzite/vgui2.json (100%) rename system_files/desktop/{ => kde}/etc/systemd/user/com.system76.Scheduler.dbusproxy.service (100%) rename system_files/desktop/{ => kde}/usr/bin/plasma-autologin (100%) rename system_files/desktop/{ => kde}/usr/bin/system76-scheduler-dbus-proxy (100%) rename system_files/desktop/{ => kde}/usr/lib/systemd/system/plasma-autologin.service (100%) rename system_files/desktop/{ => shared}/etc/default/duperemove (100%) rename system_files/desktop/{ => shared}/etc/environment (100%) rename system_files/desktop/{ => shared}/etc/flatpak/deck (100%) rename system_files/desktop/{ => shared}/etc/flatpak/install (100%) rename system_files/desktop/{ => shared}/etc/polkit-1/rules.d/90-corectrl.rules (100%) rename system_files/desktop/{ => shared}/etc/profile.d/askpass.sh (100%) rename system_files/desktop/{ => shared}/etc/profile.d/neofetch.sh (100%) rename system_files/desktop/{ => shared}/etc/sddm.conf (100%) rename system_files/desktop/{ => shared}/etc/sysctl.d/10-memory.conf (100%) rename system_files/desktop/{ => shared}/etc/sysctl.d/20-gaming.conf (100%) rename system_files/desktop/{ => shared}/etc/sysctl.d/30-networking.conf (100%) rename system_files/desktop/{ => shared}/etc/sysctl.d/40-inotify.conf (100%) rename system_files/desktop/{ => shared}/etc/systemd/system/duperemove-weekly@.timer (100%) rename system_files/desktop/{ => shared}/etc/systemd/system/duperemove@.service (100%) rename system_files/desktop/{ => shared}/etc/systemd/system/flatpak-system-install.service (100%) rename system_files/desktop/{ => shared}/etc/systemd/zram-generator.conf (100%) rename system_files/desktop/{ => shared}/etc/update.d/99-bazzite-arch-user-update.sh (100%) rename system_files/desktop/{ => shared}/usr/bin/ublue-flatpak-system-install (100%) rename system_files/desktop/{ => shared}/usr/share/applications/org.mozilla.firefox.desktop (100%) rename system_files/desktop/{ => shared}/usr/share/icons/hicolor/scalable/apps/install-firefox.svg (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/bazzite/logo.svg (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/bazzite/logo.txt (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/bazzite/neofetch.conf (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/distrobox/bazzite-arch (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/distrobox/bazzite-arch-nvidia (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/firstboot/launcher/autostart.desktop (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/firstboot/launcher/autostart.sh (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/firstboot/launcher/login-profile.sh (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/firstboot/yafti.yml (100%) rename system_files/desktop/{ => shared}/usr/share/ublue-os/just/custom.just (100%) rename system_files/desktop/{ => shared}/usr/share/wallpapers/VGUI2.jpg (100%) diff --git a/Containerfile b/Containerfile index 4ec17570..85aeeb19 100644 --- a/Containerfile +++ b/Containerfile @@ -9,7 +9,17 @@ FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite ARG IMAGE_NAME="${IMAGE_NAME}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" -COPY system_files/desktop / +COPY system_files/desktop/shared / + +COPY system_files/desktop/gnome /tmp/gnome +RUN if grep "gnome" <<< "${IMAGE_NAME}"; then \ + cp -rf /tmp/gnome/* / \ +; fi + +COPY system_files/desktop/kde /tmp/kde +RUN if grep -v "gnome" <<< "${IMAGE_NAME}"; then \ + cp -rf /tmp/kde/* / \ +; fi # Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms @@ -131,8 +141,18 @@ FROM bazzite as bazzite-deck ARG IMAGE_NAME="${IMAGE_NAME}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" -COPY system_files/deck / - +COPY system_files/deck/shared / + +COPY system_files/deck/gnome /tmp/gnome +RUN if grep "gnome" <<< "${IMAGE_NAME}"; then \ + cp -rf /tmp/gnome/* / \ +; fi + +COPY system_files/deck/kde /tmp/kde +RUN if grep -v "gnome" <<< "${IMAGE_NAME}"; then \ + cp -rf /tmp/kde/* / \ +; fi + # Setup Copr repos RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-multilib-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ diff --git a/system_files/deck/usr/bin/gamescope-wayland-teardown-workaround b/system_files/deck/kde/usr/bin/gamescope-wayland-teardown-workaround similarity index 100% rename from system_files/deck/usr/bin/gamescope-wayland-teardown-workaround rename to system_files/deck/kde/usr/bin/gamescope-wayland-teardown-workaround diff --git a/system_files/deck/usr/bin/startplasma-steamos-oneshot b/system_files/deck/kde/usr/bin/startplasma-steamos-oneshot similarity index 100% rename from system_files/deck/usr/bin/startplasma-steamos-oneshot rename to system_files/deck/kde/usr/bin/startplasma-steamos-oneshot diff --git a/system_files/deck/usr/bin/steamos-session-select b/system_files/deck/kde/usr/bin/steamos-session-select similarity index 100% rename from system_files/deck/usr/bin/steamos-session-select rename to system_files/deck/kde/usr/bin/steamos-session-select diff --git a/system_files/deck/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop b/system_files/deck/kde/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop similarity index 100% rename from system_files/deck/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop rename to system_files/deck/kde/usr/share/wayland-sessions/plasma-steamos-wayland-oneshot.desktop diff --git a/system_files/deck/usr/share/xsessions/plasma-steamos-oneshot.desktop b/system_files/deck/kde/usr/share/xsessions/plasma-steamos-oneshot.desktop similarity index 100% rename from system_files/deck/usr/share/xsessions/plasma-steamos-oneshot.desktop rename to system_files/deck/kde/usr/share/xsessions/plasma-steamos-oneshot.desktop diff --git a/system_files/deck/etc/bluetooth/main.conf b/system_files/deck/shared/etc/bluetooth/main.conf similarity index 100% rename from system_files/deck/etc/bluetooth/main.conf rename to system_files/deck/shared/etc/bluetooth/main.conf diff --git a/system_files/deck/etc/chrony.conf b/system_files/deck/shared/etc/chrony.conf similarity index 100% rename from system_files/deck/etc/chrony.conf rename to system_files/deck/shared/etc/chrony.conf diff --git a/system_files/deck/etc/default/deckswap b/system_files/deck/shared/etc/default/deckswap similarity index 100% rename from system_files/deck/etc/default/deckswap rename to system_files/deck/shared/etc/default/deckswap diff --git a/system_files/deck/etc/default/ryzenadj b/system_files/deck/shared/etc/default/ryzenadj similarity index 100% rename from system_files/deck/etc/default/ryzenadj rename to system_files/deck/shared/etc/default/ryzenadj diff --git a/system_files/deck/etc/default/steamos-btrfs b/system_files/deck/shared/etc/default/steamos-btrfs similarity index 100% rename from system_files/deck/etc/default/steamos-btrfs rename to system_files/deck/shared/etc/default/steamos-btrfs diff --git a/system_files/deck/etc/pipewire/99-input-denoising.conf b/system_files/deck/shared/etc/pipewire/99-input-denoising.conf similarity index 100% rename from system_files/deck/etc/pipewire/99-input-denoising.conf rename to system_files/deck/shared/etc/pipewire/99-input-denoising.conf diff --git a/system_files/deck/etc/polkit-1/rules.d/40-system-tweaks.rules b/system_files/deck/shared/etc/polkit-1/rules.d/40-system-tweaks.rules similarity index 100% rename from system_files/deck/etc/polkit-1/rules.d/40-system-tweaks.rules rename to system_files/deck/shared/etc/polkit-1/rules.d/40-system-tweaks.rules diff --git a/system_files/deck/etc/polkit-1/rules.d/60-dmidecode.rules b/system_files/deck/shared/etc/polkit-1/rules.d/60-dmidecode.rules similarity index 100% rename from system_files/deck/etc/polkit-1/rules.d/60-dmidecode.rules rename to system_files/deck/shared/etc/polkit-1/rules.d/60-dmidecode.rules diff --git a/system_files/deck/etc/sddm.conf.d/virtualkbd.conf b/system_files/deck/shared/etc/sddm.conf.d/virtualkbd.conf similarity index 100% rename from system_files/deck/etc/sddm.conf.d/virtualkbd.conf rename to system_files/deck/shared/etc/sddm.conf.d/virtualkbd.conf diff --git a/system_files/deck/etc/sysctl.d/10-memory.conf b/system_files/deck/shared/etc/sysctl.d/10-memory.conf similarity index 100% rename from system_files/deck/etc/sysctl.d/10-memory.conf rename to system_files/deck/shared/etc/sysctl.d/10-memory.conf diff --git a/system_files/deck/etc/system76-scheduler/config.kdl b/system_files/deck/shared/etc/system76-scheduler/config.kdl similarity index 100% rename from system_files/deck/etc/system76-scheduler/config.kdl rename to system_files/deck/shared/etc/system76-scheduler/config.kdl diff --git a/system_files/deck/etc/systemd/journald.conf.d/00-journal-persistent.conf b/system_files/deck/shared/etc/systemd/journald.conf.d/00-journal-persistent.conf similarity index 100% rename from system_files/deck/etc/systemd/journald.conf.d/00-journal-persistent.conf rename to system_files/deck/shared/etc/systemd/journald.conf.d/00-journal-persistent.conf diff --git a/system_files/deck/etc/systemd/journald.conf.d/00-journal-size.conf b/system_files/deck/shared/etc/systemd/journald.conf.d/00-journal-size.conf similarity index 100% rename from system_files/deck/etc/systemd/journald.conf.d/00-journal-size.conf rename to system_files/deck/shared/etc/systemd/journald.conf.d/00-journal-size.conf diff --git a/system_files/deck/etc/systemd/logind.conf.d/killuserprocesses.conf b/system_files/deck/shared/etc/systemd/logind.conf.d/killuserprocesses.conf similarity index 100% rename from system_files/deck/etc/systemd/logind.conf.d/killuserprocesses.conf rename to system_files/deck/shared/etc/systemd/logind.conf.d/killuserprocesses.conf diff --git a/system_files/deck/etc/systemd/resolved.conf.conf b/system_files/deck/shared/etc/systemd/resolved.conf.conf similarity index 100% rename from system_files/deck/etc/systemd/resolved.conf.conf rename to system_files/deck/shared/etc/systemd/resolved.conf.conf diff --git a/system_files/deck/etc/systemd/system/ac.target b/system_files/deck/shared/etc/systemd/system/ac.target similarity index 100% rename from system_files/deck/etc/systemd/system/ac.target rename to system_files/deck/shared/etc/systemd/system/ac.target diff --git a/system_files/deck/etc/systemd/system/battery.target b/system_files/deck/shared/etc/systemd/system/battery.target similarity index 100% rename from system_files/deck/etc/systemd/system/battery.target rename to system_files/deck/shared/etc/systemd/system/battery.target diff --git a/system_files/deck/etc/systemd/system/deckswap.service b/system_files/deck/shared/etc/systemd/system/deckswap.service similarity index 100% rename from system_files/deck/etc/systemd/system/deckswap.service rename to system_files/deck/shared/etc/systemd/system/deckswap.service diff --git a/system_files/deck/etc/systemd/system/ryzenadj.service b/system_files/deck/shared/etc/systemd/system/ryzenadj.service similarity index 100% rename from system_files/deck/etc/systemd/system/ryzenadj.service rename to system_files/deck/shared/etc/systemd/system/ryzenadj.service diff --git a/system_files/deck/etc/systemd/zram-generator.conf b/system_files/deck/shared/etc/systemd/zram-generator.conf similarity index 100% rename from system_files/deck/etc/systemd/zram-generator.conf rename to system_files/deck/shared/etc/systemd/zram-generator.conf diff --git a/system_files/deck/etc/udev/rules.d/30-steamdeck.rules b/system_files/deck/shared/etc/udev/rules.d/30-steamdeck.rules similarity index 100% rename from system_files/deck/etc/udev/rules.d/30-steamdeck.rules rename to system_files/deck/shared/etc/udev/rules.d/30-steamdeck.rules diff --git a/system_files/deck/etc/udev/rules.d/60-schedulers.rules b/system_files/deck/shared/etc/udev/rules.d/60-schedulers.rules similarity index 100% rename from system_files/deck/etc/udev/rules.d/60-schedulers.rules rename to system_files/deck/shared/etc/udev/rules.d/60-schedulers.rules diff --git a/system_files/deck/etc/udev/rules.d/99-powertargets.rules b/system_files/deck/shared/etc/udev/rules.d/99-powertargets.rules similarity index 100% rename from system_files/deck/etc/udev/rules.d/99-powertargets.rules rename to system_files/deck/shared/etc/udev/rules.d/99-powertargets.rules diff --git a/system_files/deck/usr/bin/gamescope-autologin b/system_files/deck/shared/usr/bin/gamescope-autologin similarity index 100% rename from system_files/deck/usr/bin/gamescope-autologin rename to system_files/deck/shared/usr/bin/gamescope-autologin diff --git a/system_files/deck/usr/bin/steamos-logger b/system_files/deck/shared/usr/bin/steamos-logger similarity index 100% rename from system_files/deck/usr/bin/steamos-logger rename to system_files/deck/shared/usr/bin/steamos-logger diff --git a/system_files/deck/usr/bin/steamos-update b/system_files/deck/shared/usr/bin/steamos-update similarity index 100% rename from system_files/deck/usr/bin/steamos-update rename to system_files/deck/shared/usr/bin/steamos-update diff --git a/system_files/deck/usr/lib/systemd/system/gamescope-autologin.service b/system_files/deck/shared/usr/lib/systemd/system/gamescope-autologin.service similarity index 100% rename from system_files/deck/usr/lib/systemd/system/gamescope-autologin.service rename to system_files/deck/shared/usr/lib/systemd/system/gamescope-autologin.service diff --git a/system_files/deck/usr/lib/tmpfiles.d/dmi-product-serial.conf b/system_files/deck/shared/usr/lib/tmpfiles.d/dmi-product-serial.conf similarity index 100% rename from system_files/deck/usr/lib/tmpfiles.d/dmi-product-serial.conf rename to system_files/deck/shared/usr/lib/tmpfiles.d/dmi-product-serial.conf diff --git a/system_files/deck/usr/share/polkit-1/actions/org.bazzite.policy b/system_files/deck/shared/usr/share/polkit-1/actions/org.bazzite.policy similarity index 100% rename from system_files/deck/usr/share/polkit-1/actions/org.bazzite.policy rename to system_files/deck/shared/usr/share/polkit-1/actions/org.bazzite.policy diff --git a/system_files/deck/usr/share/polkit-1/actions/org.chimeraos.host.policy b/system_files/deck/shared/usr/share/polkit-1/actions/org.chimeraos.host.policy similarity index 100% rename from system_files/deck/usr/share/polkit-1/actions/org.chimeraos.host.policy rename to system_files/deck/shared/usr/share/polkit-1/actions/org.chimeraos.host.policy diff --git a/system_files/deck/usr/share/polkit-1/actions/org.chimeraos.priv.write.policy b/system_files/deck/shared/usr/share/polkit-1/actions/org.chimeraos.priv.write.policy similarity index 100% rename from system_files/deck/usr/share/polkit-1/actions/org.chimeraos.priv.write.policy rename to system_files/deck/shared/usr/share/polkit-1/actions/org.chimeraos.priv.write.policy diff --git a/system_files/deck/usr/share/polkit-1/actions/org.chimeraos.session.select.policy b/system_files/deck/shared/usr/share/polkit-1/actions/org.chimeraos.session.select.policy similarity index 100% rename from system_files/deck/usr/share/polkit-1/actions/org.chimeraos.session.select.policy rename to system_files/deck/shared/usr/share/polkit-1/actions/org.chimeraos.session.select.policy diff --git a/system_files/deck/usr/share/ublue-os/bazzite/neofetch.conf b/system_files/deck/shared/usr/share/ublue-os/bazzite/neofetch.conf similarity index 100% rename from system_files/deck/usr/share/ublue-os/bazzite/neofetch.conf rename to system_files/deck/shared/usr/share/ublue-os/bazzite/neofetch.conf diff --git a/system_files/deck/usr/share/ublue-os/firstboot/launcher/autostart.sh b/system_files/deck/shared/usr/share/ublue-os/firstboot/launcher/autostart.sh similarity index 100% rename from system_files/deck/usr/share/ublue-os/firstboot/launcher/autostart.sh rename to system_files/deck/shared/usr/share/ublue-os/firstboot/launcher/autostart.sh diff --git a/system_files/deck/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml similarity index 100% rename from system_files/deck/usr/share/ublue-os/firstboot/yafti.yml rename to system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml diff --git a/system_files/deck/usr/share/ublue-os/just/custom.just b/system_files/deck/shared/usr/share/ublue-os/just/custom.just similarity index 100% rename from system_files/deck/usr/share/ublue-os/just/custom.just rename to system_files/deck/shared/usr/share/ublue-os/just/custom.just diff --git a/system_files/desktop/usr/share/ublue-os/bazzite/vapor.json b/system_files/desktop/gnome/usr/share/ublue-os/bazzite/vapor.json similarity index 100% rename from system_files/desktop/usr/share/ublue-os/bazzite/vapor.json rename to system_files/desktop/gnome/usr/share/ublue-os/bazzite/vapor.json diff --git a/system_files/desktop/usr/share/ublue-os/bazzite/vgui2.json b/system_files/desktop/gnome/usr/share/ublue-os/bazzite/vgui2.json similarity index 100% rename from system_files/desktop/usr/share/ublue-os/bazzite/vgui2.json rename to system_files/desktop/gnome/usr/share/ublue-os/bazzite/vgui2.json diff --git a/system_files/desktop/etc/systemd/user/com.system76.Scheduler.dbusproxy.service b/system_files/desktop/kde/etc/systemd/user/com.system76.Scheduler.dbusproxy.service similarity index 100% rename from system_files/desktop/etc/systemd/user/com.system76.Scheduler.dbusproxy.service rename to system_files/desktop/kde/etc/systemd/user/com.system76.Scheduler.dbusproxy.service diff --git a/system_files/desktop/usr/bin/plasma-autologin b/system_files/desktop/kde/usr/bin/plasma-autologin similarity index 100% rename from system_files/desktop/usr/bin/plasma-autologin rename to system_files/desktop/kde/usr/bin/plasma-autologin diff --git a/system_files/desktop/usr/bin/system76-scheduler-dbus-proxy b/system_files/desktop/kde/usr/bin/system76-scheduler-dbus-proxy similarity index 100% rename from system_files/desktop/usr/bin/system76-scheduler-dbus-proxy rename to system_files/desktop/kde/usr/bin/system76-scheduler-dbus-proxy diff --git a/system_files/desktop/usr/lib/systemd/system/plasma-autologin.service b/system_files/desktop/kde/usr/lib/systemd/system/plasma-autologin.service similarity index 100% rename from system_files/desktop/usr/lib/systemd/system/plasma-autologin.service rename to system_files/desktop/kde/usr/lib/systemd/system/plasma-autologin.service diff --git a/system_files/desktop/etc/default/duperemove b/system_files/desktop/shared/etc/default/duperemove similarity index 100% rename from system_files/desktop/etc/default/duperemove rename to system_files/desktop/shared/etc/default/duperemove diff --git a/system_files/desktop/etc/environment b/system_files/desktop/shared/etc/environment similarity index 100% rename from system_files/desktop/etc/environment rename to system_files/desktop/shared/etc/environment diff --git a/system_files/desktop/etc/flatpak/deck b/system_files/desktop/shared/etc/flatpak/deck similarity index 100% rename from system_files/desktop/etc/flatpak/deck rename to system_files/desktop/shared/etc/flatpak/deck diff --git a/system_files/desktop/etc/flatpak/install b/system_files/desktop/shared/etc/flatpak/install similarity index 100% rename from system_files/desktop/etc/flatpak/install rename to system_files/desktop/shared/etc/flatpak/install diff --git a/system_files/desktop/etc/polkit-1/rules.d/90-corectrl.rules b/system_files/desktop/shared/etc/polkit-1/rules.d/90-corectrl.rules similarity index 100% rename from system_files/desktop/etc/polkit-1/rules.d/90-corectrl.rules rename to system_files/desktop/shared/etc/polkit-1/rules.d/90-corectrl.rules diff --git a/system_files/desktop/etc/profile.d/askpass.sh b/system_files/desktop/shared/etc/profile.d/askpass.sh similarity index 100% rename from system_files/desktop/etc/profile.d/askpass.sh rename to system_files/desktop/shared/etc/profile.d/askpass.sh diff --git a/system_files/desktop/etc/profile.d/neofetch.sh b/system_files/desktop/shared/etc/profile.d/neofetch.sh similarity index 100% rename from system_files/desktop/etc/profile.d/neofetch.sh rename to system_files/desktop/shared/etc/profile.d/neofetch.sh diff --git a/system_files/desktop/etc/sddm.conf b/system_files/desktop/shared/etc/sddm.conf similarity index 100% rename from system_files/desktop/etc/sddm.conf rename to system_files/desktop/shared/etc/sddm.conf diff --git a/system_files/desktop/etc/sysctl.d/10-memory.conf b/system_files/desktop/shared/etc/sysctl.d/10-memory.conf similarity index 100% rename from system_files/desktop/etc/sysctl.d/10-memory.conf rename to system_files/desktop/shared/etc/sysctl.d/10-memory.conf diff --git a/system_files/desktop/etc/sysctl.d/20-gaming.conf b/system_files/desktop/shared/etc/sysctl.d/20-gaming.conf similarity index 100% rename from system_files/desktop/etc/sysctl.d/20-gaming.conf rename to system_files/desktop/shared/etc/sysctl.d/20-gaming.conf diff --git a/system_files/desktop/etc/sysctl.d/30-networking.conf b/system_files/desktop/shared/etc/sysctl.d/30-networking.conf similarity index 100% rename from system_files/desktop/etc/sysctl.d/30-networking.conf rename to system_files/desktop/shared/etc/sysctl.d/30-networking.conf diff --git a/system_files/desktop/etc/sysctl.d/40-inotify.conf b/system_files/desktop/shared/etc/sysctl.d/40-inotify.conf similarity index 100% rename from system_files/desktop/etc/sysctl.d/40-inotify.conf rename to system_files/desktop/shared/etc/sysctl.d/40-inotify.conf diff --git a/system_files/desktop/etc/systemd/system/duperemove-weekly@.timer b/system_files/desktop/shared/etc/systemd/system/duperemove-weekly@.timer similarity index 100% rename from system_files/desktop/etc/systemd/system/duperemove-weekly@.timer rename to system_files/desktop/shared/etc/systemd/system/duperemove-weekly@.timer diff --git a/system_files/desktop/etc/systemd/system/duperemove@.service b/system_files/desktop/shared/etc/systemd/system/duperemove@.service similarity index 100% rename from system_files/desktop/etc/systemd/system/duperemove@.service rename to system_files/desktop/shared/etc/systemd/system/duperemove@.service diff --git a/system_files/desktop/etc/systemd/system/flatpak-system-install.service b/system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service similarity index 100% rename from system_files/desktop/etc/systemd/system/flatpak-system-install.service rename to system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service diff --git a/system_files/desktop/etc/systemd/zram-generator.conf b/system_files/desktop/shared/etc/systemd/zram-generator.conf similarity index 100% rename from system_files/desktop/etc/systemd/zram-generator.conf rename to system_files/desktop/shared/etc/systemd/zram-generator.conf diff --git a/system_files/desktop/etc/update.d/99-bazzite-arch-user-update.sh b/system_files/desktop/shared/etc/update.d/99-bazzite-arch-user-update.sh similarity index 100% rename from system_files/desktop/etc/update.d/99-bazzite-arch-user-update.sh rename to system_files/desktop/shared/etc/update.d/99-bazzite-arch-user-update.sh diff --git a/system_files/desktop/usr/bin/ublue-flatpak-system-install b/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install similarity index 100% rename from system_files/desktop/usr/bin/ublue-flatpak-system-install rename to system_files/desktop/shared/usr/bin/ublue-flatpak-system-install diff --git a/system_files/desktop/usr/share/applications/org.mozilla.firefox.desktop b/system_files/desktop/shared/usr/share/applications/org.mozilla.firefox.desktop similarity index 100% rename from system_files/desktop/usr/share/applications/org.mozilla.firefox.desktop rename to system_files/desktop/shared/usr/share/applications/org.mozilla.firefox.desktop diff --git a/system_files/desktop/usr/share/icons/hicolor/scalable/apps/install-firefox.svg b/system_files/desktop/shared/usr/share/icons/hicolor/scalable/apps/install-firefox.svg similarity index 100% rename from system_files/desktop/usr/share/icons/hicolor/scalable/apps/install-firefox.svg rename to system_files/desktop/shared/usr/share/icons/hicolor/scalable/apps/install-firefox.svg diff --git a/system_files/desktop/usr/share/ublue-os/bazzite/logo.svg b/system_files/desktop/shared/usr/share/ublue-os/bazzite/logo.svg similarity index 100% rename from system_files/desktop/usr/share/ublue-os/bazzite/logo.svg rename to system_files/desktop/shared/usr/share/ublue-os/bazzite/logo.svg diff --git a/system_files/desktop/usr/share/ublue-os/bazzite/logo.txt b/system_files/desktop/shared/usr/share/ublue-os/bazzite/logo.txt similarity index 100% rename from system_files/desktop/usr/share/ublue-os/bazzite/logo.txt rename to system_files/desktop/shared/usr/share/ublue-os/bazzite/logo.txt diff --git a/system_files/desktop/usr/share/ublue-os/bazzite/neofetch.conf b/system_files/desktop/shared/usr/share/ublue-os/bazzite/neofetch.conf similarity index 100% rename from system_files/desktop/usr/share/ublue-os/bazzite/neofetch.conf rename to system_files/desktop/shared/usr/share/ublue-os/bazzite/neofetch.conf diff --git a/system_files/desktop/usr/share/ublue-os/distrobox/bazzite-arch b/system_files/desktop/shared/usr/share/ublue-os/distrobox/bazzite-arch similarity index 100% rename from system_files/desktop/usr/share/ublue-os/distrobox/bazzite-arch rename to system_files/desktop/shared/usr/share/ublue-os/distrobox/bazzite-arch diff --git a/system_files/desktop/usr/share/ublue-os/distrobox/bazzite-arch-nvidia b/system_files/desktop/shared/usr/share/ublue-os/distrobox/bazzite-arch-nvidia similarity index 100% rename from system_files/desktop/usr/share/ublue-os/distrobox/bazzite-arch-nvidia rename to system_files/desktop/shared/usr/share/ublue-os/distrobox/bazzite-arch-nvidia diff --git a/system_files/desktop/usr/share/ublue-os/firstboot/launcher/autostart.desktop b/system_files/desktop/shared/usr/share/ublue-os/firstboot/launcher/autostart.desktop similarity index 100% rename from system_files/desktop/usr/share/ublue-os/firstboot/launcher/autostart.desktop rename to system_files/desktop/shared/usr/share/ublue-os/firstboot/launcher/autostart.desktop diff --git a/system_files/desktop/usr/share/ublue-os/firstboot/launcher/autostart.sh b/system_files/desktop/shared/usr/share/ublue-os/firstboot/launcher/autostart.sh similarity index 100% rename from system_files/desktop/usr/share/ublue-os/firstboot/launcher/autostart.sh rename to system_files/desktop/shared/usr/share/ublue-os/firstboot/launcher/autostart.sh diff --git a/system_files/desktop/usr/share/ublue-os/firstboot/launcher/login-profile.sh b/system_files/desktop/shared/usr/share/ublue-os/firstboot/launcher/login-profile.sh similarity index 100% rename from system_files/desktop/usr/share/ublue-os/firstboot/launcher/login-profile.sh rename to system_files/desktop/shared/usr/share/ublue-os/firstboot/launcher/login-profile.sh diff --git a/system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml similarity index 100% rename from system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml rename to system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml diff --git a/system_files/desktop/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just similarity index 100% rename from system_files/desktop/usr/share/ublue-os/just/custom.just rename to system_files/desktop/shared/usr/share/ublue-os/just/custom.just diff --git a/system_files/desktop/usr/share/wallpapers/VGUI2.jpg b/system_files/desktop/shared/usr/share/wallpapers/VGUI2.jpg similarity index 100% rename from system_files/desktop/usr/share/wallpapers/VGUI2.jpg rename to system_files/desktop/shared/usr/share/wallpapers/VGUI2.jpg