Compare commits

..

No commits in common. "0495a69b7be2485eda6dcd006df25e9772fc3e97" and "78e0b2ce3eb497a1aaaba5edfa2232542031523c" have entirely different histories.

2 changed files with 17 additions and 45 deletions

View File

@ -49,7 +49,7 @@ esac
# Generate a fstab file # Generate a fstab file
genfstab -U /mnt >> /mnt/etc/fstab genfstab -U /mnt >> /mnt/etc/fstab
# Copy system config files into the new install # 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-locale.gen /mnt/etc/locale.gen
cp files/sys-environment /mnt/etc/environment cp files/sys-environment /mnt/etc/environment
cp files/sys-grub /mnt/etc/default/grub cp files/sys-grub /mnt/etc/default/grub
@ -70,32 +70,4 @@ hwclock --systohc
echo LANG=en_GB.UTF-8 > /etc/locale.conf echo LANG=en_GB.UTF-8 > /etc/locale.conf
echo "KEYMAP=uk" > /etc/vconsole.conf echo "KEYMAP=uk" > /etc/vconsole.conf
echo archlinux > /etc/hostname echo archlinux > /etc/hostname
# Add "chaotic-aur" as a Pacman repository sh /buildscripts/1-root-config.sh
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"

View File

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