feat: Fedora 41 (#503)

* feat: migrate to f41

* exclude yafti until it's available for f41

* build fixes

* use correct wayblue f41 branch tag

* fix: add yafti back

* feat: include google-noto-fonts-all for universal font coverage

* fix: typo

* chore: use negativo for all nvidia stuff, then remove the repo

* add debug line

* fix nvidia builds

* fix file path

* prep for 41

* remove redundant systemctl commands

* remove dkmshelper

* include minimal server components for nvidia

* fix typo

* prep for f41

* fix nvidia server modules

* various fixes

* more fixes

* fix (again)

* move gstreamer packages

* more gstreamer refactoring

* include additional removal

.github/workflows/build.yml

@@ -43,9 +43,9 @@ jobs:
           - general/recipe-wayblue-sway-main.yml
           - general/recipe-wayblue-sway-nvidia.yml
           - general/recipe-wayblue-sway-nvidia-open.yml
-          # - general/recipe-cosmic-main.yml
-          # - general/recipe-cosmic-nvidia.yml
-          # - general/recipe-cosmic-nvidia-open.yml
+          - general/recipe-cosmic-main.yml
+          - general/recipe-cosmic-nvidia.yml
+          - general/recipe-cosmic-nvidia-open.yml
           # server
           - securecore/recipe-securecore-main.yml
           - securecore/recipe-securecore-nvidia.yml
@@ -76,9 +76,9 @@ jobs:
           - general/recipe-wayblue-sway-main-userns.yml
           - general/recipe-wayblue-sway-nvidia-userns.yml
           - general/recipe-wayblue-sway-nvidia-open-userns.yml
-          # - general/recipe-cosmic-main-userns.yml
-          # - general/recipe-cosmic-nvidia-userns.yml
-          # - general/recipe-cosmic-nvidia-open-userns.yml
+          - general/recipe-cosmic-main-userns.yml
+          - general/recipe-cosmic-nvidia-userns.yml
+          - general/recipe-cosmic-nvidia-open-userns.yml
           # server
           - securecore/recipe-securecore-main-userns.yml
           - securecore/recipe-securecore-nvidia-userns.yml
@@ -117,8 +117,8 @@ jobs:
           attempt_delay: 15000
           command: |
             set -eo pipefail
-            linux=$(skopeo inspect docker://ghcr.io/ublue-os/coreos-testing-kernel:40 | jq -r '.Labels["ostree.linux"]')
-            AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:coreos-testing-40 | jq -r '.Labels["ostree.linux"]')
+            linux=$(skopeo inspect docker://ghcr.io/ublue-os/coreos-testing-kernel:41 | jq -r '.Labels["ostree.linux"]')
+            AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:coreos-testing-41 | jq -r '.Labels["ostree.linux"]')
             if [[ "${linux}" != "${AKMODS_KERNEL_VERSION}" ]]; then
               echo "Kernel Versions do not match between AKMODS and Cached-Kernel."
               exit 1
@@ -133,8 +133,8 @@ jobs:
           attempt_delay: 15000
           command: |
             set -eo pipefail
-            linux=$(skopeo inspect docker://ghcr.io/ublue-os/main-kernel:40 | jq -r '.Labels["ostree.linux"]')
-            AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:main-40 | jq -r '.Labels["ostree.linux"]')
+            linux=$(skopeo inspect docker://ghcr.io/ublue-os/main-kernel:41 | jq -r '.Labels["ostree.linux"]')
+            AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:main-41 | jq -r '.Labels["ostree.linux"]')
             if [[ "${linux}" != "${AKMODS_KERNEL_VERSION}" ]]; then
               echo "Kernel Versions do not match between AKMODS and Cached-Kernel."
               exit 1

files/scripts/enablecommonautoupdate.sh

@@ -4,6 +4,4 @@
 set -oue pipefail
 
 systemctl enable rpm-ostreed-automatic.timer
-systemctl enable brew-upgrade.timer
-systemctl enable brew-update.timer
 systemctl --global enable podman-auto-update.timer

files/scripts/enableflatpakautoupdate.sh

@@ -3,5 +3,5 @@
 # Tell build process to exit if there are any errors.
 set -oue pipefail
 
-systemctl enable --user flatpak-user-update.timer
+systemctl --global enable flatpak-user-update.timer
 systemctl enable flatpak-system-update.timer

files/scripts/installproprietarypackages.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo
+sed -i '0,/enabled=1/{s/enabled=1/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
+
+rpm-ostree override replace \
+  --experimental \
+  --from repo='fedora-multimedia' \
+    libheif \
+    libva \
+    libva-intel-media-driver \
+    mesa-dri-drivers \
+    mesa-filesystem \
+    mesa-libEGL \
+    mesa-libGL \
+    mesa-libgbm \
+    mesa-libglapi \
+    mesa-libxatracker \
+    mesa-va-drivers \
+    mesa-vulkan-drivers \
+    gstreamer1-plugin-libav \
+    gstreamer1-plugin-vaapi 

files/scripts/removedkmshelper.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+rm -f /usr/libexec/gnome-software-dkms-helper

files/scripts/setearlyloading.sh

@@ -3,5 +3,5 @@
 # Tell build process to exit if there are any errors.
 set -oue pipefail
 
-sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia-dracut.conf
-sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia-dracut.conf
+sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
+sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf

generate_secureblue_iso.sh

@@ -69,7 +69,7 @@ is_yes "$use_userns" && additional_params+="-userns"
 
 image_name+="$additional_params-hardened"
 
-command="sudo podman run --rm --privileged --volume .:/build-container-installer/build ghcr.io/jasonn3/build-container-installer:latest IMAGE_REPO=ghcr.io/secureblue IMAGE_NAME=$image_name VERSION=40 IMAGE_TAG=latest VARIANT=$variant"
+command="sudo podman run --rm --privileged --volume .:/build-container-installer/build ghcr.io/jasonn3/build-container-installer:latest IMAGE_REPO=ghcr.io/secureblue IMAGE_NAME=$image_name VERSION=41 IMAGE_TAG=latest VARIANT=$variant"
 
 echo "Command to execute:"
 echo "$command"

recipes/common/desktop-modules.yml

@@ -1,12 +1,12 @@
 modules:
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/akmods:main-40 /rpms /tmp/rpms
+        - COPY --from=ghcr.io/ublue-os/akmods:main-41 /rpms /tmp/rpms
         - RUN find /tmp/rpms
         - RUN rpm -q ublue-os-akmods-addons || rpm-ostree install /tmp/rpms/ublue-os/ublue-os-akmods-addons*.rpm
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/main-kernel:40 /tmp/rpms /tmp/rpms/kernel
+        - COPY --from=ghcr.io/ublue-os/main-kernel:41 /tmp/rpms /tmp/rpms/kernel
     - type: script
       scripts:
         - installsignedkernel.sh
@@ -15,4 +15,4 @@ modules:
     - type: script
       scripts:
         - enableflatpakautoupdate.sh
-    - type: yafti
+    - type: yafti

recipes/common/desktop-packages.yml

@@ -13,7 +13,6 @@ install:
   - setroubleshoot
   - setools
   - fscrypt
-  - heif-pixbuf-loader
   - vim
   - alsa-firmware
   
@@ -22,6 +21,9 @@ install:
   - pam_yubico
   - pamu2fcfg
   - yubikey-manager
+
+  # ensure universal font coverage
+  - google-noto-fonts-all
 remove:
   - firefox
   - firefox-langpacks

recipes/common/kinoite-modules.yml

@@ -8,6 +8,8 @@ modules:
       - fuse-encfs
       - krfb
       - krfb-libs
+      # depends on fedora-flathub-remote
+      - plasma-welcome-fedora
   - type: files
     files:  
       - source: system/kinoite

recipes/common/nvidia-modules.yml

@@ -1,13 +1,15 @@
 modules:
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-40 /rpms /tmp/rpms
+        - COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-41 /rpms /tmp/rpms
         - RUN find /tmp/rpms
         - RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
         - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
-        - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm nvidia-container-toolkit xorg-x11-drv-nvidia xorg-x11-drv-nvidia-cuda nvidia-vaapi-driver
+        - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo  
+        - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm libnvidia-fbc libva-nvidia-driver nvidia-driver nvidia-driver-cuda nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit 
     - type: script
       scripts:
         - installnvidiatoolkitpolicy.sh
+        - removeunusedrepos.sh
         - setearlyloading.sh
         - setdrmvariables.sh

recipes/common/nvidia-open-modules.yml

@@ -1,13 +1,15 @@
 modules:
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:main-40 /rpms /tmp/rpms
+        - COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:main-41 /rpms /tmp/rpms
         - RUN find /tmp/rpms
         - RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
         - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
-        - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm nvidia-container-toolkit xorg-x11-drv-nvidia xorg-x11-drv-nvidia-cuda nvidia-vaapi-driver
+        - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo   
+        - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm libnvidia-fbc libva-nvidia-driver nvidia-driver nvidia-driver-cuda nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit 
     - type: script
       scripts:
         - installnvidiatoolkitpolicy.sh
+        - removeunusedrepos.sh
         - setearlyloading.sh
         - setdrmvariables.sh

recipes/common/nvidia-open-server-modules.yml

@@ -1,13 +1,16 @@
 modules:
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:coreos-testing-40 /rpms /tmp/rpms
+        - COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:coreos-testing-41 /rpms /tmp/rpms
         - RUN find /tmp/rpms
+        - RUN curl -L https://negativo17.org/repos/fedora-nvidia.repo -o /etc/yum.repos.d/negativo17-fedora-nvidia.repo
         - RUN rpm-ostree install /tmp/rpms/ucore/ublue-os-ucore-nvidia*.rpm
         - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
-        - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm nvidia-container-toolkit 
+        - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo  
+        - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm nvidia-container-toolkit nvidia-driver-cuda
     - type: script
       scripts:
         - installnvidiatoolkitpolicy.sh
+        - removeunusedrepos.sh
         - setearlyloading.sh
         - setdrmvariables.sh

recipes/common/nvidia-server-modules.yml

@@ -1,13 +1,16 @@
 modules:
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/akmods-nvidia:coreos-testing-40 /rpms /tmp/rpms
+        - COPY --from=ghcr.io/ublue-os/akmods-nvidia:coreos-testing-41 /rpms /tmp/rpms
         - RUN find /tmp/rpms
+        - RUN curl -L https://negativo17.org/repos/fedora-nvidia.repo -o /etc/yum.repos.d/negativo17-fedora-nvidia.repo
         - RUN rpm-ostree install /tmp/rpms/ucore/ublue-os-ucore-nvidia*.rpm
         - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
-        - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm nvidia-container-toolkit 
+        - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo  
+        - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm nvidia-container-toolkit nvidia-driver-cuda
     - type: script
       scripts:
         - installnvidiatoolkitpolicy.sh
+        - removeunusedrepos.sh
         - setearlyloading.sh
         - setdrmvariables.sh

recipes/common/proprietary-modules.yml

@@ -0,0 +1,32 @@
+modules:
+    - type: script
+      scripts:
+        - installproprietarypackages.sh
+    - type: rpm-ostree
+      install:
+      - heif-pixbuf-loader
+      - ffmpeg
+      - ffmpeg-libs
+      - ffmpegthumbnailer
+      - pipewire-libs-extra
+      - libfdk-aac
+      - gstreamer1-plugins-bad
+      - gstreamer1-plugins-ugly  
+
+      remove:
+      - gstreamer1-plugins-bad-free
+      - gstreamer1-plugins-bad-free-libs
+      - gstreamer1-plugins-ugly-free
+      - fdk-aac-free
+      - ffmpeg-free
+      - libavcodec-free  
+      - libavdevice-free
+      - libavfilter-free
+      - libavformat-free  
+      - libavutil-free  
+      - libpostproc-free  
+      - libswresample-free  
+      - libswscale-free  
+    - type: script
+      scripts:
+        - removeunusedrepos.sh

recipes/common/proprietary-packages.yml

@@ -1,28 +0,0 @@
-type: rpm-ostree
-install:
-  - libheif-freeworld
-  - libheif-tools
-  - intel-media-driver
-  - gstreamer1-plugin-libav  
-  - gstreamer1-plugins-bad-free-extras  
-  - gstreamer1-plugins-bad-freeworld  
-  - gstreamer1-plugins-ugly  
-  - gstreamer1-vaapi  
-  - ffmpeg
-  - ffmpeg-libs
-  - ffmpegthumbnailer
-  - pipewire-codec-aptx
-  - mesa-va-drivers-freeworld
-  - fdk-aac
-remove:
-  - fdk-aac-free
-  - mesa-va-drivers
-  - ffmpeg-free
-  - libavcodec-free  
-  - libavdevice-free
-  - libavfilter-free
-  - libavformat-free  
-  - libavutil-free  
-  - libpostproc-free  
-  - libswresample-free  
-  - libswscale-free  

recipes/common/server-modules.yml

@@ -1,12 +1,12 @@
 modules:
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/akmods:coreos-testing-40 /rpms /tmp/rpms
+        - COPY --from=ghcr.io/ublue-os/akmods:coreos-testing-41 /rpms /tmp/rpms
         - RUN find /tmp/rpms
         - RUN rpm-ostree install /tmp/rpms/ucore/ublue-os-ucore-addons*.rpm    
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/coreos-testing-kernel:40 /tmp/rpms /tmp/rpms/kernel
+        - COPY --from=ghcr.io/ublue-os/coreos-testing-kernel:41 /tmp/rpms /tmp/rpms/kernel
     - type: script
       scripts:
         - installsignedkernel.sh

recipes/common/silverblue-modules.yml

@@ -20,6 +20,10 @@ modules:
         - malcontent-ui-libs
         - malcontent-control
         - fedora-chromium-config-gnome
+        - totem-video-thumbnailer
     - type: gschema-overrides
       include:
-        - zz1-secureblue.gschema.override
+        - zz1-secureblue.gschema.override
+    - type: script
+      scripts:
+        - removedkmshelper.sh

recipes/common/zfs-modules.yml

@@ -1,7 +1,7 @@
 modules:
     - type: containerfile
       snippets:
-      - COPY --from=ghcr.io/ublue-os/akmods-zfs:coreos-testing-40 /rpms /tmp/rpms
+      - COPY --from=ghcr.io/ublue-os/akmods-zfs:coreos-testing-41 /rpms /tmp/rpms
       - RUN find /tmp/rpms
       - RUN rpm-ostree install pv /tmp/rpms/kmods/zfs/*.rpm /tmp/rpms/kmods/zfs/other/zfs-dracut-*.rpm
     - type: script

recipes/general/recipe-cosmic-main-userns.yml

@@ -10,6 +10,6 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/cosmic-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-cosmic-main.yml

@@ -10,6 +10,6 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/cosmic-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-cosmic-nvidia-open-userns.yml

@@ -9,8 +9,8 @@ image-version: 41
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/nvidia-open-modules-41.yml 
+  - from-file: common/nvidia-open-modules.yml 
   - from-file: common/cosmic-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-cosmic-nvidia-open.yml

@@ -9,8 +9,8 @@ image-version: 41
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/nvidia-open-modules-41.yml 
+  - from-file: common/nvidia-open-modules.yml 
   - from-file: common/cosmic-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-cosmic-nvidia-userns.yml

@@ -9,8 +9,8 @@ image-version: 41
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/nvidia-modules-41.yml 
+  - from-file: common/nvidia-modules.yml 
   - from-file: common/cosmic-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-cosmic-nvidia.yml

@@ -9,8 +9,8 @@ image-version: 41
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/nvidia-modules-41.yml 
+  - from-file: common/nvidia-modules.yml 
   - from-file: common/cosmic-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-kinoite-main-userns.yml

@@ -4,12 +4,12 @@ description: "Kinoite with userns, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/kinoite
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/kinoite-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-kinoite-main.yml

@@ -4,12 +4,12 @@ description: "Kinoite, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/kinoite
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/kinoite-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-kinoite-nvidia-open-userns.yml

@@ -4,13 +4,13 @@ description: "Kinoite with nvidia-open and userns, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/kinoite
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/kinoite-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-open-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-kinoite-nvidia-open.yml

@@ -4,13 +4,13 @@ description: "Kinoite with nvidia-open, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/kinoite
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/kinoite-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-open-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-kinoite-nvidia-userns.yml

@@ -4,13 +4,13 @@ description: "Kinoite with nvidia and userns, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/kinoite
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/kinoite-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-kinoite-nvidia.yml

@@ -4,13 +4,13 @@ description: "Kinoite with nvidia, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/kinoite
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/kinoite-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-sericea-main-userns.yml

@@ -4,11 +4,11 @@ description: "Sericea with userns, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-sericea-main.yml

@@ -4,11 +4,11 @@ description: "Sericea, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-sericea-nvidia-open-userns.yml

@@ -4,13 +4,13 @@ description: "Sericea with userns and nvidia-open, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-open-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml
   - type: script

recipes/general/recipe-sericea-nvidia-open.yml

@@ -4,13 +4,13 @@ description: "Sericea with nvidia-open, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-open-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml
   - type: script

recipes/general/recipe-sericea-nvidia-userns.yml

@@ -4,13 +4,13 @@ description: "Sericea with nvidia and userns, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml
   - type: script

recipes/general/recipe-sericea-nvidia.yml

@@ -4,13 +4,13 @@ description: "Sericea with nvidia, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml
   - type: script

recipes/general/recipe-silverblue-main-userns.yml

@@ -4,12 +4,12 @@ description: "Silverblue with userns, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/silverblue
 
-image-version: 40 
+image-version: 41 
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/silverblue-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-silverblue-main.yml

@@ -4,12 +4,12 @@ description: "Silverblue, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/silverblue
 
-image-version: 40 
+image-version: 41 
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/silverblue-modules.yml
   - from-file: common/desktop-modules.yml
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-silverblue-nvidia-open-userns.yml

@@ -4,13 +4,13 @@ description: "Silverblue with nvidia-open and userns, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/silverblue
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/silverblue-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-open-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-silverblue-nvidia-open.yml

@@ -4,13 +4,13 @@ description: "Silverblue with nvidia-open, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/silverblue
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/silverblue-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-open-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-silverblue-nvidia-userns.yml

@@ -4,13 +4,13 @@ description: "Silverblue with nvidia and userns, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/silverblue
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/silverblue-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/userns-packages.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-silverblue-nvidia.yml

@@ -4,13 +4,13 @@ description: "Silverblue with nvidia, hardened"
 
 base-image: quay.io/fedora-ostree-desktops/silverblue
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/silverblue-modules.yml
   - from-file: common/desktop-modules.yml
   - from-file: common/nvidia-modules.yml 
-  - from-file: common/proprietary-packages.yml
+  - from-file: common/proprietary-modules.yml
   - from-file: common/disableuserns-modules.yml
   - from-file: common/final-modules.yml

recipes/general/recipe-wayblue-hyprland-main-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue hyprland main with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/hyprland
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-hyprland-main.yml

@@ -4,7 +4,7 @@ description: "wayblue hyprland main, hardened"
 
 base-image: ghcr.io/wayblueorg/hyprland
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-hyprland-nvidia-open-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue hyprland nvidia-open with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/hyprland-nvidia-open
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-hyprland-nvidia-open.yml

@@ -4,7 +4,7 @@ description: "wayblue hyprland nvidia-open, hardened"
 
 base-image: ghcr.io/wayblueorg/hyprland-nvidia-open
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue hyprland nvidia with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/hyprland-nvidia
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-hyprland-nvidia.yml

@@ -4,7 +4,7 @@ description: "wayblue hyprland nvidia, hardened"
 
 base-image: ghcr.io/wayblueorg/hyprland-nvidia
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-river-main-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue river main with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/river
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-river-main.yml

@@ -4,7 +4,7 @@ description: "wayblue river main, hardened"
 
 base-image: ghcr.io/wayblueorg/river
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-river-nvidia-open-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue river nvidia-open with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/river-nvidia-open
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-river-nvidia-open.yml

@@ -4,7 +4,7 @@ description: "wayblue river nvidia-open, hardened"
 
 base-image: ghcr.io/wayblueorg/river-nvidia-open
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-river-nvidia-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue river nvidia with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/river-nvidia
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-river-nvidia.yml

@@ -4,7 +4,7 @@ description: "wayblue river nvidia, hardened"
 
 base-image: ghcr.io/wayblueorg/river-nvidia
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-sway-main-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue sway main with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/sway
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-sway-main.yml

@@ -4,7 +4,7 @@ description: "wayblue sway main, hardened"
 
 base-image: ghcr.io/wayblueorg/sway
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-sway-nvidia-open-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue sway nvidia-open with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/sway-nvidia-open
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-sway-nvidia-open.yml

@@ -4,7 +4,7 @@ description: "wayblue sway nvidia-open, hardened"
 
 base-image: ghcr.io/wayblueorg/sway-nvidia-open
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-sway-nvidia-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue sway nvidia with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/sway-nvidia
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-sway-nvidia.yml

@@ -4,7 +4,7 @@ description: "wayblue sway nvidia, hardened"
 
 base-image: ghcr.io/wayblueorg/sway-nvidia
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-wayfire-main-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue wayfire main with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/wayfire
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-wayfire-main.yml

@@ -4,7 +4,7 @@ description: "wayblue wayfire main, hardened"
 
 base-image: ghcr.io/wayblueorg/wayfire
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-wayfire-nvidia-open-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue wayfire nvidia-open with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/wayfire-nvidia-open
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-wayfire-nvidia-open.yml

@@ -4,7 +4,7 @@ description: "wayblue wayfire nvidia-open, hardened"
 
 base-image: ghcr.io/wayblueorg/wayfire-nvidia-open
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml

@@ -4,7 +4,7 @@ description: "wayblue wayfire nvidia with userns, hardened"
 
 base-image: ghcr.io/wayblueorg/wayfire-nvidia
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml

recipes/general/recipe-wayblue-wayfire-nvidia.yml

@@ -4,7 +4,7 @@ description: "wayblue wayfire nvidia, hardened"
 
 base-image: ghcr.io/wayblueorg/wayfire-nvidia
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml