Clean up

scripts/0-install.sh

@@ -49,7 +49,7 @@ esac
 # Generate a fstab file
 genfstab -U /mnt >> /mnt/etc/fstab
 # Copy system config files into the new install
-cp files/sys-pacman.conf /mnt/etc/pacman.conf.tmp
+#cp files/sys-pacman.conf /mnt/etc/pacman.conf.tmp
 #cp files/sys-locale.gen /mnt/etc/locale.gen
 cp files/sys-environment /mnt/etc/environment
 cp files/sys-grub /mnt/etc/default/grub
@@ -70,4 +70,32 @@ hwclock --systohc
 echo LANG=en_GB.UTF-8 > /etc/locale.conf
 echo "KEYMAP=uk" > /etc/vconsole.conf
 echo archlinux > /etc/hostname
-sh /buildscripts/1-root-config.sh
+# Add "chaotic-aur" as a Pacman repository
+pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+pacman-key --lsign-key 3056513887B78AEB
+pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
+pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
+# Amend pacman.conf
+sed -i 's/^#Color/Color\nILoveCandy/' /etc/pacman.conf
+sed -i 's/^#ParallelDownloads/ParallelDownloads/' /etc/pacman.conf
+sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf
+echo "[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist" >> /etc/pacman.conf
+# Run full pacman sync to enable extra repos
+pacman -Syu
+# Enable NetworkManager
+systemctl enable NetworkManager
+# Install GRUB (this will need to be run again as the standard user in order to detect Windows)
+echo "Installing bootloader"
+grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=GRUB
+grub-mkconfig -o /boot/grub/grub.cfg
+# Create the standard user and add it to all neccesary groups
+useradd -mG power,storage,wheel $username
+echo "$username:$password" | chpasswd
+# Set up sudo
+sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
+# Disable the root account
+passwd --lock root
+# Required to enable network changes
+sysctl --system
+# Prompt the user to reboot
+echo "Install complete, please reboot"

scripts/1-root-config.sh

@@ -1,16 +1,16 @@
 #!/bin/sh
 
 # Add "chaotic-aur" as a Pacman repository
-pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
-pacman-key --lsign-key 3056513887B78AEB
-pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
-pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
+#pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+#pacman-key --lsign-key 3056513887B78AEB
+#pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
+#pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
 # Replace pacman.conf with the one installed from the earlier script
-mv /etc/pacman.conf.tmp /etc/pacman.conf
+#mv /etc/pacman.conf.tmp /etc/pacman.conf
 # Run full pacman sync
-pacman -Syu
+#pacman -Syu
 # Enable NetworkManager
-systemctl enable NetworkManager
+#systemctl enable NetworkManager
 # Set up system locale
 # pacman -S --noconfirm hunspell-en_gb
 # ln -sf /usr/share/zoneinfo/Europe/London /etc/localtime
@@ -21,18 +21,18 @@ systemctl enable NetworkManager
 # Set the hostname of the system
 #echo archlinux > /etc/hostname
 # Install GRUB (this will need to be run again as the standard user in order to detect Windows)
-echo "Installing bootloader"
-grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=GRUB
-grub-mkconfig -o /boot/grub/grub.cfg
+#echo "Installing bootloader"
+#grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=GRUB
+#grub-mkconfig -o /boot/grub/grub.cfg
 # Create the standard user and add it to all neccesary groups
-read -p 'Please type in a username for the standard user account: ' user
-useradd -mG power,storage,wheel $user
+#read -p 'Please type in a username for the standard user account: ' user
+#useradd -mG power,storage,wheel $user
 # Set the password for the standard user
-passwd $user
+#passwd $user
 # Amend visudo (See ToDo)
-EDITOR=nano visudo
+#EDITOR=nano visudo
 # Disable the root account
-passwd --lock root
+#passwd --lock root
 # Install NVIDIA driver
 echo "Installing GPU drivers"
 pacman -S --noconfirm nvidia-dkms nvidia-utils lib32-nvidia-utils nvidia-settings