From c5b59d9438bc47aa3423c98c4c1e62e3013f83b0 Mon Sep 17 00:00:00 2001
From: Rick Peters <rickpeters@upriser.nl>
Date: Wed, 14 Oct 2026 13:54:30 +0200
Subject: [PATCH] GNOME: AppIndicator extension for tray icons

---
 lib/desktop-shortcut.sh | 29 ++++++++++++++++-------------
 lib/packages.sh         |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/desktop-shortcut.sh b/lib/desktop-shortcut.sh
index 2384ee3..3ae0fbc 100644
--- a/lib/desktop-shortcut.sh
+++ b/lib/desktop-shortcut.sh
@@ -78,7 +78,7 @@ EOF
         # GNOME only starts launchers it trusts.
         gio set "$shortcut_path" metadata::trusted true 2>/dev/null || true
         gnome_dash_pin
-        gnome_desktop_icons_enable
+        gnome_extensions_enable
     fi
 
     ok "Desktop shortcut created successfully."
@@ -123,18 +123,21 @@ gnome_dash_unpin() {
     gsettings set org.gnome.shell favorite-apps "$favorites"
 }
 
-# Desktop icons on GNOME (it draws none itself): the Desktop Icons NG extension,
-# installed with the other GNOME packages (lib/packages.sh). Enabled in the
-# user's settings; GNOME loads a new extension at the next login.
-DING_UUID=ding@rastersoft.com
+# GNOME draws no desktop icons and no tray icons (Steam's, for one) itself:
+# the Desktop Icons NG and AppIndicator extensions, installed with the other
+# GNOME packages (lib/packages.sh). Enabled in the user's settings; GNOME
+# loads a new extension at the next login.
+GNOME_EXTENSIONS=(ding@rastersoft.com appindicatorsupport@rgcjonas.gmail.com)
 
-gnome_desktop_icons_enable() {
+gnome_extensions_enable() {
     user_session && command -v gsettings >/dev/null || return 0
-    [[ -d "/usr/share/gnome-shell/extensions/$DING_UUID" ]] || return 0
-    local enabled
-    enabled="$(gsettings get org.gnome.shell enabled-extensions 2>/dev/null)" || return 0
-    [[ "$enabled" == *"$DING_UUID"* ]] && return 0
-    if [[ "$enabled" == "@as []" || "$enabled" == "[]" ]]; then enabled="['$DING_UUID']"
-    else enabled="${enabled%]}, '$DING_UUID']"; fi
-    gsettings set org.gnome.shell enabled-extensions "$enabled"
+    local uuid enabled
+    for uuid in "${GNOME_EXTENSIONS[@]}"; do
+        [[ -d "/usr/share/gnome-shell/extensions/$uuid" ]] || continue
+        enabled="$(gsettings get org.gnome.shell enabled-extensions 2>/dev/null)" || return 0
+        [[ "$enabled" == *"$uuid"* ]] && continue
+        if [[ "$enabled" == "@as []" || "$enabled" == "[]" ]]; then enabled="['$uuid']"
+        else enabled="${enabled%]}, '$uuid']"; fi
+        gsettings set org.gnome.shell enabled-extensions "$enabled"
+    done
 }
diff --git a/lib/packages.sh b/lib/packages.sh
index f5c83b0..b48aeb3 100644
--- a/lib/packages.sh
+++ b/lib/packages.sh
@@ -86,7 +86,7 @@ install_required_packages() {
     # Step 2: gamescope/Steam and the desktop helpers the rest of the setup uses.
     local -a MISSING required=(gamescope-session-cachyos steam mangohud xterm ttf-liberation wqy-zenhei)
     # Plasma's on-screen keyboard; on GNOME kconfig instead, for the kreadconfig6/kwriteconfig6 Steamify's undo journal uses.
-    if [[ "$(desktop_kind)" == gnome ]]; then required+=(kconfig accountsservice gnome-shell-extension-desktop-icons-ng); else required+=(plasma-keyboard); fi
+    if [[ "$(desktop_kind)" == gnome ]]; then required+=(kconfig accountsservice gnome-shell-extension-desktop-icons-ng gnome-shell-extension-appindicator); else required+=(plasma-keyboard); fi
     info "Checking required packages: ${required[*]}"
     mapfile -t MISSING < <(pacman -T "${required[@]}")