From cc77fde9a367c3cefee17f1aea74936015c990ab Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Wed, 2 Aug 2023 16:46:39 -0700
Subject: [PATCH] fix(GNOME): Remove now unneeded gnome extension installers
 from just, add system76 scheduler extension package.

---
 Containerfile                                 |  1 +
 .../gnome-shell-extension-bazzite-menu.spec   | 20 +++++++++----------
 .../usr/share/ublue-os/firstboot/yafti.yml    |  7 -------
 .../usr/share/ublue-os/just/custom.just       | 10 +---------
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/Containerfile b/Containerfile
index f3738eea..7f62365a 100644
--- a/Containerfile
+++ b/Containerfile
@@ -102,6 +102,7 @@ RUN if grep -v "gnome" <<< "${IMAGE_NAME}"; then \
         gnome-tweaks \
         gnome-shell-extension-user-theme \
         gnome-shell-extension-gsconnect \
+        gnome-shell-extension-system76-scheduler \
 ; fi
 
 # Install ROCM on non-Nvidia images
diff --git a/spec_files/gnome-shell-extension-bazzite-menu/gnome-shell-extension-bazzite-menu.spec b/spec_files/gnome-shell-extension-bazzite-menu/gnome-shell-extension-bazzite-menu.spec
index 9d72db6e..6cee7b0b 100644
--- a/spec_files/gnome-shell-extension-bazzite-menu/gnome-shell-extension-bazzite-menu.spec
+++ b/spec_files/gnome-shell-extension-bazzite-menu/gnome-shell-extension-bazzite-menu.spec
@@ -1,17 +1,17 @@
 %global uuid tofumenu@tofu
 
-Name:		   gnome-shell-extension-bazzite-menu
-Version:   {{{ git_dir_version }}}
-Release:   1%{?dist}
-Summary:	 Tofu Menu fork that provides helpful shortcuts for the Steam Deck
+Name:        gnome-shell-extension-bazzite-menu
+Version:     {{{ git_dir_version }}}
+Release:     1%{?dist}
+Summary:     Tofu Menu fork that provides helpful shortcuts for the Steam Deck
 
-Group:		 User Interface/Desktops
-License:	 GPLv2
-URL:		   https://github.com/KyleGospo/tofumenu
-Source0:	 https://github.com/KyleGospo/tofumenu/archive/refs/heads/main.tar.gz
-BuildArch: noarch
+Group:       User Interface/Desktops
+License:     GPLv2
+URL:         https://github.com/KyleGospo/tofumenu
+Source0:     https://github.com/KyleGospo/tofumenu/archive/refs/heads/main.tar.gz
+BuildArch:   noarch
 
-Requires:	gnome-shell >= 3.12
+Requires:    gnome-shell >= 3.12
 %description
 Gnome shell extension that provides a Steam Deck icon in the top bar and helpful shortcuts. A fork of Tofu Menu.
 
diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
index 222bac33..82a6e560 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -54,13 +54,6 @@ screens:
           default: false
           packages:
           - Retrieve Greenlight: just --unstable get-greenlight
-        GSConnect:
-          condition:
-            run: grep "gnome" <<< $(rpm-ostree status)
-          description: A KDE connect implementation for GNOME
-          default: true
-          packages:
-          - Enable GSConnect: just --unstable enable-gsconnect
         Hide GRUB Menu:
           description: |
             NOTE: Press the escape key before boot to show the menu
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
index df2bd521..b90f91f2 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
@@ -60,7 +60,7 @@ enable-system76-scheduler:
     kcmshell5 kcm_kwin_scripts
     rm -rf /tmp/kwin-system76-scheduler-integration
   else
-    gext install s76-scheduler@mattjakeman.com
+    echo "This is only needed under KDE."
   fi
 
 enable-supergfxctl:   
@@ -75,14 +75,6 @@ enable-supergfxctl:
     echo "This requires an Nvidia image."
   fi
 
-enable-gsconnect:
-  #!/usr/bin/env bash
-  if grep "gnome" <<< ${status}; then
-    gext install gsconnect@andyholmes.github.io
-  else
-    echo "This is only supported under GNOME."
-  fi
-
 enable-wallpaper-engine:
   #!/usr/bin/env bash
   if grep -v "gnome" <<< $(rpm-ostree status); then