From 2e6b3f5cc89ae5d82d8fc5ec86888a7a2d2c10dc Mon Sep 17 00:00:00 2001
From: Ram Prasath S <ram97prasath@gmail.com>
Date: Mon, 13 Nov 2023 19:02:51 +0530
Subject: [PATCH 1/5] add more nvidia pkgs; remove steam, brave; fix pacman vs
 aur packages for hypr

---
 pkg-files/aur-pkgs-hypr.txt | 12 ++++++++++++
 pkg-files/aur-pkgs.txt      |  1 -
 pkg-files/hypr.txt          | 12 +-----------
 pkg-files/pacman-pkgs.txt   |  1 -
 scripts/1-setup.sh          |  2 +-
 scripts/2-user.sh           | 21 +++++++++++++++------
 6 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 pkg-files/aur-pkgs-hypr.txt

diff --git a/pkg-files/aur-pkgs-hypr.txt b/pkg-files/aur-pkgs-hypr.txt
new file mode 100644
index 0000000..31bcd47
--- /dev/null
+++ b/pkg-files/aur-pkgs-hypr.txt
@@ -0,0 +1,12 @@
+grimblast-git
+waybar-hyprland
+wlogout
+swaylock-effects
+sddm-git
+nwg-look-bin
+nordic-theme
+otf-sora
+ttf-comfortaa
+ttf-icomoon-feather
+hyprpicker-git
+--END OF MINIMAL INSTALL--
diff --git a/pkg-files/aur-pkgs.txt b/pkg-files/aur-pkgs.txt
index d7d5f81..2834512 100644
--- a/pkg-files/aur-pkgs.txt
+++ b/pkg-files/aur-pkgs.txt
@@ -1,6 +1,5 @@
 --END OF MINIMAL INSTALL--
 autojump
-brave-bin
 bridge-utils
 dxvk-bin
 github-desktop-bin
diff --git a/pkg-files/hypr.txt b/pkg-files/hypr.txt
index 97c8bf9..ab0b7f5 100644
--- a/pkg-files/hypr.txt
+++ b/pkg-files/hypr.txt
@@ -10,34 +10,24 @@ starship
 wl-clipboard
 wf-recorder
 swaybg
-grimblast-git
 ffmpegthumbnailer
 tumbler
 playerctl
 noise-suppression-for-voice
 thunar-archive-plugin
 kitty
-waybar-hyprland
-wlogout
-swaylock-effects
-sddm-git
 pamixer
-nwg-look-bin
-nordic-theme
 papirus-icon-theme
 dunst
-otf-sora
 ttf-nerd-fonts-symbols-common
 otf-firamono-nerd
 inter-font
 ttf-fantasque-nerd
 noto-fonts
 noto-fonts-emoji
-ttf-comfortaa
 ttf-jetbrains-mono-nerd
-ttf-icomoon-feather
 ttf-iosevka-nerd
 adobe-source-code-pro-fonts
 brightnessctl
-hyprpicker-git
+xdg-desktop-portal-hyprland
 --END OF MINIMAL INSTALL--
diff --git a/pkg-files/pacman-pkgs.txt b/pkg-files/pacman-pkgs.txt
index b6dabe4..eb7122a 100644
--- a/pkg-files/pacman-pkgs.txt
+++ b/pkg-files/pacman-pkgs.txt
@@ -89,7 +89,6 @@ python-pip
 qemu
 snap-pac
 snapper
-steam
 swtpm
 synergy
 terminus-font
diff --git a/scripts/1-setup.sh b/scripts/1-setup.sh
index 6ad2f93..4cc39c2 100755
--- a/scripts/1-setup.sh
+++ b/scripts/1-setup.sh
@@ -114,7 +114,7 @@ echo -ne "
 # Graphics Drivers find and install
 gpu_type=$(lspci)
 if grep -E "NVIDIA|GeForce" <<< ${gpu_type}; then
-    pacman -S --noconfirm --needed nvidia
+    pacman -S --noconfirm --needed nvidia nvidia-settings nvidia-utils lib32-nvidia-utils
 	nvidia-xconfig
 elif lspci | grep 'VGA' | grep -E "Radeon|AMD"; then
     pacman -S --noconfirm --needed xf86-video-amdgpu
diff --git a/scripts/2-user.sh b/scripts/2-user.sh
index f534fc2..0953fdd 100755
--- a/scripts/2-user.sh
+++ b/scripts/2-user.sh
@@ -20,12 +20,12 @@ Installing AUR Softwares
 "
 source $HOME/ArchTitus/configs/setup.conf
 
-  cd ~
-  mkdir "/home/$USERNAME/.cache"
-  touch "/home/$USERNAME/.cache/zshhistory"
-  git clone "https://github.com/ChrisTitusTech/zsh"
-  git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
-  ln -s "~/zsh/.zshrc" ~/.zshrc
+  #cd ~
+  #mkdir "/home/$USERNAME/.cache"
+  #touch "/home/$USERNAME/.cache/zshhistory"
+  #git clone "https://github.com/ChrisTitusTech/zsh"
+  #git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
+  #ln -s "~/zsh/.zshrc" ~/.zshrc
 
 sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/${DESKTOP_ENV}.txt | while read line
 do
@@ -55,6 +55,15 @@ if [[ ! $AUR_HELPER == none ]]; then
     echo "INSTALLING: ${line}"
     $AUR_HELPER -S --noconfirm --needed ${line}
   done
+  sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/aur-pkgs-hypr.txt | while read line
+  do
+    if [[ ${line} == '--END OF MINIMAL INSTALL--' ]]; then
+      # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line
+      continue
+    fi
+    echo "INSTALLING: ${line}"
+    $AUR_HELPER -S --noconfirm --needed ${line}
+  done
 fi
 
 export PATH=$PATH:~/.local/bin

From b2315ea84b872d1da05dc1e95711f7872c46b6ab Mon Sep 17 00:00:00 2001
From: Ram Prasath S <ram97prasath@gmail.com>
Date: Mon, 13 Nov 2023 19:18:05 +0530
Subject: [PATCH 2/5] Fix syntax error

---
 scripts/3-post-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/3-post-setup.sh b/scripts/3-post-setup.sh
index 352e160..bb5030d 100755
--- a/scripts/3-post-setup.sh
+++ b/scripts/3-post-setup.sh
@@ -124,7 +124,7 @@ PLYMOUTH_THEME="arch-glow" # can grab from config later if we allow selection
 mkdir -p /usr/share/plymouth/themes
 echo 'Installing Plymouth theme...'
 cp -rf ${PLYMOUTH_THEMES_DIR}/${PLYMOUTH_THEME} /usr/share/plymouth/themes
-if  [[ $FS == "luks"]]; then
+if [[ $FS == "luks" ]]; then
   sed -i 's/HOOKS=(base udev*/& plymouth/' /etc/mkinitcpio.conf # add plymouth after base udev
   sed -i 's/HOOKS=(base udev \(.*block\) /&plymouth-/' /etc/mkinitcpio.conf # create plymouth-encrypt after block hook
 else

From f3bc8e23ce1abc9f42930742c83663d48aef03ba Mon Sep 17 00:00:00 2001
From: Ram Prasath S <ram97prasath@gmail.com>
Date: Mon, 13 Nov 2023 19:29:50 +0530
Subject: [PATCH 3/5] starting nm early doesn't work

---
 scripts/1-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/1-setup.sh b/scripts/1-setup.sh
index 4cc39c2..845e12d 100755
--- a/scripts/1-setup.sh
+++ b/scripts/1-setup.sh
@@ -23,7 +23,7 @@ echo -ne "
 -------------------------------------------------------------------------
 "
 pacman -S --noconfirm --needed networkmanager dhclient
-systemctl enable --now NetworkManager
+#systemctl enable --now NetworkManager
 echo -ne "
 -------------------------------------------------------------------------
                     Setting up mirrors for optimal download 

From d5150a16f5548767beaadde87cf1e717d085cebe Mon Sep 17 00:00:00 2001
From: Ram Prasath S <ram97prasath@gmail.com>
Date: Mon, 4 Dec 2023 00:40:31 +0530
Subject: [PATCH 4/5] Revert "starting nm early doesn't work"

This reverts commit f3bc8e23ce1abc9f42930742c83663d48aef03ba.
---
 scripts/1-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/1-setup.sh b/scripts/1-setup.sh
index 845e12d..4cc39c2 100755
--- a/scripts/1-setup.sh
+++ b/scripts/1-setup.sh
@@ -23,7 +23,7 @@ echo -ne "
 -------------------------------------------------------------------------
 "
 pacman -S --noconfirm --needed networkmanager dhclient
-#systemctl enable --now NetworkManager
+systemctl enable --now NetworkManager
 echo -ne "
 -------------------------------------------------------------------------
                     Setting up mirrors for optimal download 

From 544230b14f756ea2d8860d396dfb084b71c9f874 Mon Sep 17 00:00:00 2001
From: Ram Prasath S <ram97prasath@gmail.com>
Date: Mon, 4 Dec 2023 00:40:41 +0530
Subject: [PATCH 5/5] Revert "add more nvidia pkgs; remove steam, brave; fix
 pacman vs aur packages for hypr"

This reverts commit 2e6b3f5cc89ae5d82d8fc5ec86888a7a2d2c10dc.
---
 pkg-files/aur-pkgs-hypr.txt | 12 ------------
 pkg-files/aur-pkgs.txt      |  1 +
 pkg-files/hypr.txt          | 12 +++++++++++-
 pkg-files/pacman-pkgs.txt   |  1 +
 scripts/1-setup.sh          |  2 +-
 scripts/2-user.sh           | 21 ++++++---------------
 6 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 pkg-files/aur-pkgs-hypr.txt

diff --git a/pkg-files/aur-pkgs-hypr.txt b/pkg-files/aur-pkgs-hypr.txt
deleted file mode 100644
index 31bcd47..0000000
--- a/pkg-files/aur-pkgs-hypr.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-grimblast-git
-waybar-hyprland
-wlogout
-swaylock-effects
-sddm-git
-nwg-look-bin
-nordic-theme
-otf-sora
-ttf-comfortaa
-ttf-icomoon-feather
-hyprpicker-git
---END OF MINIMAL INSTALL--
diff --git a/pkg-files/aur-pkgs.txt b/pkg-files/aur-pkgs.txt
index 2834512..d7d5f81 100644
--- a/pkg-files/aur-pkgs.txt
+++ b/pkg-files/aur-pkgs.txt
@@ -1,5 +1,6 @@
 --END OF MINIMAL INSTALL--
 autojump
+brave-bin
 bridge-utils
 dxvk-bin
 github-desktop-bin
diff --git a/pkg-files/hypr.txt b/pkg-files/hypr.txt
index ab0b7f5..97c8bf9 100644
--- a/pkg-files/hypr.txt
+++ b/pkg-files/hypr.txt
@@ -10,24 +10,34 @@ starship
 wl-clipboard
 wf-recorder
 swaybg
+grimblast-git
 ffmpegthumbnailer
 tumbler
 playerctl
 noise-suppression-for-voice
 thunar-archive-plugin
 kitty
+waybar-hyprland
+wlogout
+swaylock-effects
+sddm-git
 pamixer
+nwg-look-bin
+nordic-theme
 papirus-icon-theme
 dunst
+otf-sora
 ttf-nerd-fonts-symbols-common
 otf-firamono-nerd
 inter-font
 ttf-fantasque-nerd
 noto-fonts
 noto-fonts-emoji
+ttf-comfortaa
 ttf-jetbrains-mono-nerd
+ttf-icomoon-feather
 ttf-iosevka-nerd
 adobe-source-code-pro-fonts
 brightnessctl
-xdg-desktop-portal-hyprland
+hyprpicker-git
 --END OF MINIMAL INSTALL--
diff --git a/pkg-files/pacman-pkgs.txt b/pkg-files/pacman-pkgs.txt
index eb7122a..b6dabe4 100644
--- a/pkg-files/pacman-pkgs.txt
+++ b/pkg-files/pacman-pkgs.txt
@@ -89,6 +89,7 @@ python-pip
 qemu
 snap-pac
 snapper
+steam
 swtpm
 synergy
 terminus-font
diff --git a/scripts/1-setup.sh b/scripts/1-setup.sh
index 4cc39c2..6ad2f93 100755
--- a/scripts/1-setup.sh
+++ b/scripts/1-setup.sh
@@ -114,7 +114,7 @@ echo -ne "
 # Graphics Drivers find and install
 gpu_type=$(lspci)
 if grep -E "NVIDIA|GeForce" <<< ${gpu_type}; then
-    pacman -S --noconfirm --needed nvidia nvidia-settings nvidia-utils lib32-nvidia-utils
+    pacman -S --noconfirm --needed nvidia
 	nvidia-xconfig
 elif lspci | grep 'VGA' | grep -E "Radeon|AMD"; then
     pacman -S --noconfirm --needed xf86-video-amdgpu
diff --git a/scripts/2-user.sh b/scripts/2-user.sh
index 0953fdd..f534fc2 100755
--- a/scripts/2-user.sh
+++ b/scripts/2-user.sh
@@ -20,12 +20,12 @@ Installing AUR Softwares
 "
 source $HOME/ArchTitus/configs/setup.conf
 
-  #cd ~
-  #mkdir "/home/$USERNAME/.cache"
-  #touch "/home/$USERNAME/.cache/zshhistory"
-  #git clone "https://github.com/ChrisTitusTech/zsh"
-  #git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
-  #ln -s "~/zsh/.zshrc" ~/.zshrc
+  cd ~
+  mkdir "/home/$USERNAME/.cache"
+  touch "/home/$USERNAME/.cache/zshhistory"
+  git clone "https://github.com/ChrisTitusTech/zsh"
+  git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
+  ln -s "~/zsh/.zshrc" ~/.zshrc
 
 sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/${DESKTOP_ENV}.txt | while read line
 do
@@ -55,15 +55,6 @@ if [[ ! $AUR_HELPER == none ]]; then
     echo "INSTALLING: ${line}"
     $AUR_HELPER -S --noconfirm --needed ${line}
   done
-  sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/aur-pkgs-hypr.txt | while read line
-  do
-    if [[ ${line} == '--END OF MINIMAL INSTALL--' ]]; then
-      # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line
-      continue
-    fi
-    echo "INSTALLING: ${line}"
-    $AUR_HELPER -S --noconfirm --needed ${line}
-  done
 fi
 
 export PATH=$PATH:~/.local/bin