From f1900fa7489ba8679ffa7aeef6eb2fa20f1d28a5 Mon Sep 17 00:00:00 2001
From: Cameron Miller <cameron@codecameron.dev>
Date: Thu, 4 Aug 2022 12:29:29 +0100
Subject: [PATCH] get local repo synced

---
 README.org  | 44 ++++++++++++++++++++++++++++++++++++++++++++
 cbsh        | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 pkglist.txt |  8 +++++---
 3 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index 69dfcae..f6b5627 100644
--- a/README.org
+++ b/README.org
@@ -22,6 +22,7 @@ CBSH, or Cabooshy's Shell, is a Post installation Script for Arch Linux, and Arc
 - [[#adding-keyservers-to-gpgconf][Adding keyservers to gpg.conf]]
 - [[#recieving-the-pgp-key][Recieving the PGP key]]
 - [[#installing-the-packages-from-the-repos][Installing the packages from the repos]]
+- [[#choosing-graphics-drivers][Choosing Graphics Drivers]]
 - [[#copying-over-the-configs-from-etccbsh-to-home][Copying over the configs from /etc/cbsh to $HOME]]
 - [[#installing-doom-emacs][Installing DOOM Emacs!]]
 - [[#the-fun-part-setting-the-default-user-shell][The Fun part, Setting the default USER shell!]]
@@ -214,6 +215,49 @@ pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code
 >>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
 #+end_src
 
+<<<<<<< Updated upstream
+=======
+* Choosing Graphics Drivers
+By Default, the script normally installed the Nvidia Drivers, due to me using a Nvidia GPU, but recently i've realised it would be a much better idea to allow the user to install the relevant drivers based on what they use (Intel HD/Iris/Xe Graphics, AMD Graphics, Nvidia Graphics) instead of just installing the Nvidia Drivers if they don't use a Nvidia card.
+#+begin_src bash
+PS3='Set Graphics Drivers: \n
+NOTE: Currently, the nvidia-open drivers have an issue where they do not work on systems with AMD APUs, such as the Laptop Ryzen chips (C/U/H/HS/HX), or the Ryzen 2/3/4/5000 Series G Families of chips on the desktop, please use the closed source drivers instead to make sure you have a working system.'
+
+shells=("intel" "nvidia-open", "nivdia" "amd" "quit")
+select choice in "${shells[@]}"; do
+    case $choice in
+        intel)
+            sudo pacman -S xf86-video-intel vulkan-intel intel-media-driver && \
+            echo -e "Intel's Graphics Drivers have been installed."
+            break
+            ;;
+        amd)
+            sudo pacman -S radeon xf86-video-radeon vulkan-radeon libva-mesa-driver mesa-vdpau radeontop && \
+            echo -e "AMD Drivers have been installed."
+            break
+            ;;
+        nvidia-open)
+            sudo pacman -S nvidia-open nvidia-utils opencl-nvidia nvidia-settings \
+            echo -e "Nvidia Drivers have been installed, These are the Turing (GTX1600 series and RTX2000 series) and newer \"nvidia-open\" drivers, these are considered \"ALPHA QUALITY\" so there will be issues."
+            break
+            ;;
+        nvidia)
+            sudo pacman -S nvidia nvidia-utils nvidia-settings opencl-nvidia \
+            echo -e "Closed Source Nvidia Drivers have been installed, these currently support everything back to Maxwell (GTX900 Series)."
+            break
+            ;;
+        quit)
+            echo "No Graphics drivers have been installed"
+            break
+            ;;
+        ,*)
+           echo "invalid option $REPLY"
+           ;;
+        esac
+    done
+#+end_src
+
+>>>>>>> Stashed changes
 
 * Copying over the configs from /etc/cbsh to $HOME
 Pacman cannot install files to $HOME, so normally we would place them in /etc/skel, but as some distros such as Manjaro and Arco use /etc/skel for their own specific config files, we place them in /etc/cbsh so there are no conflicts on any arch based distro. the config files are placed here and then copied over to $HOME, we backup config just in case anything goes wrong. BEWARE!
diff --git a/cbsh b/cbsh
index 7ad7cb7..83d7eb1 100755
--- a/cbsh
+++ b/cbsh
@@ -42,11 +42,15 @@ addrepos() { \
     echo "## Adding the CBSH repository to /etc/pacman.conf ##"
     echo "####################################################"
     grep -qxF "[cbsh-arch-repo]" /etc/pacman.conf ||
+<<<<<<< Updated upstream
 <<<<<<< HEAD
         (echo "[cbsh-arch-repo]"; echo "SigLevel = Optional DatabaseOptional"; \
 =======
         (echo "[cbsh-arch-repo]"; echo "SigLevel = Required DatabaseOptional"; \
 >>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
+=======
+        (echo "[cbsh-arch-repo]"; echo "SigLevel = Required DatabaseOptional"; \
+>>>>>>> Stashed changes
          echo "Server = https://gitlab.com/cbsh/cbsh-arch/\$repo/-/raw/main/\$arch") | sudo tee -a /etc/pacman.conf
 }
 addrepos || err "Error adding the Repo to /etc/pacman.conf."
@@ -74,11 +78,51 @@ recieve_keys || err "Error Recieving PGP key $_pgpkey"
 sudo pacman --needed --ask 4 -Syu - < pkglist.txt
 
 # Now that pikaur is installed, we can sync the AUR and install some needed packages (Nerd Fonts) from there.
+<<<<<<< Updated upstream
 <<<<<<< HEAD
 pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code librewolf-bin
 =======
 pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code
 >>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
+=======
+pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code
+
+PS3='Set Graphics Drivers: \n
+NOTE: Currently, the nvidia-open drivers have an issue where they do not work on systems with AMD APUs, such as the Laptop Ryzen chips (C/U/H/HS/HX), or the Ryzen 2/3/4/5000 Series G Families of chips on the desktop, please use the closed source drivers instead to make sure you have a working system.'
+
+shells=("intel" "nvidia-open", "nivdia" "amd" "quit")
+select choice in "${shells[@]}"; do
+    case $choice in
+        intel)
+            sudo pacman -S xf86-video-intel vulkan-intel intel-media-driver && \
+            echo -e "Intel's Graphics Drivers have been installed."
+            break
+            ;;
+        amd)
+            sudo pacman -S radeon xf86-video-radeon vulkan-radeon libva-mesa-driver mesa-vdpau radeontop && \
+            echo -e "AMD Drivers have been installed."
+            break
+            ;;
+        nvidia-open)
+            sudo pacman -S nvidia-open nvidia-utils opencl-nvidia nvidia-settings \
+            echo -e "Nvidia Drivers have been installed, These are the Turing (GTX1600 series and RTX2000 series) and newer \"nvidia-open\" drivers, these are considered \"ALPHA QUALITY\" so there will be issues."
+            break
+            ;;
+        nvidia)
+            sudo pacman -S nvidia nvidia-utils nvidia-settings opencl-nvidia \
+            echo -e "Closed Source Nvidia Drivers have been installed, these currently support everything back to Maxwell (GTX900 Series)."
+            break
+            ;;
+        quit)
+            echo "No Graphics drivers have been installed"
+            break
+            ;;
+        *)
+           echo "invalid option $REPLY"
+           ;;
+        esac
+    done
+>>>>>>> Stashed changes
 
 echo "#########################################################"
 echo "## Copying the config files from /etc/cbsh into \$HOME ##"
@@ -89,11 +133,14 @@ echo "#########################################################"
 [ -d ~/.config ] && mkdir ~/.config-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M)
 
 cd /etc/cbsh
+<<<<<<< Updated upstream
 <<<<<<< HEAD
 sudo mv .config/qtile/* .config/qtile
 sudo mv .config/kitty/* .config/kitty
 =======
 >>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
+=======
+>>>>>>> Stashed changes
 sudo mv zsh/.zshrc .zshrc
 cp -Rf . ~ && cd -
 
@@ -139,6 +186,7 @@ select choice in "${shells[@]}"; do
     done
 
 # Disable Current Login Manager, if any.
+<<<<<<< Updated upstream
 <<<<<<< HEAD
 echo "######################################################"
 echo "## Disable previous login manager, if there is one. ##"
@@ -147,6 +195,9 @@ sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.
 =======
 sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager, or one is not installed."
 >>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
+=======
+sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager, or one is not installed."
+>>>>>>> Stashed changes
 
 # Then enable SDDM as the Login Manager
 sudo systemctl enable sddm
diff --git a/pkglist.txt b/pkglist.txt
index 9dee9c2..efa3bd5 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -32,9 +32,6 @@ lxsession
 mpv
 networkmanager
 network-manager-applet
-nvidia
-nvidia-utils
-nvidia-settings
 pacman-contrib
 pcmanfm
 picom
@@ -69,4 +66,9 @@ qtile
 <<<<<<< HEAD
 =======
 volumeicon
+<<<<<<< Updated upstream
 >>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
+=======
+mesa
+lib32-mesa
+>>>>>>> Stashed changes