From d88ed796b5091d353221ad70577efaa1efe0d764 Mon Sep 17 00:00:00 2001
From: Cameron Miller <cameron@codecameron.dev>
Date: Sat, 12 Mar 2022 11:22:43 +0000
Subject: [PATCH] update package list and Readme

---
 README.org  | 26 +++++++++++++++++++-------
 pkglist.txt |  9 +++++++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/README.org b/README.org
index 2000469..9e98fa4 100644
--- a/README.org
+++ b/README.org
@@ -61,7 +61,22 @@ So For Example, Updating on Arch would be the standard way, as below:
 #+begin_example
 sudo pacman -Syu
 #+end_example
-If you have a AUR Helper installed to, do not forget to add that as well.
+
+If you have a AUR Helper installed (yay, paru, pikaur etc.), you can use that instead,
+ - yay
+    #+begin_example
+    yay -Syu (or yay, as yay is aliased to yay -Syu)
+    #+end_example
+ - paru
+   #+begin_example
+    paru -Syu (or paru, as paru is aliased to paru -Syu)
+   #+end_example
+ - pikaur
+   #+begin_example
+    pikaur -Syu
+   #+end_example
+
+If you use a different AUR Helper, substitute it for the examples above.
 
 And on Debian:
 #+begin_example
@@ -137,15 +152,14 @@ welcome || err "User choose to exit."
 #+end_src
 
 * Adding the CBSH Repos to your system.
-Right now nothing is signed as i'm still testing stuff between my work PC and home PC and dealing with two seperate gpg keys is a pain so for now everything is unsigned, once everything is working properly i will be signing everything.
 #+begin_src bash
 addrepos() { \
     echo "####################################################"
     echo "## Adding the CBSH repository to /etc/pacman.conf ##"
     echo "####################################################"
     grep -qxF "[cbsh-arch-repo]" /etc/pacman.conf ||
-        (echo "[cbsh-arch-repo]"; echo "SigLevel = Optional DatabaseOptional"; \
-         echo "Server = https://gitlab.com/cabooshyy/\$repo/-/raw/main/\$arch") | sudo tee -a /etc/pacman.conf
+        (echo "[cbsh-arch-repo]"; echo "SigLevel = Required DatabaseOptional"; \
+         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."
 #+end_src
@@ -206,8 +220,6 @@ 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
-sudo mv .config/qtile/qtile/* .config/qtile && sudo rm -r .config/qtile/qtile
-sudo mv .config/kitty/kitty/* .config/kitty && sudo rm -r .config/kitty/kitty
 sudo mv zsh/.zshrc .zshrc
 cp -Rf . ~ && cd -
 echo "#################################################################################################"
@@ -257,7 +269,7 @@ select choice in "${shells[@]}"; do
 * Make Sure SDDM is enabled so we don't boot into a TTY, and NetworkManager is too so the applet works.
 #+begin_src bash
 # Disable Current Login Manager, if any.
-sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current 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."
 
 # Then enable SDDM as the Login Manager
 sudo systemctl enable sddm
diff --git a/pkglist.txt b/pkglist.txt
index ddf42a7..796c5ba 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -32,11 +32,13 @@ lxsession
 mpv
 networkmanager
 network-manager-applet
+nvidia
+nvidia-utils
+nvidia-settings
 pacman-contrib
 pcmanfm
 picom
 qt5ct
-qutebrowser
 ripgrep
 sddm
 starship
@@ -52,9 +54,12 @@ xorg-xprop
 xorg-xrdb
 xorg-xset
 xorg-xsetroot
+xf86-video-qxl
+xf86-video-intel
+xf86-video-amdgpu
 xterm
 vim
 dunst
 xdotool
 qtile
-element-desktop
+volumeicon