From b5c7c5abf89ad43bdf75c73d8a55c489675f994f Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Wed, 13 Sep 2023 09:23:29 -0700
Subject: [PATCH 1/2] chore: /etc/ cleanup part 2, move remaining /etc/ files
 to /usr/etc/

---
 system_files/deck/shared/{ => usr}/etc/bluetooth/main.conf        | 0
 system_files/deck/shared/{ => usr}/etc/chrony.conf                | 0
 system_files/deck/shared/{ => usr}/etc/default/batterylimit       | 0
 system_files/deck/shared/{ => usr}/etc/default/deckswap           | 0
 system_files/deck/shared/{ => usr}/etc/default/desktop-wayland    | 0
 system_files/deck/shared/{ => usr}/etc/default/ryzenadj           | 0
 system_files/deck/shared/{ => usr}/etc/default/steamos-btrfs      | 0
 system_files/deck/shared/{ => usr}/etc/environment                | 0
 .../deck/shared/{ => usr}/etc/pipewire/99-input-denoising.conf    | 0
 .../deck/shared/{ => usr}/etc/pipewire/virtual-source.conf        | 0
 system_files/deck/shared/{ => usr}/etc/sddm.conf.d/steamos.conf   | 0
 .../deck/shared/{ => usr}/etc/sddm.conf.d/virtualkbd.conf         | 0
 system_files/deck/shared/{ => usr}/etc/sysconfig/network          | 0
 .../deck/shared/{ => usr}/etc/system76-scheduler/config.kdl       | 0
 system_files/deck/shared/{ => usr}/etc/systemd/resolved.conf      | 0
 .../deck/shared/{ => usr}/etc/systemd/zram-generator.conf         | 0
 .../etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua          | 0
 .../{ => usr}/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua | 0
 .../{ => usr}/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua | 0
 .../etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua   | 0
 system_files/deck/silverblue/{ => usr}/etc/environment            | 0
 system_files/desktop/shared/{ => usr}/etc/profile.d/askpass.sh    | 0
 .../desktop/shared/{ => usr}/etc/profile.d/bazzite-neofetch.sh    | 0
 .../desktop/shared/{ => usr}/etc/profile.d/ublue-os-just.sh       | 0
 .../desktop/shared/{ => usr}/etc/systemd/zram-generator.conf      | 0
 .../{ => usr}/etc/ublue-update.d/99-bazzite-arch-user-update.sh   | 0
 system_files/desktop/silverblue/{ => usr}/etc/environment         | 0
 .../etc/ublue-update.d/90-mozilla-gnome-themes-user-update.sh     | 0
 28 files changed, 0 insertions(+), 0 deletions(-)
 rename system_files/deck/shared/{ => usr}/etc/bluetooth/main.conf (100%)
 rename system_files/deck/shared/{ => usr}/etc/chrony.conf (100%)
 rename system_files/deck/shared/{ => usr}/etc/default/batterylimit (100%)
 rename system_files/deck/shared/{ => usr}/etc/default/deckswap (100%)
 rename system_files/deck/shared/{ => usr}/etc/default/desktop-wayland (100%)
 rename system_files/deck/shared/{ => usr}/etc/default/ryzenadj (100%)
 rename system_files/deck/shared/{ => usr}/etc/default/steamos-btrfs (100%)
 rename system_files/deck/shared/{ => usr}/etc/environment (100%)
 rename system_files/deck/shared/{ => usr}/etc/pipewire/99-input-denoising.conf (100%)
 rename system_files/deck/shared/{ => usr}/etc/pipewire/virtual-source.conf (100%)
 rename system_files/deck/shared/{ => usr}/etc/sddm.conf.d/steamos.conf (100%)
 rename system_files/deck/shared/{ => usr}/etc/sddm.conf.d/virtualkbd.conf (100%)
 rename system_files/deck/shared/{ => usr}/etc/sysconfig/network (100%)
 rename system_files/deck/shared/{ => usr}/etc/system76-scheduler/config.kdl (100%)
 rename system_files/deck/shared/{ => usr}/etc/systemd/resolved.conf (100%)
 rename system_files/deck/shared/{ => usr}/etc/systemd/zram-generator.conf (100%)
 rename system_files/deck/shared/{ => usr}/etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua (100%)
 rename system_files/deck/shared/{ => usr}/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua (100%)
 rename system_files/deck/shared/{ => usr}/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua (100%)
 rename system_files/deck/shared/{ => usr}/etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua (100%)
 rename system_files/deck/silverblue/{ => usr}/etc/environment (100%)
 rename system_files/desktop/shared/{ => usr}/etc/profile.d/askpass.sh (100%)
 rename system_files/desktop/shared/{ => usr}/etc/profile.d/bazzite-neofetch.sh (100%)
 rename system_files/desktop/shared/{ => usr}/etc/profile.d/ublue-os-just.sh (100%)
 rename system_files/desktop/shared/{ => usr}/etc/systemd/zram-generator.conf (100%)
 rename system_files/desktop/shared/{ => usr}/etc/ublue-update.d/99-bazzite-arch-user-update.sh (100%)
 rename system_files/desktop/silverblue/{ => usr}/etc/environment (100%)
 rename system_files/desktop/silverblue/{ => usr}/etc/ublue-update.d/90-mozilla-gnome-themes-user-update.sh (100%)

diff --git a/system_files/deck/shared/etc/bluetooth/main.conf b/system_files/deck/shared/usr/etc/bluetooth/main.conf
similarity index 100%
rename from system_files/deck/shared/etc/bluetooth/main.conf
rename to system_files/deck/shared/usr/etc/bluetooth/main.conf
diff --git a/system_files/deck/shared/etc/chrony.conf b/system_files/deck/shared/usr/etc/chrony.conf
similarity index 100%
rename from system_files/deck/shared/etc/chrony.conf
rename to system_files/deck/shared/usr/etc/chrony.conf
diff --git a/system_files/deck/shared/etc/default/batterylimit b/system_files/deck/shared/usr/etc/default/batterylimit
similarity index 100%
rename from system_files/deck/shared/etc/default/batterylimit
rename to system_files/deck/shared/usr/etc/default/batterylimit
diff --git a/system_files/deck/shared/etc/default/deckswap b/system_files/deck/shared/usr/etc/default/deckswap
similarity index 100%
rename from system_files/deck/shared/etc/default/deckswap
rename to system_files/deck/shared/usr/etc/default/deckswap
diff --git a/system_files/deck/shared/etc/default/desktop-wayland b/system_files/deck/shared/usr/etc/default/desktop-wayland
similarity index 100%
rename from system_files/deck/shared/etc/default/desktop-wayland
rename to system_files/deck/shared/usr/etc/default/desktop-wayland
diff --git a/system_files/deck/shared/etc/default/ryzenadj b/system_files/deck/shared/usr/etc/default/ryzenadj
similarity index 100%
rename from system_files/deck/shared/etc/default/ryzenadj
rename to system_files/deck/shared/usr/etc/default/ryzenadj
diff --git a/system_files/deck/shared/etc/default/steamos-btrfs b/system_files/deck/shared/usr/etc/default/steamos-btrfs
similarity index 100%
rename from system_files/deck/shared/etc/default/steamos-btrfs
rename to system_files/deck/shared/usr/etc/default/steamos-btrfs
diff --git a/system_files/deck/shared/etc/environment b/system_files/deck/shared/usr/etc/environment
similarity index 100%
rename from system_files/deck/shared/etc/environment
rename to system_files/deck/shared/usr/etc/environment
diff --git a/system_files/deck/shared/etc/pipewire/99-input-denoising.conf b/system_files/deck/shared/usr/etc/pipewire/99-input-denoising.conf
similarity index 100%
rename from system_files/deck/shared/etc/pipewire/99-input-denoising.conf
rename to system_files/deck/shared/usr/etc/pipewire/99-input-denoising.conf
diff --git a/system_files/deck/shared/etc/pipewire/virtual-source.conf b/system_files/deck/shared/usr/etc/pipewire/virtual-source.conf
similarity index 100%
rename from system_files/deck/shared/etc/pipewire/virtual-source.conf
rename to system_files/deck/shared/usr/etc/pipewire/virtual-source.conf
diff --git a/system_files/deck/shared/etc/sddm.conf.d/steamos.conf b/system_files/deck/shared/usr/etc/sddm.conf.d/steamos.conf
similarity index 100%
rename from system_files/deck/shared/etc/sddm.conf.d/steamos.conf
rename to system_files/deck/shared/usr/etc/sddm.conf.d/steamos.conf
diff --git a/system_files/deck/shared/etc/sddm.conf.d/virtualkbd.conf b/system_files/deck/shared/usr/etc/sddm.conf.d/virtualkbd.conf
similarity index 100%
rename from system_files/deck/shared/etc/sddm.conf.d/virtualkbd.conf
rename to system_files/deck/shared/usr/etc/sddm.conf.d/virtualkbd.conf
diff --git a/system_files/deck/shared/etc/sysconfig/network b/system_files/deck/shared/usr/etc/sysconfig/network
similarity index 100%
rename from system_files/deck/shared/etc/sysconfig/network
rename to system_files/deck/shared/usr/etc/sysconfig/network
diff --git a/system_files/deck/shared/etc/system76-scheduler/config.kdl b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl
similarity index 100%
rename from system_files/deck/shared/etc/system76-scheduler/config.kdl
rename to system_files/deck/shared/usr/etc/system76-scheduler/config.kdl
diff --git a/system_files/deck/shared/etc/systemd/resolved.conf b/system_files/deck/shared/usr/etc/systemd/resolved.conf
similarity index 100%
rename from system_files/deck/shared/etc/systemd/resolved.conf
rename to system_files/deck/shared/usr/etc/systemd/resolved.conf
diff --git a/system_files/deck/shared/etc/systemd/zram-generator.conf b/system_files/deck/shared/usr/etc/systemd/zram-generator.conf
similarity index 100%
rename from system_files/deck/shared/etc/systemd/zram-generator.conf
rename to system_files/deck/shared/usr/etc/systemd/zram-generator.conf
diff --git a/system_files/deck/shared/etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua b/system_files/deck/shared/usr/etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua
similarity index 100%
rename from system_files/deck/shared/etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua
rename to system_files/deck/shared/usr/etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua
diff --git a/system_files/deck/shared/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua b/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua
similarity index 100%
rename from system_files/deck/shared/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua
rename to system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua
diff --git a/system_files/deck/shared/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua b/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua
similarity index 100%
rename from system_files/deck/shared/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua
rename to system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua
diff --git a/system_files/deck/shared/etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua b/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua
similarity index 100%
rename from system_files/deck/shared/etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua
rename to system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua
diff --git a/system_files/deck/silverblue/etc/environment b/system_files/deck/silverblue/usr/etc/environment
similarity index 100%
rename from system_files/deck/silverblue/etc/environment
rename to system_files/deck/silverblue/usr/etc/environment
diff --git a/system_files/desktop/shared/etc/profile.d/askpass.sh b/system_files/desktop/shared/usr/etc/profile.d/askpass.sh
similarity index 100%
rename from system_files/desktop/shared/etc/profile.d/askpass.sh
rename to system_files/desktop/shared/usr/etc/profile.d/askpass.sh
diff --git a/system_files/desktop/shared/etc/profile.d/bazzite-neofetch.sh b/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
similarity index 100%
rename from system_files/desktop/shared/etc/profile.d/bazzite-neofetch.sh
rename to system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
diff --git a/system_files/desktop/shared/etc/profile.d/ublue-os-just.sh b/system_files/desktop/shared/usr/etc/profile.d/ublue-os-just.sh
similarity index 100%
rename from system_files/desktop/shared/etc/profile.d/ublue-os-just.sh
rename to system_files/desktop/shared/usr/etc/profile.d/ublue-os-just.sh
diff --git a/system_files/desktop/shared/etc/systemd/zram-generator.conf b/system_files/desktop/shared/usr/etc/systemd/zram-generator.conf
similarity index 100%
rename from system_files/desktop/shared/etc/systemd/zram-generator.conf
rename to system_files/desktop/shared/usr/etc/systemd/zram-generator.conf
diff --git a/system_files/desktop/shared/etc/ublue-update.d/99-bazzite-arch-user-update.sh b/system_files/desktop/shared/usr/etc/ublue-update.d/99-bazzite-arch-user-update.sh
similarity index 100%
rename from system_files/desktop/shared/etc/ublue-update.d/99-bazzite-arch-user-update.sh
rename to system_files/desktop/shared/usr/etc/ublue-update.d/99-bazzite-arch-user-update.sh
diff --git a/system_files/desktop/silverblue/etc/environment b/system_files/desktop/silverblue/usr/etc/environment
similarity index 100%
rename from system_files/desktop/silverblue/etc/environment
rename to system_files/desktop/silverblue/usr/etc/environment
diff --git a/system_files/desktop/silverblue/etc/ublue-update.d/90-mozilla-gnome-themes-user-update.sh b/system_files/desktop/silverblue/usr/etc/ublue-update.d/90-mozilla-gnome-themes-user-update.sh
similarity index 100%
rename from system_files/desktop/silverblue/etc/ublue-update.d/90-mozilla-gnome-themes-user-update.sh
rename to system_files/desktop/silverblue/usr/etc/ublue-update.d/90-mozilla-gnome-themes-user-update.sh

From 7e51b5999dddc286f0fa1a63505f50723e7c2321 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Wed, 13 Sep 2023 09:32:06 -0700
Subject: [PATCH 2/2] chore: Move /etc/ files created in Containerfile to
 /usr/etc

---
 Containerfile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Containerfile b/Containerfile
index 0ef5fd6c..15b748cf 100644
--- a/Containerfile
+++ b/Containerfile
@@ -174,8 +174,8 @@ RUN rm /usr/share/applications/shredder.desktop && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-rom-properties.repo && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
-    mkdir -p /etc/flatpak/remotes.d && \
-    wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /etc/flatpak/remotes.d && \
+    mkdir -p /usr/etc/flatpak/remotes.d && \
+    wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \
     systemctl enable com.system76.Scheduler.service && \
     systemctl enable displaylink.service && \
     systemctl enable btrfs-dedup@var-home.timer && \
@@ -198,7 +198,8 @@ RUN rm /usr/share/applications/shredder.desktop && \
         systemctl disable waydroid-container.service && \
         rm /usr/share/wayland-sessions/weston.desktop \
     ; fi && \
-    echo -e "IMAGE_NAME=${IMAGE_NAME}\nIMAGE_VENDOR=${IMAGE_VENDOR}\nBASE_IMAGE_NAME=${BASE_IMAGE_NAME}\nIMAGE_FLAVOR=${IMAGE_FLAVOR}\nFEDORA_MAJOR_VERSION=${FEDORA_MAJOR_VERSION}" >> /etc/default/bazzite && \
+    mkdir -p /usr/etc/default && \
+    echo -e "IMAGE_NAME=${IMAGE_NAME}\nIMAGE_VENDOR=${IMAGE_VENDOR}\nBASE_IMAGE_NAME=${BASE_IMAGE_NAME}\nIMAGE_FLAVOR=${IMAGE_FLAVOR}\nFEDORA_MAJOR_VERSION=${FEDORA_MAJOR_VERSION}" >> /usr/etc/default/bazzite && \
     rm -rf \
         /tmp/* \
         /var/* && \
@@ -346,8 +347,8 @@ RUN rpm-ostree install \
         winetricks \
         protontricks && \
     wget https://steamdeck-packages.steamos.cloud/archlinux-mirror/jupiter-main/os/x86_64/steam-jupiter-stable-1.0.0.76-1-x86_64.pkg.tar.zst -O /tmp/steam-jupiter.pkg.tar.zst && \
-    mkdir -p /etc/first-boot && \
-    tar -I zstd -xvf /tmp/steam-jupiter.pkg.tar.zst usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz -O > /etc/first-boot/bootstraplinux_ubuntu12_32.tar.xz && \
+    mkdir -p /usr/etc/first-boot && \
+    tar -I zstd -xvf /tmp/steam-jupiter.pkg.tar.zst usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz -O > /usr/etc/first-boot/bootstraplinux_ubuntu12_32.tar.xz && \
     rm -f /tmp/steam-jupiter.pkg.tar.zst && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         rpm-ostree override remove \
@@ -368,10 +369,10 @@ RUN rm /usr/share/applications/wine*.desktop && \
     sed -i 's/252/207/' /usr/share/alsa/ucm2/AMD/acp5x/acp5x.conf && \
     sed -i 's/192/207/' /usr/share/alsa/ucm2/AMD/acp5x/acp5x.conf && \
     sed -i 's@/usr/bin/steam@/usr/bin/bazzite-steam@g' /usr/share/applications/steam.desktop && \
-    mkdir -p "/etc/xdg/autostart" && \
-    cp "/usr/share/applications/steam.desktop" "/etc/xdg/autostart/steam.desktop" && \
-    sed -i 's@/usr/bin/bazzite-steam %U@/usr/bin/bazzite-steam -silent %U@g' /etc/xdg/autostart/steam.desktop && \
-    cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \
+    mkdir -p "/usr/etc/xdg/autostart" && \
+    cp "/usr/share/applications/steam.desktop" "/usr/etc/xdg/autostart/steam.desktop" && \
+    sed -i 's@/usr/bin/bazzite-steam %U@/usr/bin/bazzite-steam -silent %U@g' /usr/etc/xdg/autostart/steam.desktop && \
+    cp "/usr/share/ublue-os/firstboot/yafti.yml" "/usr/etc/yafti.yml" && \
     sed -i 's/#HandlePowerKey=poweroff/HandlePowerKey=suspend/g' /etc/systemd/logind.conf && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
@@ -396,8 +397,8 @@ RUN rm /usr/share/applications/wine*.desktop && \
     systemctl disable input-remapper.service && \
     systemctl --global disable ublue-update.timer && \
     rm -f /usr/etc/sddm.conf && \
-    rm -f /etc/default/bazzite && \
-    echo -e "IMAGE_NAME=${IMAGE_NAME}\nIMAGE_VENDOR=${IMAGE_VENDOR}\nBASE_IMAGE_NAME=${BASE_IMAGE_NAME}\nIMAGE_FLAVOR=${IMAGE_FLAVOR}\nFEDORA_MAJOR_VERSION=${FEDORA_MAJOR_VERSION}" >> /etc/default/bazzite && \
+    rm -f /usr/etc/default/bazzite && \
+    echo -e "IMAGE_NAME=${IMAGE_NAME}\nIMAGE_VENDOR=${IMAGE_VENDOR}\nBASE_IMAGE_NAME=${BASE_IMAGE_NAME}\nIMAGE_FLAVOR=${IMAGE_FLAVOR}\nFEDORA_MAJOR_VERSION=${FEDORA_MAJOR_VERSION}" >> /usr/etc/default/bazzite && \
     rm -rf \
         /tmp/* \
         /var/* && \