From 15cdf224fa06bb85f5d991ef51c7b135c1effbda 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 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5f9a869c602..43011a8a6e4 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 9510c9fc165..232e0ebe6dd 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 \