From 1d073c0554a1c6e93634474ac78a953686d53a22 Mon Sep 17 00:00:00 2001 From: Lightemerald Date: Tue, 25 Mar 2025 13:52:24 +0100 Subject: [PATCH] Added ask GPU --- arch-setup.sh | 100 +++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/arch-setup.sh b/arch-setup.sh index 1cf7162..6957eb0 100755 --- a/arch-setup.sh +++ b/arch-setup.sh @@ -123,60 +123,62 @@ setup_pacman() { # Function name: GPU setup # Description: Setup GPU depending on the available devices gpu_setup() { - detected_gpu=$(lspci | grep -Ei "vga|3d|display") - case "$detected_gpu" in - *NVIDIA*) - options=( - "nvidia" "Official NVIDIA Drivers" ON - "nouveau" "Open Source nouveau drivers" OFF - ) - selected_driver=$(whiptail --title "Select NVIDIA Drivers" --radiolist \ - "Choose the NVIDIA driver you want to install:" 15 60 2 \ - "${options[@]}" 3>&1 1>&2 2>&3) - - if pacman -Qs nvidia > /dev/null; then - sudo pacman -R --noconfirm nvidia - elif pacman -Qs nvidia-dkms > /dev/null; then - sudo pacman -R --noconfirm nvidia-dkms - elif pacman -Qs xf86-video-nouveau > /dev/null; then - sudo pacman -R --noconfirm xf86-video-nouveau - fi - - case $selected_driver in - "\"nvidia\"") - if pacman -Qs linux > /dev/null; then - sudo pacman -S --needed --noconfirm nvidia-open - fi - if pacman -Qs linux-lts > /dev/null; then - sudo pacman -S --needed --noconfirm nvidia-open-lts - fi - if pacman -Qs linux-cachyos > /dev/null; then - sudo pacman -S --needed --noconfirm linux-cachyos-nvidia-open - fi - if pacman -Qs linux-zen > /dev/null || pacman -Qs linux-hardened > /dev/null; then - sudo pacman -S --needed --noconfirm nvidia-open-dkms + if whiptail --title "Setup GPU" --yesno "Would you like to setup GPU?" 10 60; then + detected_gpu=$(lspci | grep -Ei "vga|3d|display") + case "$detected_gpu" in + *NVIDIA*) + options=( + "nvidia" "Official NVIDIA Drivers" ON + "nouveau" "Open Source nouveau drivers" OFF + ) + selected_driver=$(whiptail --title "Select NVIDIA Drivers" --radiolist \ + "Choose the NVIDIA driver you want to install:" 15 60 2 \ + "${options[@]}" 3>&1 1>&2 2>&3) + + if pacman -Qs nvidia > /dev/null; then + sudo pacman -R --noconfirm nvidia + elif pacman -Qs nvidia-dkms > /dev/null; then + sudo pacman -R --noconfirm nvidia-dkms + elif pacman -Qs xf86-video-nouveau > /dev/null; then + sudo pacman -R --noconfirm xf86-video-nouveau fi + + case $selected_driver in + "\"nvidia\"") + if pacman -Qs linux > /dev/null; then + sudo pacman -S --needed --noconfirm nvidia-open + fi + if pacman -Qs linux-lts > /dev/null; then + sudo pacman -S --needed --noconfirm nvidia-open-lts + fi + if pacman -Qs linux-cachyos > /dev/null; then + sudo pacman -S --needed --noconfirm linux-cachyos-nvidia-open + fi + if pacman -Qs linux-zen > /dev/null || pacman -Qs linux-hardened > /dev/null; then + sudo pacman -S --needed --noconfirm nvidia-open-dkms + fi - if ! lspci | grep -Ei "amd|intel" > /dev/null; then - sudo pacman -S --needed --noconfirm libva-nvidia-driver - fi + if ! lspci | grep -Ei "amd|intel" > /dev/null; then + sudo pacman -S --needed --noconfirm libva-nvidia-driver + fi - if (whiptail --title "Install Cuda" --yesno "Would you like to install Cuda?" 10 60) then - sudo pacman -S --needed --noconfirm cuda - fi + if (whiptail --title "Install Cuda" --yesno "Would you like to install Cuda?" 10 60); then + sudo pacman -S --needed --noconfirm cuda + fi + ;; + "\"nouveau\"") + sudo pacman -S --needed --noconfirm mesa vulkan-nouveau + ;; + esac ;; - "\"nouveau\"") - sudo pacman -S --needed --noconfirm mesa vulkan-nouveau + *AMD*) + sudo pacman -S --needed --noconfirm mesa vulkan-radeon ;; - esac - ;; - *AMD*) - sudo pacman -S --needed --noconfirm mesa vulkan-radeon - ;; - *Intel*) - sudo pacman -S --needed --noconfirm intel-media-driver vulkan-intel - ;; - esac + *Intel*) + sudo pacman -S --needed --noconfirm intel-media-driver vulkan-intel + ;; + esac + fi }