From 955d7033b8e584234c69c30804ea71acda19bbd6 Mon Sep 17 00:00:00 2001
From: renner <renner0@posteo.de>
Date: Wed, 22 Oct 2025 16:35:10 +0200
Subject: [PATCH 1/5] feat: check if bazaar flatpak preinstall file is present

---
 build_files/base/20-tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build_files/base/20-tests.sh b/build_files/base/20-tests.sh
index aceb68720..e05973e40 100755
--- a/build_files/base/20-tests.sh
+++ b/build_files/base/20-tests.sh
@@ -8,6 +8,10 @@ xmllint --noout \
   /usr/share/backgrounds/default.xml \
   /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml
 
+# If this file is not on the image bazaar will automatically be removed from users systems :(
+# See: https://docs.flatpak.org/en/latest/flatpak-command-reference.html#flatpak-preinstall
+test -f /usr/share/flatpak/preinstall.d/bazaar.preinstall
+
 desktop-file-validate \
   /usr/share/applications/Discourse.desktop \
   /usr/share/applications/boot-to-windows.desktop \

From 0472d8436939e0af96f9caac1da0dcefdda7ff5e Mon Sep 17 00:00:00 2001
From: renner <renner0@posteo.de>
Date: Wed, 22 Oct 2025 16:35:46 +0200
Subject: [PATCH 2/5] feat: check for more important packages

---
 build_files/base/20-tests.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build_files/base/20-tests.sh b/build_files/base/20-tests.sh
index e05973e40..d09c32c51 100755
--- a/build_files/base/20-tests.sh
+++ b/build_files/base/20-tests.sh
@@ -22,12 +22,20 @@ desktop-file-validate \
 
 IMPORTANT_PACKAGES=(
     bazaar
+    distrobox
     fish
+    flatpak
     krunner-bazaar
+    kwin
+    pipewire
+    plasma-desktop
     ptyxis
+    sddm
     starship
+    systemd
     tailscale
     uupd
+    wireplumber
     zsh
 )
 

From 3cb9acdbdb5d871590f704df2a20a17e69377647 Mon Sep 17 00:00:00 2001
From: renner <renner0@posteo.de>
Date: Wed, 22 Oct 2025 16:37:34 +0200
Subject: [PATCH 3/5] feat: check if removed packages are actually removed

some of those are from main, in case that blows up
---
 build_files/base/20-tests.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/build_files/base/20-tests.sh b/build_files/base/20-tests.sh
index d09c32c51..124bb5809 100755
--- a/build_files/base/20-tests.sh
+++ b/build_files/base/20-tests.sh
@@ -43,6 +43,20 @@ for package in "${IMPORTANT_PACKAGES[@]}"; do
     rpm -q "${package}" >/dev/null || { echo "Missing package: ${package}... Exiting"; exit 1 ; }
 done
 
+# these packages are supposed to be removed
+# and are considered footguns
+UNWANTED_PACKAGES=(
+    firefox
+    plasma-discover-kns
+    plasma-discover-rpm-ostree
+    podman-docker
+)
+
+for package in "${UNWANTED_PACKAGES[@]}"; do
+    if rpm -q "${package}" >/dev/null 2>&1; then
+        echo "Unwanted package found: ${package}... Exiting"; exit 1
+    fi
+done
 IMPORTANT_UNITS=(
     brew-update.timer
     brew-upgrade.timer

From 1aa9736b574b34f747ea1720eb56bf06f7c93672 Mon Sep 17 00:00:00 2001
From: renner <renner0@posteo.de>
Date: Wed, 22 Oct 2025 16:40:15 +0200
Subject: [PATCH 4/5] feat: check if nvidia has nvidia stuff installed

---
 build_files/base/20-tests.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build_files/base/20-tests.sh b/build_files/base/20-tests.sh
index 124bb5809..6cd0215cd 100755
--- a/build_files/base/20-tests.sh
+++ b/build_files/base/20-tests.sh
@@ -57,6 +57,18 @@ for package in "${UNWANTED_PACKAGES[@]}"; do
         echo "Unwanted package found: ${package}... Exiting"; exit 1
     fi
 done
+
+if [[ "${IMAGE_NAME}" =~ nvidia ]]; then
+  NV_PACKAGES=(
+      libnvidia-container-tools
+      kmod-nvidia
+      nvidia-driver-cuda
+)
+  for package in "${NV_PACKAGES[@]}"; do
+      rpm -q "${package}" >/dev/null || { echo "Missing NVIDIA package: ${package}... Exiting"; exit 1 ; }
+  done
+fi
+
 IMPORTANT_UNITS=(
     brew-update.timer
     brew-upgrade.timer

From d67188a7aaba008ba02d4f37ee1c6d05cf6809b8 Mon Sep 17 00:00:00 2001
From: renner <renner0@posteo.de>
Date: Sat, 25 Oct 2025 11:01:46 +0200
Subject: [PATCH 5/5] fix: don't do nvidia for now

---
 build_files/base/20-tests.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/build_files/base/20-tests.sh b/build_files/base/20-tests.sh
index 6e503cd32..ef637202b 100755
--- a/build_files/base/20-tests.sh
+++ b/build_files/base/20-tests.sh
@@ -57,16 +57,17 @@ for package in "${UNWANTED_PACKAGES[@]}"; do
     fi
 done
 
-if [[ "${IMAGE_NAME}" =~ nvidia ]]; then
-  NV_PACKAGES=(
-      libnvidia-container-tools
-      kmod-nvidia
-      nvidia-driver-cuda
-)
-  for package in "${NV_PACKAGES[@]}"; do
-      rpm -q "${package}" >/dev/null || { echo "Missing NVIDIA package: ${package}... Exiting"; exit 1 ; }
-  done
-fi
+# TODO: Enable when libnvidia-container-tools are on F43
+#if [[ "${IMAGE_NAME}" =~ nvidia ]]; then
+#  NV_PACKAGES=(
+#      libnvidia-container-tools
+#      kmod-nvidia
+#      nvidia-driver-cuda
+#)
+#  for package in "${NV_PACKAGES[@]}"; do
+#      rpm -q "${package}" >/dev/null || { echo "Missing NVIDIA package: ${package}... Exiting"; exit 1 ; }
+#  done
+#fi
 
 IMPORTANT_UNITS=(
     brew-update.timer