chore(ci): Add system flatpaks

.github/workflows/build_iso.yml

@@ -27,7 +27,7 @@ jobs:
       matrix:
         image_name: [bluefin, bluefin-nvidia, bluefin-asus, bluefin-asus-nvidia, bluefin-surface, bluefin-surface-nvidia, bluefin-dx, bluefin-dx-nvidia, bluefin-dx-asus, bluefin-dx-surface, bluefin-dx-asus-nvidia, bluefin-dx-surface-nvidia]
         major_version: [39]
-        image_tag: [latest]
+        image_tag: [latest, 39-testing]
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@v1.3.1
@@ -47,6 +47,7 @@ jobs:
           iso_name: ${{ matrix.image_name }}-${{ matrix.image_tag }}-${{ matrix.major_version}}
           enable_cache_dnf: "false"
           enable_cache_skopeo: "false"
+          flatpak_remote_refs: "runtime/org.kde.Platform/x86_64/6.5 runtime/org.freedesktop.Platform/x86_64/23.08 runtime/org.gnome.Platform/x86_64/45 runtime/org.gnome.Platform/x86_64/44 app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Loupe/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Weather/x86_64/stable app/org.gnome.baobab/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/com.mattjakeman.ExtensionManager/x86_64/stable app/com.github.tchx84.Flatseal/x86_64/stable app/io.github.dvlv.boxbuddyrs/x86_64/stable app/io.github.flattool.Warehouse/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/io.missioncenter.MissionCenter/x86_64/stable app/io.github.celluloid_player.Celluloid/x86_64/stable app/org.mozilla.firefox/x86_64/stable"
 
       - name: Upload ISOs and Checksum to Job Artifacts
         if: github.event_name == 'pull_request'

Containerfile

@@ -118,6 +118,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
     systemctl enable rpm-ostree-countme.service && \
     systemctl enable tailscaled.service && \
     systemctl enable dconf-update.service && \
+    systemctl enable ublue-system-flatpak-manager.service && \
     systemctl enable ublue-update.timer && \
     systemctl enable ublue-system-setup.service && \
     systemctl --global enable ublue-user-setup.service && \

usr/libexec/ublue-system-flatpak-manager

@@ -1,44 +1,3 @@
 #!/usr/bin/bash
 
-# Script Version
-VER=3
-VER_FILE="/etc/ublue/flatpak_manager_version"
-VER_RAN=$(cat $VER_FILE)
-
-# Run script if updated
-if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
-  echo "Flatpak manager v$VER has already ran. Exiting..."
-  exit 0
-fi
-
-# Opt out of and remove Fedora's flatpak repo
-if grep -qz 'fedora' <<< $(flatpak remotes); then
-  /usr/lib/fedora-third-party/fedora-third-party-opt-out
-  /usr/bin/fedora-third-party disable
-  flatpak remote-delete fedora --force
-fi
-
-# Ensure Flathub is enabled
-flatpak remote-add --if-not-exists --system flathub /usr/etc/flatpak/remotes.d/flathub.flatpakrepo
-flatpak remote-modify --system --enable flathub
-
-# Lists of flatpaks
-FLATPAK_LIST=$(flatpak list --columns=application)
-INSTALL_LIST=$(cat /etc/flatpak/system/install)
-REMOVE_LIST=$(cat /etc/flatpak/system/remove)
-
-# Install flatpaks in list
-if [[ -n $INSTALL_LIST ]]; then
-  if ! flatpak install --system --noninteractive flathub ${INSTALL_LIST[@]}; then
-    # exit on error
-    exit 1
-  fi
-fi
-
-# Remove flatpaks in list once
-if [[ ! -f $VER_FILE && -n $REMOVE_LIST ]]; then
-  flatpak remove --system --noninteractive ${REMOVE_LIST[@]}
-fi
-
-mkdir -p /etc/ublue
-echo $VER > $VER_FILE
+flatpak --system update -y