From fbd85990d07f2fe3aef7346eee77a716b2fc93e7 Mon Sep 17 00:00:00 2001
From: Kn0ax <me@kn0ax.com>
Date: Sun, 29 Jun 2025 22:19:36 +0200
Subject: [PATCH 1/6] [not tested] nvidia support

this commit tries to add nvidia suppport.
it's not tested yet.
---
 install/hyprlandia.sh |  15 ++++++
 install/nvidia        | 105 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 install/nvidia

diff --git a/install/hyprlandia.sh b/install/hyprlandia.sh
index a320d9d..8e73a88 100644
--- a/install/hyprlandia.sh
+++ b/install/hyprlandia.sh
@@ -3,5 +3,20 @@ yay -S --noconfirm --needed \
   wofi waybar mako swaybg \
   xdg-desktop-portal-hyprland xdg-desktop-portal-gtk
 
+# Checks if nvidia gpu exist
+gpu_info=$(lspci | grep -i 'nvidia')
+if [ -n "$gpu_info" ]; then
+    # Ask user if they want to install NVIDIA drivers
+    if [ -t 0 ]; then
+        read -p "NVIDIA GPU detected. Do you want to install NVIDIA drivers? (y/N) " install_nvidia
+        if [[ "$install_nvidia" =~ ^[yY](es)?$ ]]; then
+            source ./nvidia
+        fi
+    else
+        # Non-interactive mode - run nvidia script
+        source ./nvidia
+    fi
+fi
+
 # Start Hyprland on first session
 echo "[[ -z \$DISPLAY && \$(tty) == /dev/tty1 ]] && exec Hyprland" >~/.bash_profile
diff --git a/install/nvidia b/install/nvidia
new file mode 100644
index 0000000..670a630
--- /dev/null
+++ b/install/nvidia
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# ==============================================================================
+# Hyprland NVIDIA Setup Script for Arch Linux
+# ==============================================================================
+# This script automates the installation and configuration of NVIDIA drivers
+# for use with Hyprland on Arch Linux, following the official Hyprland wiki.
+#
+# Author: https://github.com/Kn0ax
+# 
+# ==============================================================================
+
+# --- Colors for better readability ---
+C_RESET='\033[0m'
+C_RED='\033[0;31m'
+C_YELLOW='\033[0;33m'
+C_BOLD='\033[1m'
+
+# --- GPU Detection and Driver Selection ---
+# Get GPU info for driver selection
+gpu_info=$(lspci | grep -i 'nvidia')
+
+# Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
+if echo "$gpu_info" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
+    NVIDIA_DRIVER_PACKAGE="nvidia-open-dkms"
+else
+    NVIDIA_DRIVER_PACKAGE="nvidia-dkms"
+fi
+
+# Check which kernel is installed and set appropriate headers package
+KERNEL_HEADERS="linux-headers"  # Default
+if pacman -Q linux-zen &>/dev/null; then
+    KERNEL_HEADERS="linux-zen-headers"
+elif pacman -Q linux-lts &>/dev/null; then
+    KERNEL_HEADERS="linux-lts-headers"
+elif pacman -Q linux-hardened &>/dev/null; then
+    KERNEL_HEADERS="linux-hardened-headers"
+fi
+
+# Install packages
+PACKAGES_TO_INSTALL=(
+    "${KERNEL_HEADERS}"    
+    "${NVIDIA_DRIVER_PACKAGE}"
+    "nvidia-utils"
+    "lib32-nvidia-utils"
+    "egl-wayland"
+    "libva-nvidia-driver" # For VA-API hardware acceleration
+    "qt5-wayland"
+    "qt6-wayland"
+)
+
+if ! yay -Syu --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"; then
+    echo -e "${C_RED}${C_BOLD}[ERROR]${C_RESET} Failed to install NVIDIA packages. Please check the output for errors." >&2
+    exit 1
+fi
+
+# Configure modprobe for early KMS
+if ! echo "options nvidia_drm modeset=1" | sudo tee /etc/modprobe.d/nvidia.conf >/dev/null; then
+    echo -e "${C_RED}${C_BOLD}[ERROR]${C_RESET} Failed to configure modprobe. Please check your permissions." >&2
+    exit 1
+fi
+
+# Configure mkinitcpio for early loading
+MKINITCPIO_CONF="/etc/mkinitcpio.conf"
+
+if [ ! -f "$MKINITCPIO_CONF" ]; then
+    echo -e "${C_RED}${C_BOLD}[ERROR]${C_RESET} $MKINITCPIO_CONF not found. Aborting." >&2
+    exit 1
+fi
+
+# Define modules
+NVIDIA_MODULES="nvidia nvidia_modeset nvidia_uvm nvidia_drm"
+
+# Create backup
+sudo cp "$MKINITCPIO_CONF" "${MKINITCPIO_CONF}.backup"
+
+# Remove any old nvidia modules to prevent duplicates
+sudo sed -i -E 's/ nvidia_drm//g; s/ nvidia_uvm//g; s/ nvidia_modeset//g; s/ nvidia//g;' "$MKINITCPIO_CONF"
+# Add the new modules at the start of the MODULES array
+sudo sed -i -E "s/^(MODULES=\\()/\\1${NVIDIA_MODULES} /" "$MKINITCPIO_CONF"
+# Clean up potential double spaces
+sudo sed -i -E 's/  +/ /g' "$MKINITCPIO_CONF"
+
+if ! sudo mkinitcpio -P; then
+    echo -e "${C_RED}${C_BOLD}[ERROR]${C_RESET} Failed to rebuild initramfs with 'mkinitcpio -P'. Please check the output for errors." >&2
+    exit 1
+fi
+
+# Add NVIDIA environment variables to hyprland.conf
+HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf"
+if [ -f "$HYPRLAND_CONF" ]; then
+    cat >> "$HYPRLAND_CONF" << 'EOF'
+
+# NVIDIA environment variables
+env = ELECTRON_OZONE_PLATFORM_HINT,auto
+env = NVD_BACKEND,direct
+env = LIBVA_DRIVER_NAME,nvidia
+env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+EOF
+fi
+
+# Final information
+echo -e "${C_YELLOW}${C_BOLD}IMPORTANT:${C_RESET} A reboot is required for all changes to take effect."
+
+

From 8f68793f7c4fd33a3fabfc4f1bf6f51f7bec3ab9 Mon Sep 17 00:00:00 2001
From: Kn0ax <me@kn0ax.com>
Date: Mon, 30 Jun 2025 00:38:36 +0200
Subject: [PATCH 2/6] fix script path

meh, stupid me
---
 install/hyprlandia.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/hyprlandia.sh b/install/hyprlandia.sh
index 8e73a88..6a176ce 100644
--- a/install/hyprlandia.sh
+++ b/install/hyprlandia.sh
@@ -10,11 +10,11 @@ if [ -n "$gpu_info" ]; then
     if [ -t 0 ]; then
         read -p "NVIDIA GPU detected. Do you want to install NVIDIA drivers? (y/N) " install_nvidia
         if [[ "$install_nvidia" =~ ^[yY](es)?$ ]]; then
-            source ./nvidia
+            source ~/.local/share/omarchy/install/nvidia
         fi
     else
         # Non-interactive mode - run nvidia script
-        source ./nvidia
+        source ~/.local/share/omarchy/install/nvidia
     fi
 fi
 

From b5dfaef8bbb4d168969c448dc04b7877d6389d58 Mon Sep 17 00:00:00 2001
From: Kn0ax <me@kn0ax.com>
Date: Mon, 30 Jun 2025 00:47:42 +0200
Subject: [PATCH 3/6] enable multilib (if not already)

---
 install/nvidia | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/install/nvidia b/install/nvidia
index 670a630..8c0ffbb 100644
--- a/install/nvidia
+++ b/install/nvidia
@@ -37,6 +37,11 @@ elif pacman -Q linux-hardened &>/dev/null; then
     KERNEL_HEADERS="linux-hardened-headers"
 fi
 
+# Enable multilib repository for 32-bit libraries
+if ! grep -q "^\[multilib\]" /etc/pacman.conf; then
+    sudo sed -i '/^#\[multilib\]/,/^#Include/ s/^#//' /etc/pacman.conf
+fi
+
 # Install packages
 PACKAGES_TO_INSTALL=(
     "${KERNEL_HEADERS}"    

From 188d1c331a2d44cf6acf3de5fb4981cb7917324b Mon Sep 17 00:00:00 2001
From: Kn0ax <me@kn0ax.com>
Date: Mon, 30 Jun 2025 20:45:17 +0200
Subject: [PATCH 4/6] requested changes

---
 install/hyprlandia.sh         | 17 +----------------
 install/{nvidia => nvidia.sh} | 30 +++++++++---------------------
 2 files changed, 10 insertions(+), 37 deletions(-)
 rename install/{nvidia => nvidia.sh} (82%)

diff --git a/install/hyprlandia.sh b/install/hyprlandia.sh
index 6a176ce..4e9b9af 100644
--- a/install/hyprlandia.sh
+++ b/install/hyprlandia.sh
@@ -3,20 +3,5 @@ yay -S --noconfirm --needed \
   wofi waybar mako swaybg \
   xdg-desktop-portal-hyprland xdg-desktop-portal-gtk
 
-# Checks if nvidia gpu exist
-gpu_info=$(lspci | grep -i 'nvidia')
-if [ -n "$gpu_info" ]; then
-    # Ask user if they want to install NVIDIA drivers
-    if [ -t 0 ]; then
-        read -p "NVIDIA GPU detected. Do you want to install NVIDIA drivers? (y/N) " install_nvidia
-        if [[ "$install_nvidia" =~ ^[yY](es)?$ ]]; then
-            source ~/.local/share/omarchy/install/nvidia
-        fi
-    else
-        # Non-interactive mode - run nvidia script
-        source ~/.local/share/omarchy/install/nvidia
-    fi
-fi
-
 # Start Hyprland on first session
-echo "[[ -z \$DISPLAY && \$(tty) == /dev/tty1 ]] && exec Hyprland" >~/.bash_profile
+echo "[[ -z \$DISPLAY && \$(tty) == /dev/tty1 ]] && exec Hyprland" >~/.bash_profile
\ No newline at end of file
diff --git a/install/nvidia b/install/nvidia.sh
similarity index 82%
rename from install/nvidia
rename to install/nvidia.sh
index 8c0ffbb..88afa25 100644
--- a/install/nvidia
+++ b/install/nvidia.sh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # ==============================================================================
 # Hyprland NVIDIA Setup Script for Arch Linux
 # ==============================================================================
@@ -10,16 +8,20 @@
 # 
 # ==============================================================================
 
+# --- GPU Detection ---
+# Check if nvidia gpu exists, exit silently if not found
+gpu_info=$(lspci | grep -i 'nvidia')
+if [ -z "$gpu_info" ]; then
+    exit 0
+fi
+
 # --- Colors for better readability ---
 C_RESET='\033[0m'
 C_RED='\033[0;31m'
 C_YELLOW='\033[0;33m'
 C_BOLD='\033[1m'
 
-# --- GPU Detection and Driver Selection ---
-# Get GPU info for driver selection
-gpu_info=$(lspci | grep -i 'nvidia')
-
+# --- Driver Selection ---
 # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
 if echo "$gpu_info" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
     NVIDIA_DRIVER_PACKAGE="nvidia-open-dkms"
@@ -60,19 +62,11 @@ if ! yay -Syu --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"; then
 fi
 
 # Configure modprobe for early KMS
-if ! echo "options nvidia_drm modeset=1" | sudo tee /etc/modprobe.d/nvidia.conf >/dev/null; then
-    echo -e "${C_RED}${C_BOLD}[ERROR]${C_RESET} Failed to configure modprobe. Please check your permissions." >&2
-    exit 1
-fi
+echo "options nvidia_drm modeset=1" | sudo tee /etc/modprobe.d/nvidia.conf >/dev/null
 
 # Configure mkinitcpio for early loading
 MKINITCPIO_CONF="/etc/mkinitcpio.conf"
 
-if [ ! -f "$MKINITCPIO_CONF" ]; then
-    echo -e "${C_RED}${C_BOLD}[ERROR]${C_RESET} $MKINITCPIO_CONF not found. Aborting." >&2
-    exit 1
-fi
-
 # Define modules
 NVIDIA_MODULES="nvidia nvidia_modeset nvidia_uvm nvidia_drm"
 
@@ -97,14 +91,8 @@ if [ -f "$HYPRLAND_CONF" ]; then
     cat >> "$HYPRLAND_CONF" << 'EOF'
 
 # NVIDIA environment variables
-env = ELECTRON_OZONE_PLATFORM_HINT,auto
 env = NVD_BACKEND,direct
 env = LIBVA_DRIVER_NAME,nvidia
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 EOF
 fi
-
-# Final information
-echo -e "${C_YELLOW}${C_BOLD}IMPORTANT:${C_RESET} A reboot is required for all changes to take effect."
-
-

From d6a44c24a72c8cfdc6e18a0715d7271a7784edda Mon Sep 17 00:00:00 2001
From: Kn0ax <me@kn0ax.com>
Date: Mon, 30 Jun 2025 20:53:36 +0200
Subject: [PATCH 5/6] remove unneeded comments

---
 config/hypr/hyprland.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index dc5bd78..316fc80 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -27,10 +27,6 @@ source = ~/.config/omarchy/current/theme/hyprland.conf
 # Extra env variables
 env = GDK_SCALE,2 # Change to 1 if on a 1x display
 
-# Extra env variables needed if running an NVIDIA GPU
-# env = NVD_BACKEND,direct
-# env = LIBVA_DRIVER_NAME,nvidia
-# env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 
 # Extra bindings
 bind = SUPER, A, exec, $webapp="https://chatgpt.com"

From e8c9a5ad49d3b0b28a1268b8e54f88d5f0a533f1 Mon Sep 17 00:00:00 2001
From: Zhephod <manu@julius.ai>
Date: Mon, 30 Jun 2025 23:56:33 -0700
Subject: [PATCH 6/6] remove defensive code

---
 install/nvidia.sh | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/install/nvidia.sh b/install/nvidia.sh
index 88afa25..90e81d0 100644
--- a/install/nvidia.sh
+++ b/install/nvidia.sh
@@ -5,7 +5,7 @@
 # for use with Hyprland on Arch Linux, following the official Hyprland wiki.
 #
 # Author: https://github.com/Kn0ax
-# 
+#
 # ==============================================================================
 
 # --- GPU Detection ---
@@ -15,12 +15,6 @@ if [ -z "$gpu_info" ]; then
     exit 0
 fi
 
-# --- Colors for better readability ---
-C_RESET='\033[0m'
-C_RED='\033[0;31m'
-C_YELLOW='\033[0;33m'
-C_BOLD='\033[1m'
-
 # --- Driver Selection ---
 # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
 if echo "$gpu_info" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
@@ -46,7 +40,7 @@ fi
 
 # Install packages
 PACKAGES_TO_INSTALL=(
-    "${KERNEL_HEADERS}"    
+    "${KERNEL_HEADERS}"
     "${NVIDIA_DRIVER_PACKAGE}"
     "nvidia-utils"
     "lib32-nvidia-utils"
@@ -56,10 +50,7 @@ PACKAGES_TO_INSTALL=(
     "qt6-wayland"
 )
 
-if ! yay -Syu --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"; then
-    echo -e "${C_RED}${C_BOLD}[ERROR]${C_RESET} Failed to install NVIDIA packages. Please check the output for errors." >&2
-    exit 1
-fi
+yay -Syu --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"
 
 # Configure modprobe for early KMS
 echo "options nvidia_drm modeset=1" | sudo tee /etc/modprobe.d/nvidia.conf >/dev/null
@@ -80,10 +71,7 @@ sudo sed -i -E "s/^(MODULES=\\()/\\1${NVIDIA_MODULES} /" "$MKINITCPIO_CONF"
 # Clean up potential double spaces
 sudo sed -i -E 's/  +/ /g' "$MKINITCPIO_CONF"
 
-if ! sudo mkinitcpio -P; then
-    echo -e "${C_RED}${C_BOLD}[ERROR]${C_RESET} Failed to rebuild initramfs with 'mkinitcpio -P'. Please check the output for errors." >&2
-    exit 1
-fi
+sudo mkinitcpio -P
 
 # Add NVIDIA environment variables to hyprland.conf
 HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf"