diff options
| -rw-r--r-- | raveos-calamares-theme/PKGBUILD | 2 | ||||
| -rw-r--r-- | raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh | 26 |
2 files changed, 26 insertions, 2 deletions
diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD index 318bceb..1357438 100644 --- a/raveos-calamares-theme/PKGBUILD +++ b/raveos-calamares-theme/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: nippy <nippy@tuta.io> pkgname=raveos-calamares-theme pkgver=2.0.0 -pkgrel=66 +pkgrel=67 pkgdesc="RaveOS Calamares Theme" arch=('any') url="https://git.rp1.hu/RaveOS" diff --git a/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh b/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh index c30bbf3..22e59d7 100644 --- a/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh +++ b/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh @@ -46,7 +46,31 @@ EOF echo ">>> [gpu] Enabling NVIDIA DRM modeset..." mkdir -p /etc/modprobe.d - echo "options nvidia_drm modeset=1" > /etc/modprobe.d/nvidia-drm.conf + cat > /etc/modprobe.d/nvidia-drm.conf <<'EOF' +options nvidia_drm modeset=1 +EOF + + echo ">>> [gpu] Disabling nouveau (blacklist in /etc so initramfs keeps it)..." + cat > /etc/modprobe.d/99-nvidia-blacklist.conf <<'EOF' +blacklist nouveau +options nouveau modeset=0 +EOF + + echo ">>> [gpu] Embedding NVIDIA modules into initramfs..." + mkdir -p /etc/mkinitcpio.conf.d + cat > /etc/mkinitcpio.conf.d/raveos-nvidia.conf <<'EOF' +MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm) +EOF + + if pacman -Q plasma-desktop >/dev/null 2>&1; then + echo ">>> [gpu] NVIDIA + Plasma -> installing X11 session (plasma-x11-session)" + install_pkgs plasma-x11-session + mkdir -p /etc/sddm.conf.d + cat > /etc/sddm.conf.d/10-raveos-nvidia-x11.conf <<'EOF' +[Users] +DefaultSession=plasmax11.desktop +EOF + fi echo ">>> [gpu] Rebuilding initramfs..." mkinitcpio -P || true |