From 4e9c32bdf100a1e41fa5a3e2497c3e8e576e003a Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Fri, 9 Aug 2024 21:13:39 -0700
Subject: [PATCH] feat: Add that thing everyone keeps asking about

---
 .github/workflows/build.yml                            | 8 +++++++-
 Containerfile                                          | 4 ++--
 system_files/deck/budgie/.gitkeep                      | 0
 system_files/deck/cosmic/.gitkeep                      | 0
 system_files/deck/shared/usr/libexec/bazzite-autologin | 4 ++++
 system_files/desktop/budgie/.gitkeep                   | 0
 system_files/desktop/cosmic/.gitkeep                   | 0
 system_files/desktop/shared/etc/profile.d/askpass.sh   | 4 ++++
 system_files/nvidia/budgie/.gitkeep                    | 0
 system_files/nvidia/cosmic/.gitkeep                    | 0
 10 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 system_files/deck/budgie/.gitkeep
 create mode 100644 system_files/deck/cosmic/.gitkeep
 create mode 100644 system_files/desktop/budgie/.gitkeep
 create mode 100644 system_files/desktop/cosmic/.gitkeep
 create mode 100644 system_files/nvidia/budgie/.gitkeep
 create mode 100644 system_files/nvidia/cosmic/.gitkeep

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5f9a869c60..43011a8a6e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
       matrix:
         base_image_flavor: [main]
         base_name: [bazzite, bazzite-deck, bazzite-nvidia]
-        base_image_name: [kinoite, silverblue]
+        base_image_name: [kinoite, silverblue, budgie, cosmic]
         target_image_flavor: [main, asus]
         fedora_version: [40]
         include:
@@ -85,6 +85,12 @@ jobs:
           DESKTOP=""
           if [[ "${{ matrix.base_image_name }}" == "silverblue" ]]; then
               DESKTOP="-gnome"
+          elif [[ "${{ matrix.base_image_name }}" == "budgie" ]]; then
+              DESKTOP="-budgie"
+              echo "SOURCE_IMAGE=onyx-main" >> $GITHUB_ENV
+          elif [[ "${{ matrix.base_image_name }}" == "cosmic" ]]; then
+              DESKTOP="-cosmic"
+              echo "SOURCE_IMAGE=cosmic-silverblue" >> $GITHUB_ENV
           fi
 
           if [[ "${{ matrix.base_name }}" == "bazzite-deck" ]]; then
diff --git a/Containerfile b/Containerfile
index 9510c9fc16..232e0ebe6d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -542,7 +542,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
         sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.kde.konsole.desktop && \
         rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop && \
         systemctl enable kde-sysmonitor-workaround.service \
-    ; else \
+    ; elif grep -q "silverblue" <<< "${BASE_IMAGE_NAME}"; then \
         rpm-ostree override replace \
         --experimental \
         --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
@@ -750,7 +750,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
             steamdeck-kde-presets-desktop && \
         rpm-ostree install \
             steamdeck-kde-presets \
-    ; else \
+    ; elif grep -q "silverblue" <<< "${BASE_IMAGE_NAME}"; then \
         rpm-ostree install \
             steamdeck-gnome-presets \
             gnome-shell-extension-caribou-blocker \
diff --git a/system_files/deck/budgie/.gitkeep b/system_files/deck/budgie/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/system_files/deck/cosmic/.gitkeep b/system_files/deck/cosmic/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/system_files/deck/shared/usr/libexec/bazzite-autologin b/system_files/deck/shared/usr/libexec/bazzite-autologin
index c19871ab70..b5889e5772 100755
--- a/system_files/deck/shared/usr/libexec/bazzite-autologin
+++ b/system_files/deck/shared/usr/libexec/bazzite-autologin
@@ -23,5 +23,9 @@ elif [[ ${BASE_IMAGE_NAME} =~ "kinoite" ]]; then
   sed -i 's/.*Session=.*/Session=plasma.desktop/g' ${SDDM_CONF}
 elif [[ ${BASE_IMAGE_NAME} =~ "silverblue" ]]; then
   sed -i 's/.*Session=.*/Session=gnome-wayland.desktop/g' ${SDDM_CONF}
+elif [[ ${BASE_IMAGE_NAME} =~ "budgie" ]]; then
+  sed -i 's/.*Session=.*/Session=budgie-desktop.desktop/g' ${SDDM_CONF}
+elif [[ ${BASE_IMAGE_NAME} =~ "cosmic" ]]; then
+  sed -i 's/.*Session=.*/Session=cosmic.desktop/g' ${SDDM_CONF}
 fi
 sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}
diff --git a/system_files/desktop/budgie/.gitkeep b/system_files/desktop/budgie/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/system_files/desktop/cosmic/.gitkeep b/system_files/desktop/cosmic/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/system_files/desktop/shared/etc/profile.d/askpass.sh b/system_files/desktop/shared/etc/profile.d/askpass.sh
index 51a846ea6e..75c6d67474 100755
--- a/system_files/desktop/shared/etc/profile.d/askpass.sh
+++ b/system_files/desktop/shared/etc/profile.d/askpass.sh
@@ -7,5 +7,9 @@ if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
   SUDO_ASKPASS='/usr/bin/ksshaskpass'
 elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
   SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
+elif [[ ${BASE_IMAGE_NAME} == 'budgie' ]]; then
+  SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
+elif [[ ${BASE_IMAGE_NAME} == 'cosmic' ]]; then
+  SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
 fi
 export SUDO_ASKPASS
diff --git a/system_files/nvidia/budgie/.gitkeep b/system_files/nvidia/budgie/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/system_files/nvidia/cosmic/.gitkeep b/system_files/nvidia/cosmic/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2