From f2414083d6f94bfd4ca65bb0c6677559bfaf3469 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Wed, 19 Jun 2024 13:56:37 +0200
Subject: [PATCH] Set `modeset` parameter in mkinitcpio

---
 scripts/Arch/Config/nvidia-dkms/install.sh   | 2 ++
 scripts/Common/Config/nvidia-dkms/install.sh | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/Arch/Config/nvidia-dkms/install.sh b/scripts/Arch/Config/nvidia-dkms/install.sh
index eaf21c4f1..b23eb8f28 100755
--- a/scripts/Arch/Config/nvidia-dkms/install.sh
+++ b/scripts/Arch/Config/nvidia-dkms/install.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
+echo "MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)" | sudo tee /etc/mkinitcpio.conf.d/nvidia.conf > /dev/null;
+
 sudo sed -i \
     -e "/^HOOKS=(.* kms /{" \
         -e "h; s/^/#/; p;" \
diff --git a/scripts/Common/Config/nvidia-dkms/install.sh b/scripts/Common/Config/nvidia-dkms/install.sh
index b26628c5b..8e48283b4 100755
--- a/scripts/Common/Config/nvidia-dkms/install.sh
+++ b/scripts/Common/Config/nvidia-dkms/install.sh
@@ -1,11 +1,4 @@
 #!/bin/bash
-# According to installation guide on Arch Wiki:
-# https://wiki.archlinux.org/title/NVIDIA#DRM_kernel_mode_setting
-{
-    echo "options nvidia_drm modeset=1";
-    # echo "options nvidia_drm fbdev=1";
- } | sudo tee /etc/modprobe.d/nvidia.conf > /dev/null;
-
 # According to: https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks
 {
     echo "options nvidia NVreg_PreserveVideoMemoryAllocations=1";