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] 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"