Merge branch 'main' of https://github.com/71Zombie/BetterArch

0-preinstall.sh

@@ -107,22 +107,21 @@ echo "--------------------------------------"
 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     --"
 echo "--------------------------------------"
 if [[ ! -d "/sys/firmware/efi" ]]; then
     grub-install --boot-directory=/mnt/boot ${DISK}
-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
-cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
 echo "--------------------------------------"
 echo "-- Check for low memory systems <8G --"
 echo "--------------------------------------"

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'
@@ -132,11 +130,10 @@ PKGS=(
 'kate'
 'kcodecs'
 'kcoreaddons'
-'kde-plasma-addons'
+'kdeplasma-addons'
-'kinfocenter'
-'kscreen'
-'kvantum-qt5'
 'kde-gtk-config'
+'kinfocenter'
+'kvantum-qt5'
 'kitty'
 'konsole'
 'kscreen'
@@ -169,8 +166,10 @@ PKGS=(
 'patch'
 'picom'
 'pkgconf'
+'plasma-meta'
 'plasma-nm'
 'powerdevil'
+'plasma-nm'
 'powerline-fonts'
 'print-manager'
 'pulseaudio'

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'
 )

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"

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
@@ -44,7 +44,6 @@ PKGS=(
 'gitrob'
 'gittools'
 #----------------#
-
 'metasploit' # Exploit
 'nmap' # Network scanning
 'sherlock-git'
@@ -55,7 +54,7 @@ PKGS=(
 
 for PKG in "${PKGS[@]}"; do
     echo "INSTALLING: ${PKG}"
-    sudo pacman -Sy "$PKG"
+    sudo pacman -S "$PKG" --noconfirm --needed
 done