fix: more elementary flatpak things

TIL Elementary has their own version of Evince
Ultramarine-Linux · Nov 23, 2023 · a330ade · a330ade
1 parent fb1cee2
commit a330ade
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/katsu/modules/pantheon/pantheon-live.sh b/katsu/modules/pantheon/pantheon-live.sh
@@ -203,26 +203,23 @@ restorecon -R /home/liveuser
 EOF
 
 ELEMENTARY_APPS=(
-    "org.gnome.Evince/$(uname -m)/stable"
-)
-
-arch=$(uname -m)
-# Elementary's Flatpak remote only supports x86_64... even though it's 2023
-if [[ $arch == "x86_64" ]]; then
-ELEMENTARY_APPS+=(
     "io.elementary.calculator/$(uname -m)/stable"
     "io.elementary.calendar/$(uname -m)/stable"
     "io.elementary.capnet-assist/$(uname -m)/stable"
     "io.elementary.camera/$(uname -m)/stable"
     "io.elementary.mail/$(uname -m)/daily"
     "io.elementary.music/$(uname -m)/stable"
     "io.elementary.videos/$(uname -m)/stable"
+    "org.gnome.Evince/$(uname -m)/stable"
 )
-fi
 
+arch=$(uname -m)
+# Elementary's Flatpak remote only supports x86_64... even though it's 2023
+if [[ $arch == "x86_64" ]]; then
 # join them all together with a space
 FLATPAKS=$(printf "%s " "${ELEMENTARY_APPS[@]}")
 
 # install flatpaks
 
-flatpak install -y $FLATPAKS
+flatpak install -y appcenter $FLATPAKS
+fi
diff --git a/katsu/modules/pantheon/pantheon-live.yaml b/katsu/modules/pantheon/pantheon-live.yaml
@@ -29,7 +29,6 @@ dnf:
     - gnome-tour
     - gnome-shell
     - setroubleshoot
-    - evince
   arch_exclude:
     x86_64:
       - elementary-calculator
@@ -39,6 +38,7 @@ dnf:
       - elementary-mail
       - elementary-music
       - elementary-videos
+      - evince # yes, this application is shipped in appcenter
   packages:
     - "@ultramarine-pantheon-product-environment"
     - elementary-greeter