chore: Kernel cleanup, fix switcheroo install

Containerfile

@@ -113,9 +113,12 @@ RUN --mount=type=cache,dst=/var/cache/libdnf5 \
 RUN --mount=type=cache,dst=/var/cache/libdnf5 \
     --mount=type=cache,dst=/var/cache/rpm-ostree \
     --mount=type=bind,from=kernel,src=/tmp/rpms,dst=/tmp/kernel-rpms \
+    --mount=type=bind,from=akmods,src=/rpms,dst=/tmp/akmods-rpms \
+    --mount=type=bind,from=akmods-extra,src=/rpms,dst=/tmp/akmods-extra-rpms \
     --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=tmpfs,dst=/tmp \
-    /ctx/install-kernel && \
+    /ctx/install-kernel-akmods && \
+    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-*.repo && \
     dnf5 -y install \
         scx-scheds && \
     dnf5 -y swap \
@@ -156,28 +159,19 @@ RUN --mount=type=cache,dst=/var/cache/libdnf5 \
     /ctx/install-firmware && \
     /ctx/cleanup
 
-# Add ublue packages
+# Install patched fwupd
+# Install Valve's patched Mesa, Pipewire, Bluez, and Xwayland
+# Install patched switcheroo control with proper discrete GPU support
 RUN --mount=type=cache,dst=/var/cache/libdnf5 \
     --mount=type=cache,dst=/var/cache/rpm-ostree \
-    --mount=type=bind,from=akmods,src=/rpms,dst=/tmp/akmods-rpms \
-    --mount=type=bind,from=akmods-extra,src=/rpms,dst=/tmp/akmods-extra-rpms \
     --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=tmpfs,dst=/tmp \
-    dnf5 -y copr enable ublue-os/akmods && \
-    /ctx/install-akmods && \
     dnf5 -y swap \
     --repo copr:copr.fedorainfracloud.org:ublue-os:staging \
         fwupd fwupd && \
-    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-*.repo && \
-    /ctx/cleanup
-
-# Install Valve's patched Mesa, Pipewire, Bluez, and Xwayland#
-# Install patched switcheroo control with proper discrete GPU support
-# Tempporary fix for GPU Encoding
-RUN --mount=type=cache,dst=/var/cache/libdnf5 \
-    --mount=type=cache,dst=/var/cache/rpm-ostree \
-    --mount=type=bind,from=ctx,source=/,target=/ctx \
-    --mount=type=tmpfs,dst=/tmp \
+    dnf5 -y swap \
+    --repo terra-extras \
+        switcheroo-control switcheroo-control && \
     dnf5 -y swap \
     --repo terra-extras \
         mesa-filesystem mesa-filesystem && \

build_files/install-akmods → build_files/install-kernel-akmods

@@ -2,6 +2,17 @@
 
 set -eoux pipefail
 
+for pkg in kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
+do
+	rpm --erase "$pkg" --nodeps
+done
+
+dnf5 -y install \
+    /tmp/kernel-rpms/kernel-[0-9]*.rpm \
+    /tmp/kernel-rpms/kernel-core-*.rpm \
+    /tmp/kernel-rpms/kernel-modules-*.rpm \
+    /tmp/kernel-rpms/kernel-uki-virt-*.rpm
+
 dnf5 -y install \
     /tmp/akmods-rpms/kmods/*kvmfr*.rpm \
     /tmp/akmods-rpms/kmods/*xone*.rpm \