feat: Preinstall system Flatpaks

Idea and implementation used from Endlish-Oesque/Beyond

Author: EyeCantCU

Containerfile

@@ -79,8 +79,7 @@ RUN if grep -v "nvidia" <<< "${IMAGE_NAME}"; then \
 ; fi 
 
 # Add Flathub
-RUN flatpak remove --system --noninteractive --all && \
-    flatpak remote-add --system --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
+RUN flatpak remote-add --system --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
     flatpak remote-modify --system flathub --no-filter --title="Flathub (System)"
 
 # Cleanup & Finalize
@@ -100,6 +99,10 @@ RUN rm /usr/share/applications/shredder.desktop && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
+    flatpak remove --system --noninteractive --all && \
+    cat /etc/flatpak/install | while read line; do flatpak install --system --noninteractive --no-deploy flathub $line; done && \
+    systemctl unmask flatpak-system-install.service && \
+    systemctl enable flatpak-system-install.service && \
     systemctl disable rpm-ostreed-automatic.timer && \
     systemctl --global enable ublue-update.timer && \
     systemctl enable input-remapper.service && \
@@ -197,6 +200,8 @@ RUN rm /usr/share/applications/winetricks.desktop && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \
     mv /etc/sddm.conf /etc/sddm.conf.d/steamos.conf && \
+    flatpak remove --system --noninteractive --all && \
+    cat etc/flatpak/install | while read line; do flatpak install --system --noninteractive --no-deploy flathub $line; done && \
     systemctl enable plasma-autologin.service && \
     systemctl enable jupiter-fan-control.service && \
     systemctl enable vpower.service && \

system_files/deck/etc/flatpak/install

@@ -0,0 +1,4 @@
+com.github.Matoking.protontricks
+net.davidotek.pupgui2
+org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
+org.freedesktop.Platform.VulkanLayer.vkBasalt//22.08

system_files/deck/usr/share/ublue-os/firstboot/yafti.yml

@@ -134,15 +134,6 @@ screens:
       show_terminal: true
       package_manager: yafti.plugin.flatpak
       groups:
-        Bazzite:
-          description: Core Applications
-          default: true
-          packages:
-          - MangoHud (Flatpak): org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
-          - Mozilla Firefox: org.mozilla.firefox
-          - Protontricks: com.github.Matoking.protontricks
-          - ProtonUp-Qt (Proton Updater): net.davidotek.pupgui2
-          - vkBasalt (Flatpak): org.freedesktop.Platform.VulkanLayer.vkBasalt//22.08
         Web Browsers:
           description: Additional browsers to complement Firefox
           default: false
@@ -151,6 +142,7 @@ screens:
           - Google Chrome: com.google.Chrome
           - LibreWolf: io.gitlab.librewolf-community
           - Microsoft Edge: com.microsoft.Edge
+          - Mozilla Firefox: org.mozilla.firefox
           - Opera: com.opera.Opera
         Gaming:
           description: "Rock and Stone!"

system_files/desktop/etc/flatpak/install

@@ -0,0 +1,3 @@
+net.davidotek.pupgui2
+org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
+org.freedesktop.Platform.VulkanLayer.vkBasalt//22.08

system_files/desktop/etc/systemd/system/flatpak-system-install.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Install System Flatpak on boot
+Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/ublue-flatpak-system-install
+
+[Install]
+WantedBy=multi-user.target

system_files/desktop/usr/bin/ublue-flatpak-system-install

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cat /etc/flatpaks | while read line; do
+  flatpak install --system --noninteractive --no-pull flathub $line
+done && mv /etc/flatpak/install /etc/flatpak/installed

system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml

@@ -97,18 +97,6 @@ screens:
   applications:
     source: yafti.screen.package
     values:
-      title: Application Installation
-      show_terminal: true
-      package_manager: yafti.plugin.flatpak
-      groups:
-        Bazzite:
-          description: Core Applications
-          default: true
-          packages:
-          - MangoHud (Flatpak): org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
-          - Mozilla Firefox: org.mozilla.firefox
-          - ProtonUp-Qt (Proton Updater): net.davidotek.pupgui2
-          - vkBasalt (Flatpak): org.freedesktop.Platform.VulkanLayer.vkBasalt//22.08
         Web Browsers:
           description: Additional browsers to complement Firefox
           default: false
@@ -117,6 +105,7 @@ screens:
           - Google Chrome: com.google.Chrome
           - LibreWolf: io.gitlab.librewolf-community
           - Microsoft Edge: com.microsoft.Edge
+          - Mozilla Firefox: org.mozilla.firefox
           - Opera: com.opera.Opera
         Gaming:
           description: "Rock and Stone!"