From e0efbbc82c32d41440122f7d656e3ea42947eac3 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Dec 2025 14:13:49 -0300
Subject: [PATCH 1/4] test if audio works on cachyos kernel 6.17

---
 Dockerfile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9d94565..961874b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,15 +12,9 @@ RUN /tmp/set_next_version.sh
 COPY repo/*.repo /etc/yum.repos.d/
 RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia.repo -y
 
-RUN dnf install -y $( \
-                                                                              dnf list --available kernel\* --disablerepo='*' --enablerepo=my-ostree-os-rhel-epel 2>/dev/null \
-                                                                              | grep 'andersdsrhcustom' \
-                                                                              | awk '{print $1 "-" $2}' \
-                                                                              | sort -V \
-                                                                              | tail -1 \
-                                                                              | sed 's/\.src//g' \
-                                                                              | sed 's/\.x86_64//g' \
-                                                                  )
+RUN dnf copr enable bieszczaders/kernel-cachyos -y
+
+RUN dnf install -y kernel-cachyos
 
 RUN dnf install --nogpgcheck -y https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm
 
@@ -29,7 +23,7 @@ RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/down
 
 # Install Negativo17 Nvidia driver
 RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver kernel-devel-matched
-RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel)
+RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-cachyos)
 
 # Remove plocate to avoid updatedb going crazy with scanning the file system once a day
 RUN dnf remove -y plocate

From 663ecaeb77a4c4500a4e1272bcfec33572f0cd41 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Dec 2025 14:19:39 -0300
Subject: [PATCH 2/4] remove default kernel

---
 Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 961874b..5636d60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,9 @@
 FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 ARG CACHEBUST=1
 
+ARG KERNEL=kernel-cachyos
+ENV KERNEL=${KERNEL}
+
 # Get list of kernels from my repo. If the list has been updated, then the image will be rebuilt. If it hasn't been updated, then caching of the previous build will be used.
 ADD "https://copr.fedorainfracloud.org/api_3/build/list?ownername=andersrh&projectname=my-ostree-os&packagename=kernel" /tmp/builds.txt
 
@@ -14,7 +17,9 @@ RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia.repo
 
 RUN dnf copr enable bieszczaders/kernel-cachyos -y
 
-RUN dnf install -y kernel-cachyos
+RUN dnf install -y ${KERNEL} ${KERNEL}-devel-matched
+
+RUN dnf remove -y kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-tools kernel-tools-libs
 
 RUN dnf install --nogpgcheck -y https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm
 

From 672eb3820ae160c54edd947b5980b3488b47e6c5 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Dec 2025 14:36:06 -0300
Subject: [PATCH 3/4] oops dont install kernel-devel-matched

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5636d60..76ca060 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver
 RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.2.0/appimagelauncher-2.2.0-travis995.0f91801.x86_64.rpm
 
 # Install Negativo17 Nvidia driver
-RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver kernel-devel-matched
+RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
 RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-cachyos)
 
 # Remove plocate to avoid updatedb going crazy with scanning the file system once a day

From 147a1bd7067f40cfeee29d883114b50baffcc67e Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Dec 2025 15:24:14 -0300
Subject: [PATCH 4/4] add alsa-sof-firmware

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 76ca060..d25ec12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,8 @@ RUN rm -f /etc/chromium/chromium.conf
 # Add rule to SELinux allowing modules to be loaded into custom kernel
 RUN setsebool -P domain_kernel_load_modules on
 
+RUN dnf install -y alsa-sof-firmware
+
 COPY etc /etc
 COPY usr /usr