diff --git a/Dockerfile b/Dockerfile index ad3c1f4..317984a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-re ARG CACHEBUST=0 -RUN dnf -y install kernel-cachyos-lts kernel-cachyos-lts-headers kernel-cachyos-lts-devel akmod-nvidia +RUN dnf -y install kernel-cachyos-bore-eevdf kernel-cachyos-bore-eevdf-headers kernel-cachyos-bore-eevdf-devel akmod-nvidia COPY akmods.sh /tmp/akmods.sh RUN /tmp/akmods.sh @@ -41,12 +41,12 @@ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/ # Enable cliwrap. rpm-ostree cliwrap install-to-root / && \ # Replace the kernel, kernel-core and kernel-modules packages. -rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install kernel-cachyos-lts && \ +rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install kernel-cachyos-bore-eevdf && \ # install kernel headers -rpm-ostree install kernel-cachyos-lts-headers && \ +rpm-ostree install kernel-cachyos-bore-eevdf-headers && \ # remove Okular and Firefox from base image rpm-ostree override remove firefox firefox-langpacks okular && \ -rpm-ostree install ksshaskpass uksmd-lts clang clang-devel cronie distrobox fish flatpak-builder gparted libcap-ng-devel libvirt-daemon-driver-lxc libvirt-daemon-lxc lld llvm nvtop procps-ng-devel seadrive-gui virt-manager waydroid && \ +rpm-ostree install ksshaskpass uksmd clang clang-devel cronie distrobox fish flatpak-builder gparted libcap-ng-devel libvirt-daemon-driver-lxc libvirt-daemon-lxc lld llvm nvtop procps-ng-devel seadrive-gui virt-manager waydroid && \ # install RPM-fusion rpm-ostree install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \ # install nonfree codecs diff --git a/akmods.sh b/akmods.sh index 2abefcd..2dbd4ea 100755 --- a/akmods.sh +++ b/akmods.sh @@ -1,5 +1,5 @@ #!/bin/sh -KERNEL_VERSION="$(rpm -q kernel-cachyos-lts --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" +KERNEL_VERSION="$(rpm -q kernel-cachyos-bore-eevdf --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" akmods --force --kernels "${KERNEL_VERSION}" --kmod "nvidia" diff --git a/install-nvidia.sh b/install-nvidia.sh index 1cd4705..8c85584 100755 --- a/install-nvidia.sh +++ b/install-nvidia.sh @@ -1,5 +1,5 @@ #!/bin/sh -KERNEL_VERSION="$(rpm -q kernel-cachyos-lts --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" +KERNEL_VERSION="$(rpm -q kernel-cachyos-bore-eevdf --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" rpm-ostree install /tmp/nvidia/*${KERNEL_VERSION}*.rpm