finn/omarchy
1
0
Fork 0
mirror of https://github.com/basecamp/omarchy.git synced 2025-07-28 04:39:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nvidia check

Browse Source
This commit is contained in:
David Heinemeier Hansson
2025-07-02 16:21:52 -07:00
parent e9a399173b
commit 863a1b0b3e
1 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
install/nvidia.sh
View File

@ -9,37 +9,32 @@
# ============================================================================== # ==============================================================================
# --- GPU Detection --- # --- GPU Detection ---
# Check if nvidia gpu exists, exit silently if not found if [ -n "$(lspci | grep -i 'nvidia')" ]; then
gpu_info=$(lspci | grep -i 'nvidia') # --- Driver Selection ---
if [ -z "$gpu_info" ]; then # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
exit 0 if echo "$gpu_info" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
fi
# --- 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" NVIDIA_DRIVER_PACKAGE="nvidia-open-dkms"
else else
NVIDIA_DRIVER_PACKAGE="nvidia-dkms" NVIDIA_DRIVER_PACKAGE="nvidia-dkms"
fi fi
# Check which kernel is installed and set appropriate headers package # Check which kernel is installed and set appropriate headers package
KERNEL_HEADERS="linux-headers" # Default KERNEL_HEADERS="linux-headers" # Default
if pacman -Q linux-zen &>/dev/null; then if pacman -Q linux-zen &>/dev/null; then
KERNEL_HEADERS="linux-zen-headers" KERNEL_HEADERS="linux-zen-headers"
elif pacman -Q linux-lts &>/dev/null; then elif pacman -Q linux-lts &>/dev/null; then
KERNEL_HEADERS="linux-lts-headers" KERNEL_HEADERS="linux-lts-headers"
elif pacman -Q linux-hardened &>/dev/null; then elif pacman -Q linux-hardened &>/dev/null; then
KERNEL_HEADERS="linux-hardened-headers" KERNEL_HEADERS="linux-hardened-headers"
fi fi
# Enable multilib repository for 32-bit libraries # Enable multilib repository for 32-bit libraries
if ! grep -q "^\[multilib\]" /etc/pacman.conf; then if ! grep -q "^\[multilib\]" /etc/pacman.conf; then
sudo sed -i '/^#\[multilib\]/,/^#Include/ s/^#//' /etc/pacman.conf sudo sed -i '/^#\[multilib\]/,/^#Include/ s/^#//' /etc/pacman.conf
fi fi
# Install packages # Install packages
PACKAGES_TO_INSTALL=( PACKAGES_TO_INSTALL=(
"${KERNEL_HEADERS}" "${KERNEL_HEADERS}"
"${NVIDIA_DRIVER_PACKAGE}" "${NVIDIA_DRIVER_PACKAGE}"
"nvidia-utils" "nvidia-utils"
@ -48,39 +43,40 @@ PACKAGES_TO_INSTALL=(
"libva-nvidia-driver" # For VA-API hardware acceleration "libva-nvidia-driver" # For VA-API hardware acceleration
"qt5-wayland" "qt5-wayland"
"qt6-wayland" "qt6-wayland"
) )
yay -Syu --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}" yay -Syu --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"
# Configure modprobe for early KMS # Configure modprobe for early KMS
echo "options nvidia_drm modeset=1" | sudo tee /etc/modprobe.d/nvidia.conf >/dev/null echo "options nvidia_drm modeset=1" | sudo tee /etc/modprobe.d/nvidia.conf >/dev/null
# Configure mkinitcpio for early loading # Configure mkinitcpio for early loading
MKINITCPIO_CONF="/etc/mkinitcpio.conf" MKINITCPIO_CONF="/etc/mkinitcpio.conf"
# Define modules # Define modules
NVIDIA_MODULES="nvidia nvidia_modeset nvidia_uvm nvidia_drm" NVIDIA_MODULES="nvidia nvidia_modeset nvidia_uvm nvidia_drm"
# Create backup # Create backup
sudo cp "$MKINITCPIO_CONF" "${MKINITCPIO_CONF}.backup" sudo cp "$MKINITCPIO_CONF" "${MKINITCPIO_CONF}.backup"
# Remove any old nvidia modules to prevent duplicates # 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" 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 # Add the new modules at the start of the MODULES array
sudo sed -i -E "s/^(MODULES=\\()/\\1${NVIDIA_MODULES} /" "$MKINITCPIO_CONF" sudo sed -i -E "s/^(MODULES=\\()/\\1${NVIDIA_MODULES} /" "$MKINITCPIO_CONF"
# Clean up potential double spaces # Clean up potential double spaces
sudo sed -i -E 's/ +/ /g' "$MKINITCPIO_CONF" sudo sed -i -E 's/ +/ /g' "$MKINITCPIO_CONF"
sudo mkinitcpio -P sudo mkinitcpio -P
# Add NVIDIA environment variables to hyprland.conf # Add NVIDIA environment variables to hyprland.conf
HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf" HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf"
if [ -f "$HYPRLAND_CONF" ]; then if [ -f "$HYPRLAND_CONF" ]; then
cat >> "$HYPRLAND_CONF" << 'EOF' cat >>"$HYPRLAND_CONF" <<'EOF'
# NVIDIA environment variables # NVIDIA environment variables
env = NVD_BACKEND,direct env = NVD_BACKEND,direct
env = LIBVA_DRIVER_NAME,nvidia env = LIBVA_DRIVER_NAME,nvidia
env = __GLX_VENDOR_LIBRARY_NAME,nvidia env = __GLX_VENDOR_LIBRARY_NAME,nvidia
EOF EOF
fi
fi fi