From 06ce4ed3aabcf62a8f2d35e7d85109ccf11aace5 Mon Sep 17 00:00:00 2001
From: Chris Titus <dfm.titus@gmail.com>
Date: Wed, 27 Oct 2021 16:56:37 -0700
Subject: [PATCH 1/8] grub install

---
 0-preinstall.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/0-preinstall.sh b/0-preinstall.sh
index a1a9875..f4fab85 100644
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -104,11 +104,11 @@ fi
 echo "--------------------------------------"
 echo "-- Arch Install on Main Drive       --"
 echo "--------------------------------------"
-pacstrap /mnt base base-devel linux-hardened linux-firmware vim nano sudo archlinux-keyring wget libnewt --noconfirm --needed
+pacstrap /mnt base base-devel linux linux-firmware vim nano sudo archlinux-keyring wget libnewt --noconfirm --needed
 genfstab -U /mnt >> /mnt/etc/fstab
 echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf
 echo "--------------------------------------"
-echo "-- GRUB Bootloader Installation     --"
+echo "-- Bootloader Systemd Installation  --"
 echo "--------------------------------------"
 if [[ ! -d "/sys/firmware/efi" ]]; then
     grub-install --boot-directory=/mnt/boot ${DISK}
@@ -116,12 +116,14 @@ else
     grub-install --efi-directory=/mnt/boot ${DISK}
 fi
 
-#sudo cp /boot/loader/entries/arch.conf /boot/loader/entries/arch-hardened.conf
-#sudo sed -i 's|Arch Linux|Arch Linux Hardened Kernel|g' /boot/loader/entries/arch-hardened.conf
-#sudo sed -i 's|vmlinuz-linux-hardened|vmlinuz-linux-lts|g' /boot/loader/entries/arch-hardened.conf
-#sudo sed -i 's|initramfs-linux.img|initramfs-linux-hardened.img|g' /boot/loader/entries/arch-hardened.conf
-
 cp -R ${SCRIPT_DIR} /mnt/root/BetterArch
+bootctl install --esp-path=/mnt/boot
+if [[ ! -d "/sys/firmware/efi" ]]; then
+    grub-install --boot-directory=/mnt/boot ${DISK}
+else
+    grub-install --efi-directory=/mnt/boot ${DISK}
+fi
+cp -R ${SCRIPT_DIR} /mnt/root/ArchTitus
 cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
 echo "--------------------------------------"
 echo "-- Check for low memory systems <8G --"

From 6b9e176800e612e42184d7e57da3bef02c7d9189 Mon Sep 17 00:00:00 2001
From: Chris Titus <dfm.titus@gmail.com>
Date: Fri, 29 Oct 2021 20:36:51 -0700
Subject: [PATCH 2/8] Update 1-setup.sh

---
 1-setup.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/1-setup.sh b/1-setup.sh
index 41224b7..05edb0b 100644
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -116,7 +116,6 @@ PKGS=(
 'gcc'
 'gimp' # Photo editing
 'git'
-'gitkraken'
 'gparted' # partition management
 'gptfdisk'
 'grub'
@@ -124,7 +123,6 @@ PKGS=(
 'gst-libav'
 'gst-plugins-good'
 'gst-plugins-ugly'
-'gwenview'
 'haveged'
 'htop'
 'iptables-nft'
@@ -171,6 +169,7 @@ PKGS=(
 'pkgconf'
 'plasma-nm'
 'powerdevil'
+'plasma-nm'
 'powerline-fonts'
 'print-manager'
 'pulseaudio'
@@ -201,7 +200,6 @@ PKGS=(
 'vim'
 'virt-manager'
 'virt-viewer'
-'vlc'
 'wget'
 'which'
 'wine-gecko'
@@ -210,7 +208,6 @@ PKGS=(
 'xdg-desktop-portal-kde'
 'xdg-user-dirs'
 'zeroconf-ioslave'
-'zulucrypt'
 'zip'
 'zsh'
 'zsh-syntax-highlighting'

From 5967e4a6f35c73ce7eb714203ccf42e929daa037 Mon Sep 17 00:00:00 2001
From: Chris Titus <dfm.titus@gmail.com>
Date: Fri, 29 Oct 2021 23:20:32 -0700
Subject: [PATCH 3/8] efi and pkg update

---
 0-preinstall.sh | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/0-preinstall.sh b/0-preinstall.sh
index f4fab85..0eff65d 100644
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -57,6 +57,16 @@ sgdisk -Z ${DISK} # zap all on disk
 sgdisk -a 2048 -o ${DISK} # new gpt disk 2048 alignment
 
 # create partitions
+sgdisk -n 1:0:+100M ${DISK} # partition 1 (UEFI SYS), default start block, 512MB
+sgdisk -n 2:0:0     ${DISK} # partition 2 (Root), default start, remaining
+
+# set partition types
+sgdisk -t 1:ef00 ${DISK}
+sgdisk -t 2:8300 ${DISK}
+
+# label partitions
+sgdisk -c 1:"UEFISYS" ${DISK}
+sgdisk -c 2:"ROOT" ${DISK}
 sgdisk -n 1::+1M --typecode=1:ef02 --change-name=1:'BIOSBOOT' ${DISK} # partition 1 (BIOS Boot Partition)
 sgdisk -n 2::+100M --typecode=2:ef00 --change-name=2:'EFIBOOT' ${DISK} # partition 2 (UEFI Boot Partition)
 sgdisk -n 3::-0 --typecode=3:8300 --change-name=3:'ROOT' ${DISK} # partition 3 (Root), default start, remaining
@@ -107,24 +117,15 @@ echo "--------------------------------------"
 pacstrap /mnt base base-devel linux linux-firmware vim nano sudo archlinux-keyring wget libnewt --noconfirm --needed
 genfstab -U /mnt >> /mnt/etc/fstab
 echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf
-echo "--------------------------------------"
-echo "-- Bootloader Systemd Installation  --"
-echo "--------------------------------------"
-if [[ ! -d "/sys/firmware/efi" ]]; then
-    grub-install --boot-directory=/mnt/boot ${DISK}
-else
-    grub-install --efi-directory=/mnt/boot ${DISK}
-fi
-
 cp -R ${SCRIPT_DIR} /mnt/root/BetterArch
-bootctl install --esp-path=/mnt/boot
+cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
+
+echo "--------------------------------------"
+echo "-- GRUB Bootloader Installation     --"
+echo "--------------------------------------"
 if [[ ! -d "/sys/firmware/efi" ]]; then
     grub-install --boot-directory=/mnt/boot ${DISK}
-else
-    grub-install --efi-directory=/mnt/boot ${DISK}
 fi
-cp -R ${SCRIPT_DIR} /mnt/root/ArchTitus
-cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
 echo "--------------------------------------"
 echo "-- Check for low memory systems <8G --"
 echo "--------------------------------------"

From bcceaf33e02cd49ea7c62c5013a0b1082a17a8c0 Mon Sep 17 00:00:00 2001
From: Chris Titus <dfm.titus@gmail.com>
Date: Sat, 30 Oct 2021 10:20:33 -0700
Subject: [PATCH 4/8] Fixes

---
 0-preinstall.sh | 18 +++++++-----------
 1-setup.sh      |  8 ++++----
 3-post-setup.sh |  7 ++++++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/0-preinstall.sh b/0-preinstall.sh
index 0eff65d..9740fba 100644
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -57,16 +57,6 @@ sgdisk -Z ${DISK} # zap all on disk
 sgdisk -a 2048 -o ${DISK} # new gpt disk 2048 alignment
 
 # create partitions
-sgdisk -n 1:0:+100M ${DISK} # partition 1 (UEFI SYS), default start block, 512MB
-sgdisk -n 2:0:0     ${DISK} # partition 2 (Root), default start, remaining
-
-# set partition types
-sgdisk -t 1:ef00 ${DISK}
-sgdisk -t 2:8300 ${DISK}
-
-# label partitions
-sgdisk -c 1:"UEFISYS" ${DISK}
-sgdisk -c 2:"ROOT" ${DISK}
 sgdisk -n 1::+1M --typecode=1:ef02 --change-name=1:'BIOSBOOT' ${DISK} # partition 1 (BIOS Boot Partition)
 sgdisk -n 2::+100M --typecode=2:ef00 --change-name=2:'EFIBOOT' ${DISK} # partition 2 (UEFI Boot Partition)
 sgdisk -n 3::-0 --typecode=3:8300 --change-name=3:'ROOT' ${DISK} # partition 3 (Root), default start, remaining
@@ -114,11 +104,17 @@ fi
 echo "--------------------------------------"
 echo "-- Arch Install on Main Drive       --"
 echo "--------------------------------------"
-pacstrap /mnt base base-devel linux linux-firmware vim nano sudo archlinux-keyring wget libnewt --noconfirm --needed
+pacstrap /mnt base base-devel linux-hardened linux-firmware vim nano sudo archlinux-keyring wget libnewt --noconfirm --needed
 genfstab -U /mnt >> /mnt/etc/fstab
 echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf
 cp -R ${SCRIPT_DIR} /mnt/root/BetterArch
 cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
+echo "--------------------------------------"
+echo "--GRUB BIOS Bootloader Install&Check--"
+echo "--------------------------------------"
+if [[ ! -d "/sys/firmware/efi" ]]; then
+    grub-install --boot-directory=/mnt/boot ${DISK}
+fi
 
 echo "--------------------------------------"
 echo "-- GRUB Bootloader Installation     --"
diff --git a/1-setup.sh b/1-setup.sh
index 05edb0b..7c5e758 100644
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -130,11 +130,10 @@ PKGS=(
 'kate'
 'kcodecs'
 'kcoreaddons'
-'kde-plasma-addons'
-'kinfocenter'
-'kscreen'
-'kvantum-qt5'
+'kdeplasma-addons'
 'kde-gtk-config'
+'kinfocenter'
+'kvantum-qt5'
 'kitty'
 'konsole'
 'kscreen'
@@ -167,6 +166,7 @@ PKGS=(
 'patch'
 'picom'
 'pkgconf'
+'plasma-meta'
 'plasma-nm'
 'powerdevil'
 'plasma-nm'
diff --git a/3-post-setup.sh b/3-post-setup.sh
index a9e2567..6d65344 100644
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -12,8 +12,13 @@
 #------------------------------------------------------------------------------------
 echo -e "\nFINAL SETUP AND CONFIGURATION"
 
+echo "--------------------------------------"
+echo "-- GRUB EFI Bootloader Install&Check--"
+echo "--------------------------------------"
+if [[ -d "/sys/firmware/efi" ]]; then
+    grub-install --efi-directory=/boot ${DISK}
+fi
 grub-mkconfig -o /boot/grub/grub.cfg
-
 # ------------------------------------------------------------------------
 
 echo -e "\nEnabling Login Display Manager"

From c0718d0f55b280b03d680bf074199a7865c80af8 Mon Sep 17 00:00:00 2001
From: 71Zombie <76274154+71Zombie@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:28:41 -0800
Subject: [PATCH 5/8] Fixes

---
 1-setup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/1-setup.sh b/1-setup.sh
index 7c5e758..e3ef9ff 100644
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -200,6 +200,7 @@ PKGS=(
 'vim'
 'virt-manager'
 'virt-viewer'
+'vlc'
 'wget'
 'which'
 'wine-gecko'
@@ -208,6 +209,7 @@ PKGS=(
 'xdg-desktop-portal-kde'
 'xdg-user-dirs'
 'zeroconf-ioslave'
+'zulucrypt'
 'zip'
 'zsh'
 'zsh-syntax-highlighting'

From 1c3c39850bd7322f775b01a5c866e63b4f5da563 Mon Sep 17 00:00:00 2001
From: 71Zombie <76274154+71Zombie@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:32:11 -0800
Subject: [PATCH 6/8] Repository fix

---
 4-pen-tools.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/4-pen-tools.sh b/4-pen-tools.sh
index 1679487..6ff2580 100644
--- a/4-pen-tools.sh
+++ b/4-pen-tools.sh
@@ -19,6 +19,7 @@ mkdir $HOME/blackarch
 cp /root/BetterArch/dotfiles/blackarch/strap.sh $HOME/blackarch
 cd $HOME/blackarch
 chmod +x strap.sh
+sudo bash strap.sh
 sudo pacman -Syu
 
 PKGS=(
@@ -54,7 +55,7 @@ PKGS=(
 
 for PKG in "${PKGS[@]}"; do
     echo "INSTALLING: ${PKG}"
-    sudo blackman -i "$PKG"
+    sudo pacman -Sy "$PKG"
 done
 
 

From 2f8c55a4df22c5e4f4e840b55fea1f6da91a4089 Mon Sep 17 00:00:00 2001
From: 71Zombie <76274154+71Zombie@users.noreply.github.com>
Date: Tue, 9 Nov 2021 17:17:19 -0800
Subject: [PATCH 7/8] Auto installation

---
 4-pen-tools.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/4-pen-tools.sh b/4-pen-tools.sh
index 6ff2580..8536244 100644
--- a/4-pen-tools.sh
+++ b/4-pen-tools.sh
@@ -13,7 +13,7 @@
 
 echo -e "\nFINAL SETUP AND CONFIGURATION\n"
 
-ehco -e"\nInstalling black arch repository\n"
+echo -e"\nInstalling black arch repository\n"
 
 mkdir $HOME/blackarch
 cp /root/BetterArch/dotfiles/blackarch/strap.sh $HOME/blackarch
@@ -55,7 +55,7 @@ PKGS=(
 
 for PKG in "${PKGS[@]}"; do
     echo "INSTALLING: ${PKG}"
-    sudo pacman -Sy "$PKG"
+    sudo pacman -S "$PKG" --noconfirm --needed
 done
 
 

From 1a614411522bb0d4342999a793d2e737acfec191 Mon Sep 17 00:00:00 2001
From: 71Zombie <76274154+71Zombie@users.noreply.github.com>
Date: Tue, 9 Nov 2021 17:29:16 -0800
Subject: [PATCH 8/8] Chromium alert

---
 2-user.sh      | 5 ++---
 4-pen-tools.sh | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/2-user.sh b/2-user.sh
index 68864f5..3b63396 100755
--- a/2-user.sh
+++ b/2-user.sh
@@ -24,7 +24,7 @@ touch "$HOME/.cache/zshhistory"
 git clone "https://github.com/ChrisTitusTech/zsh"
 git clone --depth=1 https://github.com/romkatv/powerlevel10k.git $HOME/powerlevel10k
 ln -s "$HOME/zsh/.zshrc" $HOME/.zshrc
-
+echo "If chromium takes too long to install, you may CTRL-C to cancel it."
 PKGS=(
 'autojump'
 'awesome-terminal-fonts'
@@ -48,14 +48,13 @@ PKGS=(
 'pidgin'
 'plasma-pa'
 'ocs-url' # install packages from websites
-'ungoogled-chromium'
+#'ungoogled-chromium'
 'sddm-nordic-theme-git'
 'snapper-gui-git'
 'ttf-droid'
 'ttf-hack'
 'ttf-meslo' # Nerdfont package
 'ttf-roboto'
-'zoom' # video conferences
 'snap-pac'
 'youtube-dl-gui-git'
 )
diff --git a/4-pen-tools.sh b/4-pen-tools.sh
index 8536244..46b2148 100644
--- a/4-pen-tools.sh
+++ b/4-pen-tools.sh
@@ -44,7 +44,6 @@ PKGS=(
 'gitrob'
 'gittools'
 #----------------#
-
 'metasploit' # Exploit
 'nmap' # Network scanning
 'sherlock-git'