From eea1c24ec46a400052934b67d55d09e30fbab835 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Sun, 10 May 2026 14:53:53 -0300
Subject: [PATCH 01/25] fix Waydroid SELinux rules

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

diff --git a/Dockerfile b/Dockerfile
index 6700c79..4ca55c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,6 +88,9 @@ RUN dnf install rclone -y
 
 RUN dnf install https://github.com/trapexit/mergerfs/releases/download/2.41.1/mergerfs-2.41.1-1.el10.x86_64.rpm -y
 
+RUN semodule -B
+RUN semodule -i /usr/share/selinux/targeted/waydroid.pp
+
 RUN systemctl enable docker
 RUN systemctl enable scx_loader
 

From bc529db80fa390ccfabaffb71c82b2c8e86bc45a Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Sun, 10 May 2026 17:13:32 -0300
Subject: [PATCH 02/25] semodule -B fails

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4ca55c8..0784c56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,7 +88,6 @@ RUN dnf install rclone -y
 
 RUN dnf install https://github.com/trapexit/mergerfs/releases/download/2.41.1/mergerfs-2.41.1-1.el10.x86_64.rpm -y
 
-RUN semodule -B
 RUN semodule -i /usr/share/selinux/targeted/waydroid.pp
 
 RUN systemctl enable docker

From 1426a4497ed43a458e86341454563a8b65dfe4a0 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Sun, 10 May 2026 18:12:12 -0300
Subject: [PATCH 03/25] install selinux in a store

---
 Dockerfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0784c56..77ab314 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,12 +34,18 @@ 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
 
-# Install Negativo17 Nvidia driver
-RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
+# Install Negativo17 Nvidia driver, waydroid and SELinux rules
+RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver waydroid && \
+    mkdir -p /tmp/selinux-store && \
+    semodule --store=/tmp/selinux-store -B && \
+    semodule --store=/tmp/selinux-store -i /usr/share/selinux/targeted/waydroid.pp && \
+    semodule --store=/tmp/selinux-store -i /usr/share/selinux/packages/targeted/nvidia-driver.pp.bz2 && \
+    cp -r /tmp/selinux-store/* /etc/selinux/targeted/ && \
+    rm -rf /tmp/selinux-store
 
 RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
 
-RUN dnf install -y waydroid scx-scheds
+RUN dnf install -y scx-scheds
 
 # Remove plocate to avoid updatedb going crazy with scanning the file system once a day
 RUN dnf remove -y plocate
@@ -88,8 +94,6 @@ RUN dnf install rclone -y
 
 RUN dnf install https://github.com/trapexit/mergerfs/releases/download/2.41.1/mergerfs-2.41.1-1.el10.x86_64.rpm -y
 
-RUN semodule -i /usr/share/selinux/targeted/waydroid.pp
-
 RUN systemctl enable docker
 RUN systemctl enable scx_loader
 

From 97483bbbc19b48b087a2e589c749f1c0d84450ef Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 13 May 2026 17:19:42 -0300
Subject: [PATCH 04/25] test without store

---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 77ab314..8ddfe70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,12 +36,12 @@ RUN dnf remove -y kernel kernel-core kernel-modules kernel-modules-core kernel-m
 
 # Install Negativo17 Nvidia driver, waydroid and SELinux rules
 RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver waydroid && \
-    mkdir -p /tmp/selinux-store && \
-    semodule --store=/tmp/selinux-store -B && \
-    semodule --store=/tmp/selinux-store -i /usr/share/selinux/targeted/waydroid.pp && \
-    semodule --store=/tmp/selinux-store -i /usr/share/selinux/packages/targeted/nvidia-driver.pp.bz2 && \
-    cp -r /tmp/selinux-store/* /etc/selinux/targeted/ && \
-    rm -rf /tmp/selinux-store
+    rm -rf /etc/selinux/targeted/tmp /var/lib/selinux/targeted/tmp && \
+    mkdir -p /etc/selinux/targeted/tmp && \
+    semodule -B && \
+    semodule -i /usr/share/selinux/targeted/waydroid.pp && \
+    semodule -i /usr/share/selinux/packages/targeted/nvidia-driver.pp.bz2 && \
+    rm -rf /etc/selinux/targeted/tmp
 
 RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
 

From edd3bcfc06d0f046400ce4404aa1124a9e99c181 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 13 May 2026 18:31:26 -0300
Subject: [PATCH 05/25] try something else

---
 Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8ddfe70..a320a46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,13 +35,16 @@ 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
 
 # Install Negativo17 Nvidia driver, waydroid and SELinux rules
-RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver waydroid && \
-    rm -rf /etc/selinux/targeted/tmp /var/lib/selinux/targeted/tmp && \
-    mkdir -p /etc/selinux/targeted/tmp && \
+# Dette kræver at du kører build med --privileged eller --cap-add SYS_ADMIN
+# eller bruger Buildah's RUN --mount feature
+
+RUN --mount=type=tmpfs,target=/etc/selinux \
+    dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver waydroid && \
     semodule -B && \
     semodule -i /usr/share/selinux/targeted/waydroid.pp && \
     semodule -i /usr/share/selinux/packages/targeted/nvidia-driver.pp.bz2 && \
-    rm -rf /etc/selinux/targeted/tmp
+    # Kopier resultatet ud fra tmpfs til overlay
+    cp -a /etc/selinux/* /etc/selinux/.. || true
 
 RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
 

From baa64439fa141486700a57710d31ac003511f2c4 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 14 May 2026 10:59:22 -0300
Subject: [PATCH 06/25] try something else again

---
 Dockerfile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a320a46..1115cc3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,13 +38,18 @@ RUN dnf remove -y kernel kernel-core kernel-modules kernel-modules-core kernel-m
 # Dette kræver at du kører build med --privileged eller --cap-add SYS_ADMIN
 # eller bruger Buildah's RUN --mount feature
 
-RUN --mount=type=tmpfs,target=/etc/selinux \
-    dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver waydroid && \
-    semodule -B && \
-    semodule -i /usr/share/selinux/targeted/waydroid.pp && \
-    semodule -i /usr/share/selinux/packages/targeted/nvidia-driver.pp.bz2 && \
-    # Kopier resultatet ud fra tmpfs til overlay
-    cp -a /etc/selinux/* /etc/selinux/.. || true
+RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver waydroid policycoreutils && \
+    # Opret en tmpfs midlertidigt
+    mount -t tmpfs tmpfs /tmp/selinux-tmp && \
+    mkdir -p /tmp/selinux-tmp/etc/selinux/targeted && \
+    cp -r /etc/selinux/targeted/* /tmp/selinux-tmp/etc/selinux/targeted/ && \
+    # Brug semodule på tmpfs
+    semodule -p /tmp/selinux-tmp/etc/selinux -B && \
+    semodule -p /tmp/selinux-tmp/etc/selinux -i /usr/share/selinux/targeted/waydroid.pp && \
+    semodule -p /tmp/selinux-tmp/etc/selinux -i /usr/share/selinux/packages/targeted/nvidia-driver.pp.bz2 && \
+    # Kopier resultatet tilbage
+    cp -a /tmp/selinux-tmp/etc/selinux/targeted/* /etc/selinux/targeted/ && \
+    umount /tmp/selinux-tmp
 
 RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
 

From 85f924ca2085ab28d60bcb4dd0a572d03d0fbffb Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 14 May 2026 12:33:34 -0300
Subject: [PATCH 07/25] mkdir af tmp mappe

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1115cc3..f40e3b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,15 +39,13 @@ RUN dnf remove -y kernel kernel-core kernel-modules kernel-modules-core kernel-m
 # eller bruger Buildah's RUN --mount feature
 
 RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver waydroid policycoreutils && \
-    # Opret en tmpfs midlertidigt
+    mkdir -p /tmp/selinux-tmp && \
     mount -t tmpfs tmpfs /tmp/selinux-tmp && \
     mkdir -p /tmp/selinux-tmp/etc/selinux/targeted && \
     cp -r /etc/selinux/targeted/* /tmp/selinux-tmp/etc/selinux/targeted/ && \
-    # Brug semodule på tmpfs
     semodule -p /tmp/selinux-tmp/etc/selinux -B && \
     semodule -p /tmp/selinux-tmp/etc/selinux -i /usr/share/selinux/targeted/waydroid.pp && \
     semodule -p /tmp/selinux-tmp/etc/selinux -i /usr/share/selinux/packages/targeted/nvidia-driver.pp.bz2 && \
-    # Kopier resultatet tilbage
     cp -a /tmp/selinux-tmp/etc/selinux/targeted/* /etc/selinux/targeted/ && \
     umount /tmp/selinux-tmp
 

From 6d93d8e10ec24288ba59567207293d437909dd7d Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 28 May 2026 16:08:02 -0300
Subject: [PATCH 08/25] Update SonicDE for EL 10.2

---
 Dockerfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6700c79..8338bf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,11 +15,21 @@ RUN dnf install --nogpgcheck -y https://mirrors.rpmfusion.org/free/el/rpmfusion-
 
 RUN dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/andersrh/sonicDE/repo/rhel+epel-10/andersrh-sonicDE-rhel+epel-10.repo -y
 RUN dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/xlibre/xlibre-xserver/repo/rhel+epel-10/group_xlibre-xlibre-xserver-rhel+epel-10.repo -y
+RUN dnf config-manager --add-repo https://pc-rytteren.dk/forge/api/packages/anders/rpm.repo -y
 
 # This may be necessary for the speakers and internal microphone
 RUN dnf install -y alsa-sof-firmware
 
-RUN dnf install sonic-workspace-x11 sonic-win sonic-interface-libraries sonic-workspace --allowerasing -y
+RUN rpm -e --nodeps plasma-workspace-libs plasma-workspace libplasma \
+    kwin kwin-common kwin-libs kscreenlocker plasma-desktop sddm-wayland-plasma && \
+    dnf install --allowerasing --nogpgcheck -y \
+        sonic-workspace-6.6.4-10.el10 \
+        sonic-workspace-libs-6.6.4-10.el10 \
+        sonic-workspace-common-6.6.4-10.el10 \
+        sonic-workspace-x11-6.6.4-10.el10 \
+        sonic-win-6.6.4-10.el10 \
+        sonic-desktop-interface-6.6.4-10.el10 \
+        sonic-interface-libraries
 
 RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver htop
 RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.2.0/appimagelauncher-2.2.0-travis995.0f91801.x86_64.rpm

From bede8878ae481771f35c965e0c92fb399e2713f7 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 28 May 2026 20:14:47 -0300
Subject: [PATCH 09/25] Remove specific versions and add other needed packages

---
 Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8338bf8..bc44907 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,14 +23,16 @@ RUN dnf install -y alsa-sof-firmware
 RUN rpm -e --nodeps plasma-workspace-libs plasma-workspace libplasma \
     kwin kwin-common kwin-libs kscreenlocker plasma-desktop sddm-wayland-plasma && \
     dnf install --allowerasing --nogpgcheck -y \
-        sonic-workspace-6.6.4-10.el10 \
-        sonic-workspace-libs-6.6.4-10.el10 \
-        sonic-workspace-common-6.6.4-10.el10 \
-        sonic-workspace-x11-6.6.4-10.el10 \
-        sonic-win-6.6.4-10.el10 \
-        sonic-desktop-interface-6.6.4-10.el10 \
+        sonic-workspace \
+        sonic-workspace-libs \
+        sonic-workspace-common \
+        sonic-workspace-x11 \
+        sonic-win \
+        sonic-desktop-interface \
         sonic-interface-libraries
 
+RUN dnf install --allowerasing --nogpgcheck -y sonic-keybind-daemon sonic-frameworks-windowsystem sonic-system-info sonic-screen sonic-screen-library sonic-sysguard-library
+
 RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver htop
 RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.2.0/appimagelauncher-2.2.0-travis995.0f91801.x86_64.rpm
 

From d80f72896289d614e6cd62276bfaed7136e6fdc9 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 28 May 2026 20:16:05 -0300
Subject: [PATCH 10/25] replace sddm with sonic-login-manager

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

diff --git a/Dockerfile b/Dockerfile
index bc44907..12a1738 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,9 @@ RUN rpm -e --nodeps plasma-workspace-libs plasma-workspace libplasma \
 
 RUN dnf install --allowerasing --nogpgcheck -y sonic-keybind-daemon sonic-frameworks-windowsystem sonic-system-info sonic-screen sonic-screen-library sonic-sysguard-library
 
+RUN dnf remove -y sddm && \
+    dnf install --allowerasing --nogpgcheck -y sonic-login-manager
+
 RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver htop
 RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.2.0/appimagelauncher-2.2.0-travis995.0f91801.x86_64.rpm
 

From a0ddc92d46041683a2420eba766a5c7c19f4cfb2 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 28 May 2026 20:58:07 -0300
Subject: [PATCH 11/25] Upgrade Appimagelauncher

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

diff --git a/Dockerfile b/Dockerfile
index 12a1738..b46452a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN dnf remove -y sddm && \
     dnf install --allowerasing --nogpgcheck -y sonic-login-manager
 
 RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver htop
-RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.2.0/appimagelauncher-2.2.0-travis995.0f91801.x86_64.rpm
+RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v3.0.0-beta-3/appimagelauncher_3.0.0-beta-2-gha287.96cb937_x86_64.rpm
 
 # Enable CachyOS repositories
 RUN dnf copr enable bieszczaders/kernel-cachyos -y

From 3f79a99cfa2afb7fec747ebf0c5a0dec9032dc8b Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Fri, 29 May 2026 10:03:10 -0300
Subject: [PATCH 12/25] use deep sleep

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

diff --git a/Dockerfile b/Dockerfile
index b46452a..61c32aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -106,6 +106,8 @@ RUN dnf install https://github.com/trapexit/mergerfs/releases/download/2.41.1/me
 RUN systemctl enable docker
 RUN systemctl enable scx_loader
 
+RUN echo 'kargs = ["mem_sleep_default=deep"]' > /usr/lib/bootc/kargs.d/10-mem-sleep.toml
+
 COPY etc /etc
 COPY usr /usr
 

From b1d5222948822cd5357725cbd972d348a922ffc1 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Fri, 29 May 2026 10:38:44 -0300
Subject: [PATCH 13/25] disable wifi power save

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

diff --git a/Dockerfile b/Dockerfile
index 61c32aa..08764ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -107,6 +107,7 @@ RUN systemctl enable docker
 RUN systemctl enable scx_loader
 
 RUN echo 'kargs = ["mem_sleep_default=deep"]' > /usr/lib/bootc/kargs.d/10-mem-sleep.toml
+RUN printf '[connection]\nwifi.powersave=2\n' > /usr/lib/NetworkManager/conf.d/disable-wifi-powersave.conf
 
 COPY etc /etc
 COPY usr /usr

From f958f8281ff43a05afb1bce83be3c6c7ee2ae26c Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 10:57:58 -0300
Subject: [PATCH 14/25] Use default kernel

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

diff --git a/Dockerfile b/Dockerfile
index 08764ce..1c525b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 
-ARG KERNEL=kernel-cachyos
+ARG KERNEL=kernel
 ENV KERNEL=${KERNEL}
 
 RUN echo 'omit_drivers+=" nouveau "' | tee /etc/dracut.conf.d/blacklist-nouveau.conf
@@ -45,13 +45,13 @@ RUN dnf copr enable bieszczaders/kernel-cachyos -y
 # Enable CachyOS addons EL10 fork repo
 RUN dnf copr enable andersrh/kernel-cachyos-addons-el10 -y
 
-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 -y ${KERNEL}-devel
 
 # Install Negativo17 Nvidia driver
 RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
 
+RUN rpm -e --nodeps kernel-cachyos-server-core kernel-cachyos-server-devel kernel-cachyos-server-devel-matched kernel-cachyos-server-modules
+
 RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
 
 RUN dnf install -y waydroid scx-scheds

From f78e75b5f088f0384058d9f274ff51084cf12cc2 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 11:02:18 -0300
Subject: [PATCH 15/25] Install VirtualBox

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

diff --git a/Dockerfile b/Dockerfile
index 08764ce..a5b7856 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,11 @@ 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 wget https://download.virtualbox.org/virtualbox/rpm/el/virtualbox.repo -O /etc/yum.repos.d/virtualbox.repo
+
+RUN dnf install VirtualBox-7.2 -y
+RUN /sbin/vboxconfig
+
 # Install Negativo17 Nvidia driver
 RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
 

From 6de634d623cf44daa7077d1db33312d1540b7cfa Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 13:36:15 -0300
Subject: [PATCH 16/25] install virtualbox

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

diff --git a/Dockerfile b/Dockerfile
index a5b7856..0e62f0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,9 +50,18 @@ 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 wget https://download.virtualbox.org/virtualbox/rpm/el/virtualbox.repo -O /etc/yum.repos.d/virtualbox.repo
+RUN dnf install -y chkconfig
 
-RUN dnf install VirtualBox-7.2 -y
-RUN /sbin/vboxconfig
+RUN dnf install VirtualBox-7.2 -y && \
+    KVER=$(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL}) && \
+    for mod in vboxdrv vboxnetflt vboxnetadp; do \
+        make -C /lib/modules/${KVER}/build M=/usr/share/virtualbox/src/vboxhost/${mod} \
+            KERN_VER=${KVER} CONFIG_MODULE_COMPRESS_GZIP= CONFIG_MODULE_COMPRESS_XZ= \
+            CONFIG_MODULE_COMPRESS_ZSTD= -j$(nproc) modules; \
+        make -C /lib/modules/${KVER}/build M=/usr/share/virtualbox/src/vboxhost/${mod} \
+            KERN_VER=${KVER} modules_install; \
+    done && \
+    depmod ${KVER}
 
 # Install Negativo17 Nvidia driver
 RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
@@ -117,6 +126,7 @@ RUN printf '[connection]\nwifi.powersave=2\n' > /usr/lib/NetworkManager/conf.d/d
 COPY etc /etc
 COPY usr /usr
 
+RUN systemctl enable vboxdrv
 RUN systemctl enable waydroid-choose-intel-gpu.service
 
 # Disable SELinux

From 0cc6d03a8ccbb9574e7b6693ec1af025b7127d28 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 13:38:33 -0300
Subject: [PATCH 17/25] save custom systemd service

---
 .../systemd/system/vboxdrv-modules.service    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 usr/lib/systemd/system/vboxdrv-modules.service

diff --git a/usr/lib/systemd/system/vboxdrv-modules.service b/usr/lib/systemd/system/vboxdrv-modules.service
new file mode 100644
index 0000000..60f8101
--- /dev/null
+++ b/usr/lib/systemd/system/vboxdrv-modules.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=VirtualBox Linux kernel module
+ConditionVirtualization=!container
+DefaultDependencies=no
+Before=systemd-modules-load.service
+After=systemd-udevd.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/sbin/modprobe vboxdrv
+ExecStart=/sbin/modprobe vboxnetflt
+ExecStart=/sbin/modprobe vboxnetadp
+ExecStop=/sbin/rmmod vboxnetflt
+ExecStop=/sbin/rmmod vboxnetadp
+ExecStop=/sbin/rmmod vboxdrv
+
+[Install]
+WantedBy=sysinit.target

From 82991f616d12c2315799b6de7da56e00846a3b11 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 13:38:39 -0300
Subject: [PATCH 18/25] Revert "save custom systemd service"

This reverts commit 0cc6d03a8ccbb9574e7b6693ec1af025b7127d28.
---
 .../systemd/system/vboxdrv-modules.service    | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 usr/lib/systemd/system/vboxdrv-modules.service

diff --git a/usr/lib/systemd/system/vboxdrv-modules.service b/usr/lib/systemd/system/vboxdrv-modules.service
deleted file mode 100644
index 60f8101..0000000
--- a/usr/lib/systemd/system/vboxdrv-modules.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=VirtualBox Linux kernel module
-ConditionVirtualization=!container
-DefaultDependencies=no
-Before=systemd-modules-load.service
-After=systemd-udevd.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/modprobe vboxdrv
-ExecStart=/sbin/modprobe vboxnetflt
-ExecStart=/sbin/modprobe vboxnetadp
-ExecStop=/sbin/rmmod vboxnetflt
-ExecStop=/sbin/rmmod vboxnetadp
-ExecStop=/sbin/rmmod vboxdrv
-
-[Install]
-WantedBy=sysinit.target

From 64cc934f9f256136373e47dc9998cb9b460f13b8 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 14:52:05 -0300
Subject: [PATCH 19/25] installdir misc

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

diff --git a/Dockerfile b/Dockerfile
index 0e62f0e..390b074 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,9 +59,11 @@ RUN dnf install VirtualBox-7.2 -y && \
             KERN_VER=${KVER} CONFIG_MODULE_COMPRESS_GZIP= CONFIG_MODULE_COMPRESS_XZ= \
             CONFIG_MODULE_COMPRESS_ZSTD= -j$(nproc) modules; \
         make -C /lib/modules/${KVER}/build M=/usr/share/virtualbox/src/vboxhost/${mod} \
-            KERN_VER=${KVER} modules_install; \
+            KERN_VER=${KVER} INSTALL_MOD_DIR=misc modules_install; \
     done && \
     depmod ${KVER}
+    
+RUN systemctl enable vboxdrv
 
 # Install Negativo17 Nvidia driver
 RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
@@ -126,7 +128,6 @@ RUN printf '[connection]\nwifi.powersave=2\n' > /usr/lib/NetworkManager/conf.d/d
 COPY etc /etc
 COPY usr /usr
 
-RUN systemctl enable vboxdrv
 RUN systemctl enable waydroid-choose-intel-gpu.service
 
 # Disable SELinux

From dff5c0deb117fb4b4f331992a8254b5759d01280 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 15:40:44 -0300
Subject: [PATCH 20/25] upgrade and remove negativo repo

---
 Dockerfile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 039f274..7ae3077 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,14 @@ FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 ARG KERNEL=kernel
 ENV KERNEL=${KERNEL}
 
+RUN dnf upgrade -y
+
 RUN echo 'omit_drivers+=" nouveau "' | tee /etc/dracut.conf.d/blacklist-nouveau.conf
 
 COPY bin/set_next_version.sh /tmp
 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 --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
 
@@ -39,13 +40,10 @@ RUN dnf remove -y sddm && \
 RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver htop
 RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v3.0.0-beta-3/appimagelauncher_3.0.0-beta-2-gha287.96cb937_x86_64.rpm
 
-# Enable CachyOS repositories
-RUN dnf copr enable bieszczaders/kernel-cachyos -y
-
 # Enable CachyOS addons EL10 fork repo
 RUN dnf copr enable andersrh/kernel-cachyos-addons-el10 -y
 
-RUN dnf install -y ${KERNEL}-devel
+RUN dnf install -y ${KERNEL}-devel ${KERNEL}-headers
 
 RUN wget https://download.virtualbox.org/virtualbox/rpm/el/virtualbox.repo -O /etc/yum.repos.d/virtualbox.repo
 RUN dnf install -y chkconfig
@@ -63,12 +61,8 @@ RUN dnf install VirtualBox-7.2 -y && \
     
 RUN systemctl enable vboxdrv
 
-# Install Negativo17 Nvidia driver
-RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
-
-RUN rpm -e --nodeps kernel-cachyos-server-core kernel-cachyos-server-devel kernel-cachyos-server-devel-matched kernel-cachyos-server-modules
-
-RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
+RUN dnf install almalinux-release-nvidia-driver -y
+RUN dnf install nvidia-open-kmod nvidia-driver nvidia-driver-cuda -y
 
 RUN dnf install -y waydroid scx-scheds
 

From 5ae8348a8c494bff3876b32d52946bc3d25b16c5 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 15:41:39 -0300
Subject: [PATCH 21/25] remove virtualbox

---
 Dockerfile | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7ae3077..d801c17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,22 +45,6 @@ RUN dnf copr enable andersrh/kernel-cachyos-addons-el10 -y
 
 RUN dnf install -y ${KERNEL}-devel ${KERNEL}-headers
 
-RUN wget https://download.virtualbox.org/virtualbox/rpm/el/virtualbox.repo -O /etc/yum.repos.d/virtualbox.repo
-RUN dnf install -y chkconfig
-
-RUN dnf install VirtualBox-7.2 -y && \
-    KVER=$(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL}) && \
-    for mod in vboxdrv vboxnetflt vboxnetadp; do \
-        make -C /lib/modules/${KVER}/build M=/usr/share/virtualbox/src/vboxhost/${mod} \
-            KERN_VER=${KVER} CONFIG_MODULE_COMPRESS_GZIP= CONFIG_MODULE_COMPRESS_XZ= \
-            CONFIG_MODULE_COMPRESS_ZSTD= -j$(nproc) modules; \
-        make -C /lib/modules/${KVER}/build M=/usr/share/virtualbox/src/vboxhost/${mod} \
-            KERN_VER=${KVER} INSTALL_MOD_DIR=misc modules_install; \
-    done && \
-    depmod ${KVER}
-    
-RUN systemctl enable vboxdrv
-
 RUN dnf install almalinux-release-nvidia-driver -y
 RUN dnf install nvidia-open-kmod nvidia-driver nvidia-driver-cuda -y
 

From 576e7c2d61797e4161feddd48f66f748ea2b4ea4 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Wed, 3 Jun 2026 16:21:35 -0300
Subject: [PATCH 22/25] blacklist nouveau via kernel args instead

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

diff --git a/Dockerfile b/Dockerfile
index d801c17..2a89d10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,6 @@ ENV KERNEL=${KERNEL}
 
 RUN dnf upgrade -y
 
-RUN echo 'omit_drivers+=" nouveau "' | tee /etc/dracut.conf.d/blacklist-nouveau.conf
-
 COPY bin/set_next_version.sh /tmp
 RUN /tmp/set_next_version.sh
 
@@ -101,6 +99,7 @@ RUN systemctl enable docker
 RUN systemctl enable scx_loader
 
 RUN echo 'kargs = ["mem_sleep_default=deep"]' > /usr/lib/bootc/kargs.d/10-mem-sleep.toml
+RUN echo 'kargs = ["rd.driver.blacklist=nouveau", "nouveau.modeset=0"]' > /usr/lib/bootc/kargs.d/20-blacklist-nouveau.toml
 RUN printf '[connection]\nwifi.powersave=2\n' > /usr/lib/NetworkManager/conf.d/disable-wifi-powersave.conf
 
 COPY etc /etc

From 0390cf38142766da487ecb6944b2b43eaf86b978 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 4 Jun 2026 18:25:33 -0300
Subject: [PATCH 23/25] use elrepo mainline kernel to solve wifi issue after
 turning on pc after hibernation.

---
 Dockerfile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2a89d10..f5d40cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 
-ARG KERNEL=kernel
+ARG KERNEL=kernel-ml
 ENV KERNEL=${KERNEL}
 
 RUN dnf upgrade -y
@@ -9,6 +9,7 @@ COPY bin/set_next_version.sh /tmp
 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 --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
 
@@ -41,10 +42,18 @@ RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/down
 # Enable CachyOS addons EL10 fork repo
 RUN dnf copr enable andersrh/kernel-cachyos-addons-el10 -y
 
-RUN dnf install -y ${KERNEL}-devel ${KERNEL}-headers
+RUN rpm --import https://www.elrepo.org/RPM-GPG-KEY-v2-elrepo.org
+RUN dnf install https://www.elrepo.org/elrepo-release-10.el10.elrepo.noarch.rpm -y
 
-RUN dnf install almalinux-release-nvidia-driver -y
-RUN dnf install nvidia-open-kmod nvidia-driver nvidia-driver-cuda -y
+RUN dnf install --enablerepo=elrepo-kernel -y ${KERNEL}
+
+RUN rpm -e --nodeps kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
+
+RUN dnf install --enablerepo=elrepo-kernel -y ${KERNEL}-devel
+
+# Install Negativo17 Nvidia driver
+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})
 
 RUN dnf install -y waydroid scx-scheds
 

From ec280479166aa8454641ad9569f5fef6d9c0aac4 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 4 Jun 2026 18:26:33 -0300
Subject: [PATCH 24/25] remove scx-scheds since it's not supported on ELrepo
 kernel

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

diff --git a/Dockerfile b/Dockerfile
index f5d40cd..76dcf78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,7 +55,7 @@ RUN dnf install --enablerepo=elrepo-kernel -y ${KERNEL}-devel
 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})
 
-RUN dnf install -y waydroid scx-scheds
+RUN dnf install -y waydroid
 
 # Remove plocate to avoid updatedb going crazy with scanning the file system once a day
 RUN dnf remove -y plocate

From 286c75147d5e60e7c91f554360d73c33a2161a5b Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com>
Date: Thu, 4 Jun 2026 21:15:09 -0300
Subject: [PATCH 25/25] remove scx_loader

---
 Dockerfile                       |  3 ++-
 usr/share/scx_loader/config.toml | 13 -------------
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 usr/share/scx_loader/config.toml

diff --git a/Dockerfile b/Dockerfile
index 76dcf78..c6d20e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -104,8 +104,9 @@ RUN dnf install rclone -y
 
 RUN dnf install https://github.com/trapexit/mergerfs/releases/download/2.41.1/mergerfs-2.41.1-1.el10.x86_64.rpm -y
 
+RUN dnf install -y virt-manager
+
 RUN systemctl enable docker
-RUN systemctl enable scx_loader
 
 RUN echo 'kargs = ["mem_sleep_default=deep"]' > /usr/lib/bootc/kargs.d/10-mem-sleep.toml
 RUN echo 'kargs = ["rd.driver.blacklist=nouveau", "nouveau.modeset=0"]' > /usr/lib/bootc/kargs.d/20-blacklist-nouveau.toml
diff --git a/usr/share/scx_loader/config.toml b/usr/share/scx_loader/config.toml
deleted file mode 100644
index 9ad0305..0000000
--- a/usr/share/scx_loader/config.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# This field specifies the scheduler that will be started automatically when scx_loader starts (e.g., on boot).
-default_sched = "scx_flash"
-
-# This field specifies the mode which will be used when scx_loader starts (e.g., on boot).
-#default_mode = "Auto"
-
-# This "structure" allows configuring flags for each scheduler mode of particular scx scheduler
-#[scheds.'scheduler']
-#auto_mode = []
-#gaming_mode = []
-#lowlatency_mode = []
-#powersave_mode = []
-#server_mode = []