Rebase the entire thing to Bazzite. It's literally what I wanted anyway.

Containerfile

@@ -1,8 +1,10 @@
-ARG SOURCE_IMAGE="base"
-ARG SOURCE_SUFFIX="-main"
-ARG SOURCE_TAG="40"
+ARG SOURCE_IMAGE="bazzite"
+ARG SOURCE_SUFFIX="nvidia"
+ARG SOURCE_TAG="stable"
 
-FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${SOURCE_TAG}
+FROM ghcr.io/ublue-os/${SOURCE_IMAGE}-${SOURCE_SUFFIX}:${SOURCE_TAG}
+
+ARG KERNEL_FLAVOR=""
 
 COPY filesystem /
 COPY ["scripts","data", "/tmp/buildtmp/"]

data/packages.json

@@ -1,55 +1,15 @@
 {
     "repos": [
-        "https://pkgs.tailscale.com/stable/fedora/tailscale.repo"
-    ],
-    "WindowManagers": [
-        "i3",
-        "i3-doc",
-        "i3-config",
-        "i3-devel",
-        "polybar",
-        "jsoncpp-devel",
-        "xcb-util-xrm-devel",
-        "xcb-util-cursor-devel",
-        "libnl3-devel"
-    ],
-    "Audio": [
-        "pipewire-pulseaudio",
-        "pipewire-utils",
-        "wireplumber"
     ],
     "ShellUtilities": [
         "zsh",
         "btop",
         "iftop",
         "iotop",
         "tmux",
-        "inxi",
-        "qemu-guest-agent"
+        "inxi"
     ],
     "Editors": [
         "neovim"
-    ],
-    "X11": [
-        "xorg-x11-server-Xorg",
-        "xorg-x11-xinit",
-        "xorg-x11-drivers",
-        "xorg-x11-xauth",
-        "mesa-dri-drivers",
-        "mesa-vulkan-drivers",
-        "mesa-libGL",
-        "mesa-libEGL",
-        "mesa-libGLU",
-        "glx-utils",
-        "xrandr",
-        "xsetroot",
-        "xclip",
-        "xterm",
-        "sddm",
-        "sddm-themes",
-        "sddm-x11"
-    ],
-    "Networking": [
-        "tailscale"
     ]
 }

filesystem/usr/share/ublue-os/just/99-redquasar.just

@@ -16,7 +16,9 @@ install-system-flatpaks:
         flatpak uninstall -y $app
     done
     flatpak remote-delete fedora --force 2>/dev/null
-    echo "Installing recommended system flatpaks.."
+    echo "Installing Bazzite recommended flatpaks."
+    ujust _install_system_flatpaks
+    echo "Installing redquasar-ublue system flatpaks.."
     SYSTEM_FLATPAK_LIST="$(curl https://raw.githubusercontent.com/ahallrq/redquasar-ublue/main/flatpaks/system_flatpaks | tr '\n' ' ')"
     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     flatpak --system -y install ${SYSTEM_FLATPAK_LIST}