Added gitignore, better package installing organisation

2 files changed, 104 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2379478
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,69 @@
+# Created by https://www.gitignore.io/api/linux,emacs
+# Edit at https://www.gitignore.io/?templates=linux,emacs
+
+### Emacs ###
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el
+
+# network security
+/network-security.data
+
+
+### Linux ###
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# End of https://www.gitignore.io/api/linux,emacs
\ No newline at end of file
diff --git a/joes-arch-install-UEFI.sh b/joes-arch-install-UEFI.sh
index 255478e..9de0d19 100755
--- a/joes-arch-install-UEFI.sh
+++ b/joes-arch-install-UEFI.sh
@@ -484,9 +484,37 @@ echo "\
 #=================================#"
 pacstrap /mnt/arch base base-devel pacman-contrib
 echo && echo
-echo "Base packages installed."
+echo -e "${BGREEN}Base packages installed."
 sleep 1
 clear
+echo -e "\
+#====== IV. INSTALLING LINUX =====#
+#                                 #
+#     4.5. Installing useful      #
+#            packages             #
+#                                 #
+#=================================#"
+pacstrap /mnt/arch zip
+pacstrap /mnt/arch unzip
+pacstrap /mnt/arch p7zip
+pacstrap /mnt/arch vim
+pacstrap /mnt/arch mc
+pacstrap /mnt/arch alsa-utils
+pacstrap /mnt/arch syslog-ng
+pacstrap /mnt/arch mtools
+pacstrap /mnt/arch lsb-release
+pacstrap /mnt/arch ntfs-3g
+pacstrap /mnt/arch exfat-utils
+pacstrap /mnt/arch git
+pacstrap /mnt/arch zsh
+pacstrap /mnt/arch ntp
+pacstrap /mnt/arch cronie
+pacstrap /mnt/arch grub
+pacstrap /mnt/arch os-prober
+pacstrap /mnt/arch efibootmgr
+sleep 1
+clear
+echo -e "${BGREEN}Extra packages installed."
 echo "\
 #====== IV. INSTALLING LINUX =====#
 #                                 #
@@ -496,12 +524,13 @@ echo "\
 genfstab -U -p /mnt/arch > /mnt/arch/etc/fstab
 sleep 2
 clear
-echo "\
+echo -e "${BMAGENTA}\
 #====== V. CONFIGURING LINUX =====#
 #                                 #
 #      1. Now changing root       #
 #                                 #
-#=================================#"
+#=================================#${END}"
+echo -e "${BBLUE}"
 sleep 2
 arch-chroot /mnt/arch << ARCH_CHROOT
 	clear
@@ -567,7 +596,7 @@ arch-chroot /mnt/arch << ARCH_CHROOT
 	#     7. Setting up network       #
 	#                                 #
 	#=================================#
-	pacman -S networkmanager grub os-prober efibootmgr
+	pacman -S networkmanager
 	Y
 ARCH_CHROOT
 arch-chroot /mnt/arch << ARCH_CHROOT
@@ -584,13 +613,6 @@ arch-chroot /mnt/arch << ARCH_CHROOT
 	sleep 2
 ARCH_CHROOT
 arch-chroot /mnt/arch << ARCH_CHROOT
-	clear
-	#===== V. CONFIGURING LINUX ======#
-	#                                 #
-	#   9. Installing useful packages #
-	#                                 #
-	#=================================#
-	pacman -S zip unzip p7zip vim mc alsa-utils syslog-ng mtools dostools lsb-release ntfs-3g exfat-utils git zsh ntp cronie
 	sleep 2
 ARCH_CHROOT
 if [[ $somemore == "true" ]]; then
@@ -702,7 +724,7 @@ arch-chroot /mnt/arch << ARCH_CHROOT
 ARCH_CHROOT
 echo && echo
 clear
-echo "\
+echo -e "${BMAGENTA}\
 #========= WORK COMPLETE =========#
 #                                 #
 #     Your system should now      #
@@ -713,7 +735,7 @@ echo "\
 #                                 #
 #   Your system will now reboot   #
 #                                 #
-#=================================#"
+#=================================#${END}"
 echo && echo
 sleep 10
 umount -R /mnt/arch