Dockerfile

@@ -1,29 +1,29 @@
 FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 
-ARG KERNEL=kernel-cachyos
+ARG KERNEL=kernel
 ENV KERNEL=${KERNEL}
 
-RUN rpm -e --nodeps gpsd-libs
-
 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
 
-RUN dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/SonicDE/SonicDE-EL10/repo/rhel+epel-10/group_SonicDE-SonicDE-EL10-rhel+epel-10.repo -y
+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 xorg-x11-xinit xkbcomp xinput xlibre-xserver-Xorg xlibre-xserver-common xlibre-xf86-input-libinput cage weston redshift xrandr -y
+RUN rpm -e --nodeps plasma-workspace-libs plasma-workspace libplasma \
-
+    kwin kwin-common kwin-libs kscreenlocker plasma-desktop sddm-wayland-plasma && \
-RUN dnf install --allowerasing -y \
+    dnf install --allowerasing --nogpgcheck -y \
         sonic-workspace \
         sonic-workspace-libs \
         sonic-workspace-common \
@@ -32,10 +32,10 @@ RUN dnf install --allowerasing -y \
         sonic-desktop-interface \
         sonic-interface-libraries
 
-RUN dnf install --allowerasing -y sonic-keybind-daemon sonic-frameworks-windowsystem sonic-system-info sonic-screen sonic-screen-library sonic-sysguard-library
+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 -y sonic-login-manager
+    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/v3.0.0-beta-3/appimagelauncher_3.0.0-beta-2-gha287.96cb937_x86_64.rpm
@@ -43,21 +43,26 @@ 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
 
-# Enable CachyOS repositories
+RUN dnf install -y ${KERNEL}-devel ${KERNEL}-headers
-RUN dnf copr enable bieszczaders/kernel-cachyos -y
 
-RUN dnf install -y ${KERNEL}
+RUN wget https://download.virtualbox.org/virtualbox/rpm/el/virtualbox.repo -O /etc/yum.repos.d/virtualbox.repo
+RUN dnf install -y chkconfig
 
-RUN rpm -e --nodeps kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
+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 dnf install -y ${KERNEL}-devel ${KERNEL}-devel-matched
+RUN systemctl enable vboxdrv
 
-# Install Negativo17 Nvidia driver
+RUN dnf install almalinux-release-nvidia-driver -y
-RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
+RUN dnf install nvidia-open-kmod nvidia-driver nvidia-driver-cuda -y
-RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
-
-# Install Nvidia X11 driver
-RUN dnf install xorg-x11-nvidia --enablerepo=fc-nvidia -y
 
 RUN dnf install -y waydroid scx-scheds
 
@@ -92,8 +97,10 @@ RUN dnf install firefox thunderbird -y
 RUN rm -f /usr/lib64/libopenh264.so.2.4.1 /usr/lib64/libopenh264.so.7
 RUN rpm -Uvh --nodeps https://codecs.fedoraproject.org/openh264/42/x86_64/Packages/o/openh264-2.5.1-1.fc42.x86_64.rpm https://codecs.fedoraproject.org/openh264/42/x86_64/Packages/m/mozilla-openh264-2.5.1-1.fc42.x86_64.rpm
 
+RUN dnf install xorg-x11-xinit xkbcomp xinput xlibre-xserver-Xorg xlibre-xf86-input-libinput cage weston redshift -y
+
 RUN dnf install ananicy-cpp cachyos-ananicy-rules cachyos-settings -y \
-    && systemctl disable ananicy-cpp
+    && systemctl enable ananicy-cpp
 
 # Install VLC
 RUN dnf install vlc vlc-plugins-freeworld vlc-plugin-pipewire -y
@@ -106,17 +113,10 @@ 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 dnf install -y https://github.com/balena-io/etcher/releases/download/v2.1.6/balena-etcher-2.1.6-1.x86_64.rpm
-
-RUN dnf install -y keepassxc
-
 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 echo 'kargs = ["zswap.enabled=1", "zswap.shrinker_enabled=0", "zswap.compressor=zstd", "zswap.zpool=zsmalloc"]' > /usr/lib/bootc/kargs.d/30-zswap.toml
 RUN printf '[connection]\nwifi.powersave=2\n' > /usr/lib/NetworkManager/conf.d/disable-wifi-powersave.conf
 
 COPY etc /etc

etc/X11/xorg.conf.d/20-modesetting.conf

@@ -0,0 +1,7 @@
+Section "Device"
+    Identifier    "Intel Graphics"
+    Driver        "modesetting"
+    Option        "ShadowFB" "false" # you don't need on recent hardware
+    Option        "Atomic" "true" #only effective on Xlibre, or Xorg-git with a special patch
+    Option        "TearFree" "false" # Compositor is being used so TearFree is not needed
+EndSection

etc/X11/xorg.conf.d/20-nvidia.conf

@@ -1,31 +0,0 @@
-Section "ServerLayout"
-    Identifier "layout"
-    Screen 0 "intel"
-    Inactive "nvidia"
-    Option "AllowNVIDIAGPUScreens"
-EndSection
-
-Section "Device"
-    Identifier "nvidia"
-    Driver "nvidia"
-    BusID "PCI:1:0:0"
-EndSection
-
-Section "Screen"
-    Identifier "nvidia"
-    Device "nvidia"
-EndSection
-
-Section "Device"
-    Identifier "intel"
-    Driver "modesetting"
-    BusID "PCI:0:2:0"
-    Option        "ShadowFB" "false" # you don't need on recent hardware
-    Option        "Atomic" "true" #only effective on Xlibre, or Xorg-git with a special patch
-    Option        "TearFree" "false" # Compositor is being used so TearFree is not needed
-EndSection
-
-Section "Screen"
-    Identifier "intel"
-    Device "intel"
-EndSection

repo/fc-nvidia.repo

@@ -1,35 +0,0 @@
-[fc-nvidia]
-name=negativo17 - Nvidia
-baseurl=https://negativo17.org/repos/nvidia/fedora-44/$basearch/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=1
-gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
-enabled_metadata=1
-metadata_expire=6h
-type=rpm-md
-repo_gpgcheck=0
-
-[fc-nvidia-source]
-name=negativo17 - Nvidia - Source
-baseurl=https://negativo17.org/repos/nvidia/fedora-44/SRPMS
-enabled=0
-skip_if_unavailable=1
-gpgcheck=1
-gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
-enabled_metadata=1
-metadata_expire=6h
-type=rpm-md
-repo_gpgcheck=0
-
-[fc-nvidia-debug]
-name=negativo17 - Nvidia - Debug
-baseurl=https://negativo17.org/repos/nvidia/fedora-44/$basearch.debug/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=1
-gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
-enabled_metadata=1
-metadata_expire=6h
-type=rpm-md
-repo_gpgcheck=0

usr/bin/zswapinfo

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-echo "--- ZSWAP STATUS IN RAM & DISK ---"
-pages=$(sudo cat /sys/kernel/debug/zswap/stored_pages)
-pool=$(sudo cat /sys/kernel/debug/zswap/pool_total_size)
-wb_pages=$(sudo cat /sys/kernel/debug/zswap/written_back_pages)
-inc_pages=$(sudo cat /sys/kernel/debug/zswap/stored_incompressible_pages)
-
-echo "Data opsnappet i RAM (før komprimering): $((pages * 4 / 1024)) MB"
-echo "Fysisk RAM brugt (efter komprimering):   $((pool / 1024 / 1024)) MB"
-echo "Skubbet fra RAM til disk (pool fuld):     $((wb_pages * 4 / 1024)) MB"
-echo "Sendt direkte til disk (ikke-komprimerbar): $((inc_pages * 4 / 1024)) MB"

usr/share/scx_loader/config.toml

@@ -0,0 +1,13 @@
+# 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 = []