chore: Restore nokmods images

These were disabled after hwcompat was implemented however, these could
still be useful for people working on images based off of Bazzite that
want to use a custom kernel or have greater control over what kmods they
want to utilize

.github/workflows/build.yml

@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
+        image_flavor: [main, nokmods, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
         base_name: [bazzite, bazzite-deck]
         base_image_name: [kinoite, silverblue]
         major_version: [39]
@@ -96,6 +96,11 @@ jobs:
           else
               echo "AKMODS_FLAVOR=main" >> $GITHUB_ENV
           fi
+          if [[ "${{ matrix.image_flavor }}" =~ "nokmods" ]]; then
+              echo "SOURCE_FLAVOR=main" >> $GITHUB_ENV
+          else
+              echo "SOURCE_FLAVOR=${{ matrix.image_flavor }}" >> $GITHUB_ENV
+          fi
 
       - name: Generate tags
         id: generate-tags
@@ -187,6 +192,7 @@ jobs:
             IMAGE_VENDOR=${{ github.repository_owner }}
             BASE_IMAGE_NAME=${{ matrix.base_image_name }}
             FEDORA_MAJOR_VERSION=${{ matrix.major_version }}
+            SOURCE_FLAVOR=${{ env.SOURCE_FLAVOR }}
             AKMODS_FLAVOR=${{ env.AKMODS_FLAVOR }}
           labels: ${{ steps.meta.outputs.labels }}
           oci: false

Containerfile

@@ -1,7 +1,8 @@
 ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
 ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}"
-ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}"
+ARG SOURCE_FLAVOR="${SOURCE_FLAVOR:-main}"
+ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$SOURCE_FLAVOR}"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 
@@ -18,26 +19,28 @@ COPY system_files/desktop/shared system_files/desktop/${BASE_IMAGE_NAME} /
 
 # Add ublue packages, 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 && \
+RUN if [[ "${IMAGE_FLAVOR}" != nokmods ]]; then \
-    wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
+        sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
-    if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \
+        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/*xpad-noone*.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 && \
         rpm-ostree install \
-            /tmp/akmods-rpms/kmods/*xpadneo*.rpm \
+            /tmp/akmods-rpms/kmods/*gcadapter_oc*.rpm \
-            /tmp/akmods-rpms/kmods/*xpad-noone*.rpm \
+            /tmp/akmods-rpms/kmods/*nct6687*.rpm \
-            /tmp/akmods-rpms/kmods/*xone*.rpm \
+            /tmp/akmods-rpms/kmods/*openrgb*.rpm \
-            /tmp/akmods-rpms/kmods/*openrazer*.rpm \
+            /tmp/akmods-rpms/kmods/*ryzen-smu*.rpm \
-            /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
+            /tmp/akmods-rpms/kmods/*winesync*.rpm && \
-            /tmp/akmods-rpms/kmods/*wl*.rpm \
+        sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
-    ; fi && \
+        mkdir -p /etc/akmods-rpms/ && \
-    rpm-ostree install \
+        mv /tmp/akmods-rpms/kmods/*steamdeck*.rpm /etc/akmods-rpms/steamdeck.rpm \
-        /tmp/akmods-rpms/kmods/*gcadapter_oc*.rpm \
+    ; fi
-        /tmp/akmods-rpms/kmods/*nct6687*.rpm \
-        /tmp/akmods-rpms/kmods/*openrgb*.rpm \
-        /tmp/akmods-rpms/kmods/*ryzen-smu*.rpm \
-        /tmp/akmods-rpms/kmods/*winesync*.rpm && \
-    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
-    mkdir -p /etc/akmods-rpms/ && \
-    mv /tmp/akmods-rpms/kmods/*steamdeck*.rpm /etc/akmods-rpms/steamdeck.rpm
 
 # Setup Copr repos
 RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
@@ -375,9 +378,11 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
     sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo
 
 # Install Valve's Steam Deck drivers as kmod
-RUN rpm-ostree install \
+RUN if [[ "${IMAGE_FLAVOR}" != "nokmods" ]]; then \
-    /etc/akmods-rpms/steamdeck.rpm && \
+        rpm-ostree install \
-    rm -rf /etc/akmods-rpms
+        /etc/akmods-rpms/steamdeck.rpm && \
+        rm -rf /etc/akmods-rpms \
+    ; fi
 
 RUN if [[ "${FEDORA_MAJOR_VERSION}" -lt "39" ]]; then \
         rpm-ostree override replace \