fix: move excludes to gnome install

ublue-os · Aug 18, 2024 · dfe11dc · dfe11dc
1 parent e9855d2
commit dfe11dc
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 76 deletions.
diff --git a/scripts/_base/001-desktop-environment.sh b/scripts/_base/001-desktop-environment.sh
@@ -2,81 +2,7 @@
 
 set -euox pipefail
 
-    # # Non-critical apps -> Flatpak
-    # - baobab
-    # - cheese
-    # - snapshot
-    # - evince
-    # - evince-djvu
-    # - evince-nautilus
-    # - file-roller
-    # - file-roller-nautilus
-    # - gnome-boxes
-    # - gnome-calculator
-    # - gnome-calendar
-    # - gnome-characters
-    # - gnome-clocks
-    # - gnome-connections
-    # - gnome-contacts
-    # - gnome-documents
-    # - gnome-font-viewer
-    # - gnome-logs
-    # - gnome-maps
-    # - gnome-photos
-    # - gnome-screenshot
-    # - gnome-text-editor
-    # - gnome-weather
-    # - jwhois
-    # - loupe
-    # - rdist
-    # - sane-backends-drivers-scanners
-    # - simple-scan
-    # - sushi
-    # - symlinks
-    # - tcpdump
-    # - telnet
-    # - totem
-    # - totem-nautilus
-    # - traceroute
-
-
-excludes=(
-    "baobab"
-    "cheese"
-    "evince"
-    "evince-djvu"
-    "evince-nautilus"
-    "file-roller"
-    "file-roller-nautilus"
-    "gnome-boxes"
-    "gnome-calculator"
-    "gnome-calendar"
-    "gnome-characters"
-    "gnome-clocks"
-    "gnome-connections"
-    "gnome-contacts"
-    "gnome-documents"
-    "gnome-font-viewer"
-    "gnome-logs"
-    "gnome-maps"
-    "gnome-photos"
-    "gnome-screenshot"
-    "gnome-text-editor"
-    "gnome-weather"
-    "jwhois"
-    "loupe"
-    "rdist"
-    "sane-backends-drivers-scanners"
-    "simple-scan"
-    "snapshot"
-    "sushi"
-    "symlinks"
-    "tcpdump"
-    "telnet"
-    "totem"
-    "totem-nautilus"
-    "traceroute"
-)
+excludes=()
 
 # Make excludes a comma-separated string
 excludes=$(IFS=, ; echo "${excludes[*]}")

diff --git a/scripts/_silverblue/001-desktop-environment.sh b/scripts/_silverblue/001-desktop-environment.sh
@@ -3,5 +3,44 @@
 set -euox pipefail
 
 # Install the desktop environment
-dnf install -y @gnome-desktop
+excludes=(
+
+    "baobab"
+    "cheese"
+    "evince"
+    "evince-djvu"
+    "evince-nautilus"
+    "file-roller"
+    "file-roller-nautilus"
+    "gnome-boxes"
+    "gnome-calculator"
+    "gnome-calendar"
+    "gnome-characters"
+    "gnome-clocks"
+    "gnome-connections"
+    "gnome-contacts"
+    "gnome-documents"
+    "gnome-font-viewer"
+    "gnome-logs"
+    "gnome-maps"
+    "gnome-photos"
+    "gnome-screenshot"
+    "gnome-text-editor"
+    "gnome-weather"
+    "jwhois"
+    "loupe"
+    "rdist"
+    "sane-backends-drivers-scanners"
+    "simple-scan"
+    "snapshot"
+    "sushi"
+    "symlinks"
+    "tcpdump"
+    "telnet"
+    "totem"
+    "totem-nautilus"
+    "traceroute"
+)
+
+dnf install -y @gnome-desktop --exclude "${excludes[*]}"
 systemctl enable gdm.service