From db4f505d62b2b8fff2e99d76832c87f0e4323a2d Mon Sep 17 00:00:00 2001
From: Noel Miller <4983138+noelmiller@users.noreply.github.com>
Date: Tue, 12 Mar 2024 08:50:26 -0500
Subject: [PATCH 01/19] chore(ci): switch to upstream action (#1021)

---
 .github/workflows/build_iso.yml | 53 +++++++++---------
 Containerfile                   | 98 ++++++++++++++++-----------------
 2 files changed, 75 insertions(+), 76 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 05f642bacdd..04f2cf762a6 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - testing
     paths:
       - '.github/workflows/build_iso.yml'
 
@@ -16,47 +17,45 @@ concurrency:
 
 jobs:
   build-iso:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
       id-token: write
-    container:
-      image: fedora:${{ matrix.major_version }}
-      options: "--privileged"
-      volumes:
-        - "/:/host"
     strategy:
       fail-fast: false
       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: [38, 39]
-        image_tag: [latest, gts]
-        exclude:
-          - major_version: 38
-            image_tag: latest
-          - major_version: 39
-            image_tag: gts
+        major_version: [39]
+        image_tag: [latest]
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@v1.3.1
+
       - name: Build ISOs
-        uses: ublue-os/isogenerator@1.0.9
+        uses: jasonn3/build-container-installer@main
         id: build
         with:
-          ARCH: x86_64
-          IMAGE_NAME: ${{ matrix.image_name }}
-          IMAGE_REPO: ghcr.io/ublue-os
-          VARIANT: 'Silverblue'
-          VERSION: ${{ matrix.major_version }}
-          IMAGE_TAG: ${{ matrix.image_tag }}
-          SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
-          ENROLLMENT_PASSWORD: 'ublue-os'
+          arch: x86_64
+          image_name: ${{ matrix.image_name }}
+          image_repo: ghcr.io/ublue-os
+          variant: 'Silverblue'
+          version: ${{ matrix.major_version }}
+          image_tag: ${{ matrix.image_tag }}
+          secure_boot_key_url: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
+          enrollment_password: 'ublue-os'
+          iso_name: ${{ matrix.image_name }}-${{ matrix.image_tag }}-${{ matrix.major_version}}
+          enable_cache_dnf: "false"
+          enable_cache_skopeo: "false"
 
       - name: Upload ISOs and Checksum to Job Artifacts
         if: github.event_name == 'pull_request'
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.image_name }}-${{ matrix.image_tag }}-${{ matrix.major_version}}
-          path: ${{ steps.build.outputs.output-directory }}
+          name: ${{ steps.build.outputs.iso_name }}
+          path: |
+            ${{ steps.build.outputs.iso_path }}
+            ${{ steps.build.outputs.iso_path }}-CHECKSUM
           if-no-files-found: error
           retention-days: 0
           compression-level: 0
@@ -72,7 +71,9 @@ jobs:
           RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
           RCLONE_CONFIG_R2_REGION: auto
           RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
-          SOURCE_DIR: ${{ steps.build.outputs.output-directory }}
+          SOURCE_ISO: ${{ steps.build.outputs.iso_path }}
+          SOURCE_ISO_CHECKSUM: ${{ steps.build.outputs.iso_path }}-CHECKSUM
         run: |
           dnf install -y rclone
-          rclone copy $SOURCE_DIR R2:bluefin
+          rclone copy $SOURCE_ISO R2:bluefin
+          rclone copy $SOURCE_ISO_CHECKSUM R2:bluefin
diff --git a/Containerfile b/Containerfile
index ddfcc2d73ba..9080943adeb 100644
--- a/Containerfile
+++ b/Containerfile
@@ -19,42 +19,42 @@ ARG PACKAGE_LIST="bluefin"
 
 # GNOME VRR & Ptyxis
 RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \
-        wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
-        rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem && \
-        rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
-        wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
-        rpm-ostree override replace \
-        --experimental \
-        --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \
-            vte291 \
-            vte-profile \
-            libadwaita && \
-        rpm-ostree install \
-            ptyxis && \
-        rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
-        rpm-ostree override remove \
-            power-profiles-daemon \
-            || true && \
-        rpm-ostree override remove \
-            tlp \
-            tlp-rdw \
-            || true \
-    ; fi
+  wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
+  rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem && \
+  rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
+  wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
+  rpm-ostree override replace \
+  --experimental \
+  --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \
+  vte291 \
+  vte-profile \
+  libadwaita && \
+  rpm-ostree install \
+  ptyxis && \
+  rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
+  rpm-ostree override remove \
+  power-profiles-daemon \
+  || true && \
+  rpm-ostree override remove \
+  tlp \
+  tlp-rdw \
+  || true \
+  ; fi
 
 # Install Explicit Sync Patches on Nvidia builds
 RUN if [[ "${IMAGE_FLAVOR}" =~ "nvidia" ]]; then \
-        wget https://copr.fedorainfracloud.org/coprs/gloriouseggroll/nvidia-explicit-sync/repo/fedora-$(rpm -E %fedora)/gloriouseggroll-nvidia-explicit-sync-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo && \
-        rpm-ostree override replace \
-        --experimental \
-        --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \
-            xorg-x11-server-Xwayland && \
-        rpm-ostree override replace \
-        --experimental \
-        --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \
-            egl-wayland \
-            || true && \
-        rm /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo \
-    ; fi
+  wget https://copr.fedorainfracloud.org/coprs/gloriouseggroll/nvidia-explicit-sync/repo/fedora-$(rpm -E %fedora)/gloriouseggroll-nvidia-explicit-sync-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo && \
+  rpm-ostree override replace \
+  --experimental \
+  --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \
+  xorg-x11-server-Xwayland && \
+  rpm-ostree override replace \
+  --experimental \
+  --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \
+  egl-wayland \
+  || true && \
+  rm /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo \
+  ; fi
 
 COPY usr /usr
 COPY just /tmp/just
@@ -69,21 +69,21 @@ COPY usr/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml
 # Add ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
 COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
 RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
-    wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
-    if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \
-        rpm-ostree install \
-            /tmp/akmods-rpms/kmods/*xpadneo*.rpm \
-            /tmp/akmods-rpms/kmods/*xone*.rpm \
-            /tmp/akmods-rpms/kmods/*openrazer*.rpm \
-            /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
-            /tmp/akmods-rpms/kmods/*wl*.rpm \
-    ; fi && \
-    if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \
-        rpm-ostree install \
-            /tmp/akmods-rpms/kmods/*evdi*.rpm \
-    ; fi && \
-    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
-    wget https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo
+  wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
+  if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \
+  rpm-ostree install \
+  /tmp/akmods-rpms/kmods/*xpadneo*.rpm \
+  /tmp/akmods-rpms/kmods/*xone*.rpm \
+  /tmp/akmods-rpms/kmods/*openrazer*.rpm \
+  /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
+  /tmp/akmods-rpms/kmods/*wl*.rpm \
+  ; fi && \
+  if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \
+  rpm-ostree install \
+  /tmp/akmods-rpms/kmods/*evdi*.rpm \
+  ; fi && \
+  sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
+  wget https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo
 
 # Starship Shell Prompt
 RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \
@@ -120,8 +120,6 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
     systemctl enable dconf-update.service && \
     systemctl enable ublue-update.timer && \
     systemctl enable ublue-system-setup.service && \
-    systemctl enable ublue-system-flatpak-manager.service && \
-    systemctl --global enable ublue-user-flatpak-manager.service && \
     systemctl --global enable ublue-user-setup.service && \
     fc-cache -f /usr/share/fonts/ubuntu && \
     fc-cache -f /usr/share/fonts/inter && \

From f837bc586836db749f5e34f2ed89388138a55c3b Mon Sep 17 00:00:00 2001
From: Noel Miller <4983138+noelmiller@users.noreply.github.com>
Date: Tue, 26 Mar 2024 18:58:40 -0500
Subject: [PATCH 02/19] chore(ci): Use flatpak folders and dependency
 resolution [ISO] (#1038)

---
 .github/workflows/build.yml              |  35 +++++---
 .github/workflows/build_iso.yml          | 109 +++++++++++++++++++----
 Containerfile                            |   1 +
 create_dependencies_idea.txt             |  17 ++++
 flatpaks/flatpaks                        |  24 +++++
 usr/libexec/ublue-system-flatpak-manager |  44 +--------
 6 files changed, 158 insertions(+), 72 deletions(-)
 create mode 100644 create_dependencies_idea.txt
 create mode 100755 flatpaks/flatpaks

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4426760c1b3..ce85aa86b1a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,14 +9,12 @@ on:
       - testing
     paths-ignore:
       - '**.md'
-      - '.github/workflows/build_iso.yml'
   push:
     branches:
       - main
       - testing
     paths-ignore:
       - '**.md'
-      - '.github/workflows/build_iso.yml'
   workflow_dispatch:
 env:
     IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
@@ -26,19 +24,21 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  push-ghcr:
-    name: Make
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
+  build-container:
+    name: build
+    runs-on: ubuntu-latest
+    continue-on-error: false
     strategy:
       fail-fast: false
       matrix:
-        image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
+        image_flavor: [main, nvidia, asus, asus-nvidia, surface, surface-nvidia]
         base_name: [bluefin, bluefin-dx]
         major_version: [38, 39]
+        exclude:
+          - major_version: 38
+            image_flavor: asus
+          - major_version: 38
+            image_flavor: asus-nvidia
         include:
           - major_version: 38
             is_latest_version: false
@@ -236,18 +236,27 @@ jobs:
       - name: Echo outputs
         if: github.event_name != 'pull_request'
         run: |
-          echo "${{ toJSON(steps.push.outputs) }}"  
+          echo "${{ toJSON(steps.push.outputs) }}"
 
   check:
     name: Check all builds successful
     if: ${{ !cancelled() }}
     runs-on: ubuntu-latest
-    needs: [push-ghcr]
+    needs: [build-container]
     steps:
       - name: Exit on failure
-        if: ${{ needs.push-ghcr.result == 'failure' }}
+        if: ${{ needs.build_container.result == 'failure' }}
         shell: bash
         run: exit 1
       - name: Exit
         shell: bash
         run: exit 0
+
+  build_iso:
+    name: build iso
+    needs: [check]
+    if: github.ref_name == 'testing'
+    # Eventually would be nice for building images in PRs
+    #if: ${{ endsWith(github.event.pull_request.title, '[ISO]') }}
+    uses: ./.github/workflows/build_iso.yml
+    secrets: inherit
diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 04f2cf762a6..a679eeaa742 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -1,18 +1,10 @@
 name: Build Bluefin ISOs
 on:
   workflow_dispatch:
-  pull_request:
-    branches:
-      - main
-      - testing
-    paths:
-      - '.github/workflows/build_iso.yml'
-
-env:
-  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
+  workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-iso
   cancel-in-progress: true
 
 jobs:
@@ -25,13 +17,92 @@ jobs:
     strategy:
       fail-fast: false
       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_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: [38, 39]
+        exclude:
+          - major_version: 38
+            image_name: bluefin-asus
+          - major_version: 38
+            image_name: bluefin-asus-nvidia
+          - major_version: 38
+            image_name: bluefin-dx-asus
+          - major_version: 38
+            image_name: bluefin-dx-asus-nvidia
+        include:
+          - major_version: 38
+            is_gts_version: true
+          - major_version: 39
+            is_gts_version: false
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@v1.3.1
 
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set Image Tag
+        id: generate-tag
+        shell: bash
+        run: |
+          TAG="latest"
+
+          if [[ ${{ matrix.is_gts_version }} == "true" ]]; then
+            TAG="gts"
+          fi
+
+          if [[ "${{ github.ref_name }}" == "testing" ]]; then
+            if [[ "${{ matrix.is_gts_version }}" == "true" ]]; then
+              TAG="gts-testing"
+            else
+              TAG="testing"
+            fi
+          fi
+
+          # Would like to implement in the future. This will allow us to support image tags from a PR.
+          #if [[ github.event.number ]]; then
+          #  TAG="pr-${{ github.event.number }}-${{ matrix.major_version }}"
+          #fi
+
+          echo "tag=${TAG}" >> $GITHUB_OUTPUT
+
+      - name: Determine Flatpak dependencies
+        id: flatpak_dependencies
+        shell: bash
+        run: |
+          set -ex
+          image="ghcr.io/ublue-os/${{ matrix.image_name }}:${{ steps.generate-tag.outputs.tag }}"
+          # Make temp space
+          TEMP_FLATPAK_INSTALL_DIR=$(mktemp -d -p ${{ github.workspace }} flatpak.XXX)
+          # Get list of refs from directory
+          FLATPAK_REFS_DIR=${{ github.workspace }}/flatpaks
+          FLATPAK_REFS_DIR_LIST=$(cat ${FLATPAK_REFS_DIR}/* | tr '\n' ' ' )
+          # Generate install script
+          cat << EOF > ${TEMP_FLATPAK_INSTALL_DIR}/script.sh
+          cat /temp_flatpak_install_dir/script.sh
+          mkdir -p /flatpak/flatpak /flatpak/triggers
+          mkdir /var/tmp || true
+          chmod -R 1777 /var/tmp
+          flatpak config --system --set languages "*"
+          flatpak remote-add --system flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install --system -y ${FLATPAK_REFS_DIR_LIST}
+          ostree refs --repo=\${FLATPAK_SYSTEM_DIR}/repo | grep '^deploy/' | grep -v 'org\.freedesktop\.Platform\.openh264' | sed 's/^deploy\///g' > /output/flatpaks_with_deps
+          EOF
+          docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume ${FLATPAK_REFS_DIR}:/output --volume ${TEMP_FLATPAK_INSTALL_DIR}:/temp_flatpak_install_dir ${image} /temp_flatpak_install_dir/script.sh
+          find ${FLATPAK_REFS_DIR}
+          docker rmi ${image}
+
       - name: Build ISOs
         uses: jasonn3/build-container-installer@main
         id: build
@@ -41,15 +112,18 @@ jobs:
           image_repo: ghcr.io/ublue-os
           variant: 'Silverblue'
           version: ${{ matrix.major_version }}
-          image_tag: ${{ matrix.image_tag }}
+          image_tag: ${{ steps.generate-tag.outputs.tag }}
           secure_boot_key_url: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
           enrollment_password: 'ublue-os'
-          iso_name: ${{ matrix.image_name }}-${{ matrix.image_tag }}-${{ matrix.major_version}}
+          iso_name: ${{ matrix.image_name }}-${{ steps.generate-tag.outputs.tag }}
           enable_cache_dnf: "false"
           enable_cache_skopeo: "false"
+          flatpak_remote_refs_dir: /github/workspace/flatpaks
+          enable_flatpak_dependencies: "false"
 
       - name: Upload ISOs and Checksum to Job Artifacts
-        if: github.event_name == 'pull_request'
+        if: github.ref_name == 'testing'
+        #if: github.event_name == 'pull_request'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.build.outputs.iso_name }}
@@ -74,6 +148,7 @@ jobs:
           SOURCE_ISO: ${{ steps.build.outputs.iso_path }}
           SOURCE_ISO_CHECKSUM: ${{ steps.build.outputs.iso_path }}-CHECKSUM
         run: |
-          dnf install -y rclone
+          apt-get update
+          apt-get install -y rclone
           rclone copy $SOURCE_ISO R2:bluefin
           rclone copy $SOURCE_ISO_CHECKSUM R2:bluefin
diff --git a/Containerfile b/Containerfile
index 9080943adeb..bfc69771bfa 100644
--- a/Containerfile
+++ b/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 && \
diff --git a/create_dependencies_idea.txt b/create_dependencies_idea.txt
new file mode 100644
index 00000000000..aba54159c85
--- /dev/null
+++ b/create_dependencies_idea.txt
@@ -0,0 +1,17 @@
+# 0. Create Container
+podman run --rm -it --entrypoint /bin/bash ghcr.io/ublue-os/bluefin:latest
+
+# 1. Setup Flatpak temp directory
+export FLATPAK_USER_DIR=$(mktemp -d)
+export FLATPAK_TRIGGERSDIR=$(mktemp -d)
+flatpak config --user --set languages "*"
+flatpak remote-add --user flathub https://flathub.org/repo/flathub.flatpakrepo
+
+# 2. Install list of flatpaks
+flatpak install --user -y $LIST_OF_FLATPAKS
+
+# 3. List Flatpaks and PARSE Columns Application ID, Arch, and Branch as $APPLICATION_ID/$ARCH/$BRANCH
+flatpak list --columns=application,arch,branch
+
+# 4. Feed parsed list to flatpak info command and grab spit out ref to a file
+flatpak info $APPLICATION_ID/$ARCH/$BRANCH
diff --git a/flatpaks/flatpaks b/flatpaks/flatpaks
new file mode 100755
index 00000000000..6c876d86f80
--- /dev/null
+++ b/flatpaks/flatpaks
@@ -0,0 +1,24 @@
+app/io.github.dvlv.boxbuddyrs/x86_64/stable
+app/io.github.celluloid_player.Celluloid/x86_64/stable
+app/org.fedoraproject.MediaWriter/x86_64/stable
+app/com.github.tchx84.Flatseal/x86_64/stable
+app/io.github.flattool.Warehouse/x86_64/stable
+app/org.gnome.baobab/x86_64/stable
+app/org.gnome.Calculator/x86_64/stable
+app/org.gnome.Calendar/x86_64/stable
+app/org.gnome.Characters/x86_64/stable
+app/org.gnome.clocks/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/com.mattjakeman.ExtensionManager/x86_64/stable
+app/org.gnome.font-viewer/x86_64/stable
+app/org.gnome.Logs/x86_64/stable
+app/org.gnome.Loupe/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/io.missioncenter.MissionCenter/x86_64/stable
+app/org.mozilla.firefox/x86_64/stable
+app/org.mozilla.Thunderbird/x86_64/stable
diff --git a/usr/libexec/ublue-system-flatpak-manager b/usr/libexec/ublue-system-flatpak-manager
index d7659c743a9..5a649d8389f 100755
--- a/usr/libexec/ublue-system-flatpak-manager
+++ b/usr/libexec/ublue-system-flatpak-manager
@@ -1,44 +1,4 @@
 #!/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
+# Use until yafti rework is done
+flatpak --system update -y

From 5a8c9e9a3ac5f250943e259a54c033b3909c3aad Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Tue, 26 Mar 2024 19:02:15 -0500
Subject: [PATCH 03/19] chore(ci): deleted not needed text file

---
 create_dependencies_idea.txt | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 create_dependencies_idea.txt

diff --git a/create_dependencies_idea.txt b/create_dependencies_idea.txt
deleted file mode 100644
index aba54159c85..00000000000
--- a/create_dependencies_idea.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# 0. Create Container
-podman run --rm -it --entrypoint /bin/bash ghcr.io/ublue-os/bluefin:latest
-
-# 1. Setup Flatpak temp directory
-export FLATPAK_USER_DIR=$(mktemp -d)
-export FLATPAK_TRIGGERSDIR=$(mktemp -d)
-flatpak config --user --set languages "*"
-flatpak remote-add --user flathub https://flathub.org/repo/flathub.flatpakrepo
-
-# 2. Install list of flatpaks
-flatpak install --user -y $LIST_OF_FLATPAKS
-
-# 3. List Flatpaks and PARSE Columns Application ID, Arch, and Branch as $APPLICATION_ID/$ARCH/$BRANCH
-flatpak list --columns=application,arch,branch
-
-# 4. Feed parsed list to flatpak info command and grab spit out ref to a file
-flatpak info $APPLICATION_ID/$ARCH/$BRANCH

From 3660f8d39458769d81cfe6c362653ed2fdeeb919 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Tue, 26 Mar 2024 19:32:02 -0500
Subject: [PATCH 04/19] chore(ci): create flathub --user repo

---
 usr/libexec/ublue-system-flatpak-manager | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/libexec/ublue-system-flatpak-manager b/usr/libexec/ublue-system-flatpak-manager
index 5a649d8389f..aa03f1f55ff 100755
--- a/usr/libexec/ublue-system-flatpak-manager
+++ b/usr/libexec/ublue-system-flatpak-manager
@@ -1,4 +1,8 @@
 #!/usr/bin/bash
 
+# For backwards compatibility (enable flathub for --user)
+flatpak remote-add --if-not-exists --user flathub /usr/etc/flatpak/remotes.d/flathub.flatpakrepo
+flatpak remote-modify --user --enable --prio=2 flathub
+
 # Use until yafti rework is done
 flatpak --system update -y

From f63578687dcdd5874f8e4284b915d37b0eaf18de Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Tue, 26 Mar 2024 19:35:00 -0500
Subject: [PATCH 05/19] chore(ci): enable global

---
 Containerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Containerfile b/Containerfile
index bfc69771bfa..0921357ae7c 100644
--- a/Containerfile
+++ b/Containerfile
@@ -119,6 +119,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
     systemctl enable tailscaled.service && \
     systemctl enable dconf-update.service && \
     systemctl enable ublue-system-flatpak-manager.service && \
+    systemctl --global enable ublue-system-flatpak-manager.service && \
     systemctl enable ublue-update.timer && \
     systemctl enable ublue-system-setup.service && \
     systemctl --global enable ublue-user-setup.service && \

From 9b095e010caaad8052aa184aefa9815ff4897107 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 11:54:12 -0500
Subject: [PATCH 06/19] chore(ci): disable surface temporarily

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ce85aa86b1a..105374f2e5b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_flavor: [main, nvidia, asus, asus-nvidia, surface, surface-nvidia]
+        image_flavor: [main, nvidia, asus, asus-nvidia ] # , surface, surface-nvidia]
         base_name: [bluefin, bluefin-dx]
         major_version: [38, 39]
         exclude:

From 9969d2f17a82a26c80ef73c17067ee7bed9ffa82 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 11:54:23 -0500
Subject: [PATCH 07/19] chore(ci): switch to release

---
 .github/workflows/build_iso.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index a679eeaa742..20b74c827d7 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -104,7 +104,7 @@ jobs:
           docker rmi ${image}
 
       - name: Build ISOs
-        uses: jasonn3/build-container-installer@main
+        uses: jasonn3/build-container-installer@v1.1.0
         id: build
         with:
           arch: x86_64

From 00c885cd8ba66ff8fc185ca43a401856d95983d4 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 11:55:05 -0500
Subject: [PATCH 08/19] chore(ci): rename ublue-system-flatpak-manager.service
 and update container file

---
 Containerfile                                 |  4 +-
 ....service => ublue-flatpak-manager.service} |  4 +-
 ...-flatpak-manager => ublue-flatpak-manager} |  0
 usr/libexec/ublue-user-flatpak-manager        | 53 -------------------
 4 files changed, 4 insertions(+), 57 deletions(-)
 rename usr/lib/systemd/system/{ublue-system-flatpak-manager.service => ublue-flatpak-manager.service} (75%)
 rename usr/libexec/{ublue-system-flatpak-manager => ublue-flatpak-manager} (100%)
 delete mode 100755 usr/libexec/ublue-user-flatpak-manager

diff --git a/Containerfile b/Containerfile
index 0921357ae7c..627cb27db1a 100644
--- a/Containerfile
+++ b/Containerfile
@@ -118,8 +118,8 @@ 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 --global enable ublue-system-flatpak-manager.service && \
+    systemctl enable ublue-flatpak-manager.service && \
+    systemctl --global enable ublue-flatpak-manager.service && \
     systemctl enable ublue-update.timer && \
     systemctl enable ublue-system-setup.service && \
     systemctl --global enable ublue-user-setup.service && \
diff --git a/usr/lib/systemd/system/ublue-system-flatpak-manager.service b/usr/lib/systemd/system/ublue-flatpak-manager.service
similarity index 75%
rename from usr/lib/systemd/system/ublue-system-flatpak-manager.service
rename to usr/lib/systemd/system/ublue-flatpak-manager.service
index 85631cbbe7e..656bd76ebe5 100644
--- a/usr/lib/systemd/system/ublue-system-flatpak-manager.service
+++ b/usr/lib/systemd/system/ublue-flatpak-manager.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=Manage system flatpaks
+Description=Manage flatpaks
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
 Wants=network-online.target
 After=network-online.target ublue-system-setup.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/ublue-system-flatpak-manager
+ExecStart=/usr/libexec/ublue-flatpak-manager
 Restart=on-failure
 RestartSec=30
 StartLimitInterval=0
diff --git a/usr/libexec/ublue-system-flatpak-manager b/usr/libexec/ublue-flatpak-manager
similarity index 100%
rename from usr/libexec/ublue-system-flatpak-manager
rename to usr/libexec/ublue-flatpak-manager
diff --git a/usr/libexec/ublue-user-flatpak-manager b/usr/libexec/ublue-user-flatpak-manager
deleted file mode 100755
index adc8ad22474..00000000000
--- a/usr/libexec/ublue-user-flatpak-manager
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/bash
-
-# Script Version
-VER=5
-VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/flatpak_manager_version"
-VER_RAN=$(cat $VER_FILE)
-
-mkdir -p "$(dirname "$VER_FILE")" || exit 1
-
-# Upgrade from v1 to v2 changes only the location of the VER_FILE.
-# Exit if v1 file is present.
-VER_1_FILE="$HOME/.ublue_flatpak_manager_version"
-if [[ -f $VER_1_FILE  ]]; then
-  echo "Networked tasks v$VER has already ran. Exiting..."
-  rm $VER_1_FILE
-  echo $VER > $VER_FILE
-  exit 0
-fi
-
-# Run script if updated
-if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
-  echo "Flatpak manager v$VER has already ran. Exiting..."
-  exit 0
-fi
-
-# Enable Flathub
-if grep -qz 'fedora' <<< $(flatpak remotes); then
-  flatpak remote-delete --user fedora --force
-fi
-flatpak remote-add --if-not-exists --user flathub /usr/etc/flatpak/remotes.d/flathub.flatpakrepo
-flatpak remote-modify --user --enable --prio=2 flathub
-
-# Lists of flatpaks
-FLATPAK_LIST=$(flatpak list --columns=application)
-INSTALL_LIST=$(cat /etc/flatpak/user/install)
-REMOVE_LIST=$(cat /etc/flatpak/user/remove)
-
-# Install flatpaks in list
-if [[ -n $INSTALL_LIST ]]; then
-  if ! flatpak install --user --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 --user --noninteractive ${REMOVE_LIST[@]}
-fi
-
-notify-send "Flatpak installer" "Finished installing user flatpaks" --app-name="Flatpak installer" -u NORMAL
-
-echo $VER > $VER_FILE

From be97a24ad7bf511f122ec9dc26f9c7c1293937d1 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 12:12:12 -0500
Subject: [PATCH 09/19] chore(ci): remove --global and debug ref_name

---
 .github/workflows/build.yml | 5 +++++
 Containerfile               | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 105374f2e5b..14706e7bd53 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,6 +52,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: debug ref_name
+        shell: bash
+        run: |
+          echo ${{ github.ref_name }}
+
       - name: Verify base image
         uses: EyeCantCU/cosign-action/verify@v0.2.2
         with:
diff --git a/Containerfile b/Containerfile
index 627cb27db1a..f51fa524924 100644
--- a/Containerfile
+++ b/Containerfile
@@ -119,7 +119,6 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
     systemctl enable tailscaled.service && \
     systemctl enable dconf-update.service && \
     systemctl enable ublue-flatpak-manager.service && \
-    systemctl --global enable ublue-flatpak-manager.service && \
     systemctl enable ublue-update.timer && \
     systemctl enable ublue-system-setup.service && \
     systemctl --global enable ublue-user-setup.service && \

From cdb4fd260fc4c41bf17348597757eff014c63270 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 12:38:04 -0500
Subject: [PATCH 10/19] chore(ci): fixup capitalization and fixup tag

---
 .github/workflows/build_iso.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 20b74c827d7..3c6308ee5d1 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@v1.3.1
 
-      - name: Checkout repo
+      - name: Checkout Repo
         uses: actions/checkout@v4
 
       - name: Set Image Tag
@@ -77,7 +77,7 @@ jobs:
 
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
 
-      - name: Determine Flatpak dependencies
+      - name: Determine Flatpak Dependencies
         id: flatpak_dependencies
         shell: bash
         run: |
@@ -104,7 +104,7 @@ jobs:
           docker rmi ${image}
 
       - name: Build ISOs
-        uses: jasonn3/build-container-installer@v1.1.0
+        uses: jasonn3/build-container-installer@1.1.0
         id: build
         with:
           arch: x86_64

From 4962cee0efffccfbe30a45ff02c46957d31177d8 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 14:08:59 -0500
Subject: [PATCH 11/19] chore(ci): cleaned up formatting and using version
 1.1.1

---
 .github/workflows/build_iso.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 3c6308ee5d1..1bee1e8499e 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -99,12 +99,17 @@ jobs:
           flatpak install --system -y ${FLATPAK_REFS_DIR_LIST}
           ostree refs --repo=\${FLATPAK_SYSTEM_DIR}/repo | grep '^deploy/' | grep -v 'org\.freedesktop\.Platform\.openh264' | sed 's/^deploy\///g' > /output/flatpaks_with_deps
           EOF
-          docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume ${FLATPAK_REFS_DIR}:/output --volume ${TEMP_FLATPAK_INSTALL_DIR}:/temp_flatpak_install_dir ${image} /temp_flatpak_install_dir/script.sh
-          find ${FLATPAK_REFS_DIR}
+          docker run --rm --privileged \
+            --entrypoint bash \
+            -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak \
+            -e FLATPAK_TRIGGERSDIR=/flatpak/triggers \
+            --volume ${FLATPAK_REFS_DIR}:/output \
+            --volume ${TEMP_FLATPAK_INSTALL_DIR}:/temp_flatpak_install_dir \
+            ${image} /temp_flatpak_install_dir/script.sh
           docker rmi ${image}
 
       - name: Build ISOs
-        uses: jasonn3/build-container-installer@1.1.0
+        uses: jasonn3/build-container-installer@v1.1.1
         id: build
         with:
           arch: x86_64

From 5f7d2d02ddf48e5c527710fc4f1a8acb42c99c90 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 15:58:12 -0500
Subject: [PATCH 12/19] chore(ci): Add as user service instead

---
 Containerfile                                     |  2 +-
 .../ublue-flatpak-manager.service                 |  0
 .../user/ublue-user-flatpak-manager.service       | 15 ---------------
 3 files changed, 1 insertion(+), 16 deletions(-)
 rename usr/lib/systemd/{system => user}/ublue-flatpak-manager.service (100%)
 delete mode 100644 usr/lib/systemd/user/ublue-user-flatpak-manager.service

diff --git a/Containerfile b/Containerfile
index f51fa524924..6d27e865c07 100644
--- a/Containerfile
+++ b/Containerfile
@@ -118,7 +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-flatpak-manager.service && \
+    systemctl --global enable ublue-flatpak-manager.service && \
     systemctl enable ublue-update.timer && \
     systemctl enable ublue-system-setup.service && \
     systemctl --global enable ublue-user-setup.service && \
diff --git a/usr/lib/systemd/system/ublue-flatpak-manager.service b/usr/lib/systemd/user/ublue-flatpak-manager.service
similarity index 100%
rename from usr/lib/systemd/system/ublue-flatpak-manager.service
rename to usr/lib/systemd/user/ublue-flatpak-manager.service
diff --git a/usr/lib/systemd/user/ublue-user-flatpak-manager.service b/usr/lib/systemd/user/ublue-user-flatpak-manager.service
deleted file mode 100644
index 037fb2eea78..00000000000
--- a/usr/lib/systemd/user/ublue-user-flatpak-manager.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Manage user flatpaks
-Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/libexec/ublue-user-flatpak-manager
-Restart=on-failure
-RestartSec=30
-StartLimitInterval=0
-
-[Install]
-WantedBy=default.target

From 4c27dc2428a95080c7b62770f08888d11eee3114 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 17:13:03 -0500
Subject: [PATCH 13/19] chore(ci): fixup ublue-flatpak-manager to only run once

---
 .../user/ublue-flatpak-manager.service        |  2 +-
 usr/libexec/ublue-flatpak-manager             | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/usr/lib/systemd/user/ublue-flatpak-manager.service b/usr/lib/systemd/user/ublue-flatpak-manager.service
index 656bd76ebe5..fd4f88c4d39 100644
--- a/usr/lib/systemd/user/ublue-flatpak-manager.service
+++ b/usr/lib/systemd/user/ublue-flatpak-manager.service
@@ -2,7 +2,7 @@
 Description=Manage flatpaks
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
 Wants=network-online.target
-After=network-online.target ublue-system-setup.service
+After=network-online.target
 
 [Service]
 Type=oneshot
diff --git a/usr/libexec/ublue-flatpak-manager b/usr/libexec/ublue-flatpak-manager
index aa03f1f55ff..be2eb1c9595 100755
--- a/usr/libexec/ublue-flatpak-manager
+++ b/usr/libexec/ublue-flatpak-manager
@@ -1,8 +1,21 @@
 #!/usr/bin/bash
 
-# For backwards compatibility (enable flathub for --user)
-flatpak remote-add --if-not-exists --user flathub /usr/etc/flatpak/remotes.d/flathub.flatpakrepo
-flatpak remote-modify --user --enable --prio=2 flathub
+# Script Version
+VER=1
+VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/flatpak_manager_version"
+VER_RAN=$(cat $VER_FILE)
+
+mkdir -p "$(dirname "$VER_FILE")" || exit 1
+
+# Run script if updated
+if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
+	echo "Flatpak manager v$VER has already ran. Exiting..."
+	exit 0
+fi
 
 # Use until yafti rework is done
 flatpak --system update -y
+
+notify-send "Flatpak Manager Service" "Finished Updating System Flatpaks" --app-name="Flatpak Manager Service" -u NORMAL
+
+echo $VER >$VER_FILE

From a8cd7c0d71850afdec99c88f73700120a4c67d88 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 27 Mar 2024 21:15:50 -0500
Subject: [PATCH 14/19] chore(ci): changed WantedBy to default.target

---
 usr/lib/systemd/user/ublue-flatpak-manager.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/lib/systemd/user/ublue-flatpak-manager.service b/usr/lib/systemd/user/ublue-flatpak-manager.service
index fd4f88c4d39..8db5defd89e 100644
--- a/usr/lib/systemd/user/ublue-flatpak-manager.service
+++ b/usr/lib/systemd/user/ublue-flatpak-manager.service
@@ -12,4 +12,4 @@ RestartSec=30
 StartLimitInterval=0
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target

From 42ece0b67d2571f276a40c8a28ff3eb96b1256ee Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Thu, 28 Mar 2024 00:09:46 -0500
Subject: [PATCH 15/19] chore(ci): fixup merge conflict

---
 .github/workflows/build.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9105f3442ea..51439f1d883 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,6 +39,10 @@ jobs:
             image_flavor: asus
           - major_version: 38
             image_flavor: asus-nvidia
+          - major_version: 38
+            image_flavor: surface
+          - major_version: 38
+            image_flavor: surface-nvidia
         include:
           - major_version: 38
             is_latest_version: false
@@ -48,15 +52,6 @@ jobs:
             is_latest_version: true
             is_stable_version: true
             is_gts_version: false
-        exclude:
-          - major_version: 38
-            image_flavor: asus
-          - major_version: 38
-            image_flavor: asus-nvidia
-          - major_version: 38
-            image_flavor: surface
-          - major_version: 38
-            image_flavor: surface-nvidia
 
     steps:
       - name: Checkout

From 1dbd2c4bdcfe44e8bac864cef99223c6214a9468 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Thu, 28 Mar 2024 10:45:38 -0500
Subject: [PATCH 16/19] chore(ci): add surface back

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 51439f1d883..8f2af6f649d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_flavor: [main, nvidia, asus, asus-nvidia ] # , surface, surface-nvidia]
+        image_flavor: [main, nvidia, asus, asus-nvidia, surface, surface-nvidia]
         base_name: [bluefin, bluefin-dx]
         major_version: [38, 39]
         exclude:

From 16014cc994681437cbe516bdab2aeeead3fb8a4a Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Thu, 28 Mar 2024 10:51:26 -0500
Subject: [PATCH 17/19] chore(ci): add framework back

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f2af6f649d..8065d906d3d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_flavor: [main, nvidia, asus, asus-nvidia, surface, surface-nvidia]
+        image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
         base_name: [bluefin, bluefin-dx]
         major_version: [38, 39]
         exclude:

From 00f44fc04bda15381a5592b81104f05e1d70430f Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Thu, 28 Mar 2024 10:52:41 -0500
Subject: [PATCH 18/19] chore(ci): move include back up

---
 .github/workflows/build.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8065d906d3d..acad5ae4e8b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,15 +34,6 @@ jobs:
         image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
         base_name: [bluefin, bluefin-dx]
         major_version: [38, 39]
-        exclude:
-          - major_version: 38
-            image_flavor: asus
-          - major_version: 38
-            image_flavor: asus-nvidia
-          - major_version: 38
-            image_flavor: surface
-          - major_version: 38
-            image_flavor: surface-nvidia
         include:
           - major_version: 38
             is_latest_version: false
@@ -52,6 +43,15 @@ jobs:
             is_latest_version: true
             is_stable_version: true
             is_gts_version: false
+        exclude:
+          - major_version: 38
+            image_flavor: asus
+          - major_version: 38
+            image_flavor: asus-nvidia
+          - major_version: 38
+            image_flavor: surface
+          - major_version: 38
+            image_flavor: surface-nvidia
 
     steps:
       - name: Checkout

From 536829e70c56290a45bf703bfccabb66e7756da6 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Thu, 28 Mar 2024 10:53:12 -0500
Subject: [PATCH 19/19] chore(ci): remove debug statement

---
 .github/workflows/build.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index acad5ae4e8b..bfc399f21a8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,11 +57,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: debug ref_name
-        shell: bash
-        run: |
-          echo ${{ github.ref_name }}
-
       - name: Verify base image
         uses: EyeCantCU/cosign-action/verify@v0.2.2
         with: