From 7fff9de1c05ece23b3574bf7ff53427dfd985999 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Wed, 27 Sep 2023 08:11:03 -0700
Subject: [PATCH] feat(desktop): Add discover-overlay matching deck builds
 (Default disabled, see /etc/default/discover-overlay)

---
 Containerfile                                            | 9 +++++----
 .../shared/usr/bin/bazzite-discover-overlay              | 0
 .../desktop/shared/usr/etc/default/discover-overlay      | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename system_files/{deck => desktop}/shared/usr/bin/bazzite-discover-overlay (100%)
 create mode 100644 system_files/desktop/shared/usr/etc/default/discover-overlay

diff --git a/Containerfile b/Containerfile
index 870e732d47..3126ed5c6e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -56,6 +56,7 @@ RUN rpm-ostree override remove \
 RUN rpm-ostree install \
     ublue-update \
     extest.i686 \
+    discover-overlay \
     python3-pip \
     libadwaita \
     duperemove \
@@ -166,6 +167,10 @@ RUN /tmp/image-info.sh && \
     mkdir -p "/usr/etc/profile.d/" && \
     ln -s "/usr/share/ublue-os/firstboot/launcher/login-profile.sh" \
     "/usr/etc/profile.d/ublue-firstboot.sh" && \
+    mkdir -p "/usr/etc/xdg/autostart" && \
+    cp "/usr/share/applications/discover_overlay.desktop" "/usr/etc/xdg/autostart/discover_overlay.desktop" && \
+    sed -i 's@Exec=discover-overlay@Exec=/usr/bin/bazzite-discover-overlay@g' /usr/etc/xdg/autostart/discover_overlay.desktop && \
+    rm /usr/share/applications/discover_overlay.desktop && \
     cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \
     pip install --prefix=/usr yafti && \
     pip install --prefix=/usr hyfetch && \
@@ -306,7 +311,6 @@ RUN rpm-ostree install \
     vkBasalt \
     mangohud \
     sdgyrodsu \
-    discover-overlay \
     sddm-sugar-steamOS \
     ibus-pinyin \
     ibus-table-chinese-cangjie \
@@ -407,9 +411,6 @@ RUN /tmp/image-info.sh && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         sed -i 's/Exec=.*/Exec=systemctl start return-to-gamemode.service/' /etc/skel.d/Desktop/Return.desktop \
     ; fi && \
-    cp "/usr/share/applications/discover_overlay.desktop" "/usr/etc/xdg/autostart/discover_overlay.desktop" && \
-    sed -i 's@Exec=discover-overlay@Exec=/usr/bin/bazzite-discover-overlay@g' /usr/etc/xdg/autostart/discover_overlay.desktop && \
-    rm /usr/share/applications/discover_overlay.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 && \
     if grep -qv "nokmods" <<< ${IMAGE_FLAVOR}; then \
diff --git a/system_files/deck/shared/usr/bin/bazzite-discover-overlay b/system_files/desktop/shared/usr/bin/bazzite-discover-overlay
similarity index 100%
rename from system_files/deck/shared/usr/bin/bazzite-discover-overlay
rename to system_files/desktop/shared/usr/bin/bazzite-discover-overlay
diff --git a/system_files/desktop/shared/usr/etc/default/discover-overlay b/system_files/desktop/shared/usr/etc/default/discover-overlay
new file mode 100644
index 0000000000..e3320bac65
--- /dev/null
+++ b/system_files/desktop/shared/usr/etc/default/discover-overlay
@@ -0,0 +1 @@
+AUTO_LAUNCH_DISCOVER_OVERLAY=0