From 709b93ccec9102cd5dffb167669913af04185700 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Tue, 26 Oct 2021 19:35:18 -0500 Subject: [PATCH 1/8] Update 3-post-setup.sh sudo not needed --- 3-post-setup.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/3-post-setup.sh b/3-post-setup.sh index 12c73f4..1b63457 100755 --- a/3-post-setup.sh +++ b/3-post-setup.sh @@ -14,11 +14,11 @@ echo -e "\nFINAL SETUP AND CONFIGURATION" echo -e "\nEnabling Login Display Manager" -sudo systemctl enable sddm.service +systemctl enable sddm.service echo -e "\nSetup SDDM Theme" -sudo cat < /etc/sddm.conf +cat < /etc/sddm.conf [Theme] Current=Nordic EOF @@ -28,12 +28,12 @@ EOF echo -e "\nEnabling essential services" systemctl enable cups.service -sudo ntpd -qg -sudo systemctl enable ntpd.service -sudo systemctl disable dhcpcd.service -sudo systemctl stop dhcpcd.service -sudo systemctl enable NetworkManager.service -sudo systemctl enable bluetooth +ntpd -qg +systemctl enable ntpd.service +systemctl disable dhcpcd.service +systemctl stop dhcpcd.service +systemctl enable NetworkManager.service +systemctl enable bluetooth echo " ############################################################################### # Cleaning From 1d66ca76657aa8b4c6db0c54b4c9a0e0130c1678 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Tue, 26 Oct 2021 19:40:00 -0500 Subject: [PATCH 2/8] missing packages --- 1-setup.sh | 16 ++++++++++++++++ 2-user.sh | 1 + 2 files changed, 17 insertions(+) diff --git a/1-setup.sh b/1-setup.sh index c2ebd88..6eb8037 100755 --- a/1-setup.sh +++ b/1-setup.sh @@ -78,6 +78,7 @@ PKGS=( 'bluedevil' 'bluez' 'bluez-libs' +'bluez-utils' 'breeze' 'breeze-gtk' 'bridge-utils' @@ -91,9 +92,12 @@ PKGS=( 'discover' 'dolphin' 'dosfstools' +'dtc' 'efibootmgr' # EFI boot 'egl-wayland' 'exfat-utils' +'extra-cmake-modules' +'filelite' 'flex' 'fuse2' 'fuse3' @@ -109,16 +113,23 @@ PKGS=( 'gst-libav' 'gst-plugins-good' 'gst-plugins-ugly' +'gwenview' 'haveged' 'htop' 'iptables-nft' 'jdk-openjdk' # Java 17 'kate' +'kcodecs' +'kcoreaddons' +'kde-plasma-addons' +'kinfocenter' +'kscreen' 'kvantum-qt5' 'kde-gtk-config' 'kitty' 'konsole' 'layer-shell-qt' +'libdvdcss' 'libnewt' 'libtool' 'linux' @@ -144,11 +155,16 @@ PKGS=( 'patch' 'picom' 'pkgconf' +'plasma-nm' +'powerdevil' 'powerline-fonts' 'print-manager' 'pulseaudio' 'pulseaudio-alsa' 'pulseaudio-bluetooth' +'python-notify2' +'python-psutil' +'python-pyqt5' 'python-pip' 'qemu' 'rsync' diff --git a/2-user.sh b/2-user.sh index 4fe3e47..719d884 100755 --- a/2-user.sh +++ b/2-user.sh @@ -29,6 +29,7 @@ PKGS=( 'dxvk-bin' # DXVK DirectX to Vulcan 'github-desktop-bin' # Github Desktop sync 'lightly-git' +'lightlyshaders-git' 'mangohud' # Gaming FPS Counter 'mangohud-common' 'nerd-fonts-fira-code' From 8a59f337ea81d155824d2f28b4863ed74be12f05 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Wed, 27 Oct 2021 18:56:37 -0500 Subject: [PATCH 3/8] grub install --- 0-preinstall.sh | 14 ++++++-------- 3-post-setup.sh | 5 ++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/0-preinstall.sh b/0-preinstall.sh index b01f2d0..1ef4d2e 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -112,16 +112,14 @@ pacstrap /mnt base base-devel linux linux-firmware vim nano sudo archlinux-keyri genfstab -U /mnt >> /mnt/etc/fstab echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf echo "--------------------------------------" -echo "-- Bootloader Systemd Installation --" +echo "-- GRUB Bootloader Installation --" echo "--------------------------------------" bootctl install --esp-path=/mnt/boot -[ ! -d "/mnt/boot/loader/entries" ] && mkdir -p /mnt/boot/loader/entries -cat < /mnt/boot/loader/entries/arch.conf -title Arch Linux -linux /vmlinuz-linux -initrd /initramfs-linux.img -options root=LABEL=ROOT rw rootflags=subvol=@ -EOF +if [[ ! -d "/sys/firmware/efi" ]]; then + grub-install --boot-directory=/mnt/boot ${DISK} +else + grub-install --efi-directory=/mnt/boot ${DISK} +fi cp -R ${SCRIPT_DIR} /mnt/root/ArchTitus cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist echo "--------------------------------------" diff --git a/3-post-setup.sh b/3-post-setup.sh index 1b63457..a550d20 100755 --- a/3-post-setup.sh +++ b/3-post-setup.sh @@ -10,14 +10,13 @@ echo -e "\nFINAL SETUP AND CONFIGURATION" +grub-mkconfig -o /boot/grub/grub.cfg + # ------------------------------------------------------------------------ echo -e "\nEnabling Login Display Manager" - systemctl enable sddm.service - echo -e "\nSetup SDDM Theme" - cat < /etc/sddm.conf [Theme] Current=Nordic From 8caf7c29f37df5bfb6675caaaf033609bdc9e19a Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Sat, 30 Oct 2021 01:20:32 -0500 Subject: [PATCH 4/8] efi and pkg update --- 0-preinstall.sh | 2 +- 1-setup.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/0-preinstall.sh b/0-preinstall.sh index 1ef4d2e..4b3bd28 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -57,7 +57,7 @@ sgdisk -Z ${DISK} # zap all on disk sgdisk -a 2048 -o ${DISK} # new gpt disk 2048 alignment # create partitions -sgdisk -n 1:0:+1000M ${DISK} # partition 1 (UEFI SYS), default start block, 512MB +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 diff --git a/1-setup.sh b/1-setup.sh index 6eb8037..b4bc4f4 100755 --- a/1-setup.sh +++ b/1-setup.sh @@ -128,6 +128,7 @@ PKGS=( 'kde-gtk-config' 'kitty' 'konsole' +'kscreen' 'layer-shell-qt' 'libdvdcss' 'libnewt' From 7b428b8e0ad4e234ae4a3abead864fe9e7b33aeb Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Sat, 30 Oct 2021 12:20:33 -0500 Subject: [PATCH 5/8] Add Legacy Boot --- 0-preinstall.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/0-preinstall.sh b/0-preinstall.sh index 4b3bd28..e1b0a98 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -63,19 +63,21 @@ 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} - +if [[ ! -d "/sys/firmware/efi" ]]; then + sgdisk -A 1:set:2 ${DISK} +fi # label partitions -sgdisk -c 1:"UEFISYS" ${DISK} +sgdisk -c 1:"BOOT" ${DISK} sgdisk -c 2:"ROOT" ${DISK} # make filesystems echo -e "\nCreating Filesystems...\n$HR" if [[ ${DISK} =~ "nvme" ]]; then -mkfs.vfat -F32 -n "UEFISYS" "${DISK}p1" +mkfs.vfat -F32 -n "BOOT" "${DISK}p1" mkfs.btrfs -L "ROOT" "${DISK}p2" -f mount -t btrfs "${DISK}p2" /mnt else -mkfs.vfat -F32 -n "UEFISYS" "${DISK}1" +mkfs.vfat -F32 -n "BOOT" "${DISK}1" mkfs.btrfs -L "ROOT" "${DISK}2" -f mount -t btrfs "${DISK}2" /mnt fi @@ -95,7 +97,7 @@ esac mount -t btrfs -o subvol=@ -L ROOT /mnt mkdir /mnt/boot mkdir /mnt/boot/efi -mount -t vfat -L UEFISYS /mnt/boot/ +mount -t vfat -L BOOT /mnt/boot/ if ! grep -qs '/mnt' /proc/mounts; then echo "Drive is not mounted can not continue" @@ -105,6 +107,10 @@ if ! grep -qs '/mnt' /proc/mounts; then reboot now fi +if [[ ! -d "/sys/firmware/efi" ]]; then + dd bs=440 count=1 conv=notrunc if=/usr/lib/syslinux/bios/gptmbr.bin of=${DISK} + extlinux --install /mnt/boot +fi echo "--------------------------------------" echo "-- Arch Install on Main Drive --" echo "--------------------------------------" @@ -114,7 +120,6 @@ echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf echo "--------------------------------------" echo "-- GRUB Bootloader Installation --" echo "--------------------------------------" -bootctl install --esp-path=/mnt/boot if [[ ! -d "/sys/firmware/efi" ]]; then grub-install --boot-directory=/mnt/boot ${DISK} else From 3dc0eca501ad0fa215cef0b038c6e7e24088b1c6 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Sat, 30 Oct 2021 12:44:50 -0500 Subject: [PATCH 6/8] Legacy+EFI Boot --- 0-preinstall.sh | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/0-preinstall.sh b/0-preinstall.sh index e1b0a98..98c95d6 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -16,7 +16,7 @@ timedatectl set-ntp true pacman -S --noconfirm pacman-contrib terminus-font setfont ter-v22b sed -i 's/^#Para/Para/' /etc/pacman.conf -pacman -S --noconfirm reflector rsync +pacman -S --noconfirm reflector rsync grub mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup echo -e "-------------------------------------------------------------------------" echo -e " █████╗ ██████╗ ██████╗██╗ ██╗████████╗██╗████████╗██╗ ██╗███████╗" @@ -53,31 +53,24 @@ echo "--------------------------------------" # disk prep sgdisk -Z ${DISK} # zap all on disk -#dd if=/dev/zero of=${DISK} bs=1M count=200 conv=fdatasync status=progress 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} +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 if [[ ! -d "/sys/firmware/efi" ]]; then sgdisk -A 1:set:2 ${DISK} fi -# label partitions -sgdisk -c 1:"BOOT" ${DISK} -sgdisk -c 2:"ROOT" ${DISK} # make filesystems echo -e "\nCreating Filesystems...\n$HR" if [[ ${DISK} =~ "nvme" ]]; then -mkfs.vfat -F32 -n "BOOT" "${DISK}p1" +mkfs.vfat -F32 -n "EFIBOOT" "${DISK}p1" mkfs.btrfs -L "ROOT" "${DISK}p2" -f mount -t btrfs "${DISK}p2" /mnt else -mkfs.vfat -F32 -n "BOOT" "${DISK}1" +mkfs.vfat -F32 -n "EFIBOOT" "${DISK}1" mkfs.btrfs -L "ROOT" "${DISK}2" -f mount -t btrfs "${DISK}2" /mnt fi @@ -97,7 +90,7 @@ esac mount -t btrfs -o subvol=@ -L ROOT /mnt mkdir /mnt/boot mkdir /mnt/boot/efi -mount -t vfat -L BOOT /mnt/boot/ +mount -t vfat -L EFIBOOT /mnt/boot/ if ! grep -qs '/mnt' /proc/mounts; then echo "Drive is not mounted can not continue" @@ -107,10 +100,10 @@ if ! grep -qs '/mnt' /proc/mounts; then reboot now fi -if [[ ! -d "/sys/firmware/efi" ]]; then - dd bs=440 count=1 conv=notrunc if=/usr/lib/syslinux/bios/gptmbr.bin of=${DISK} - extlinux --install /mnt/boot -fi +#if [[ ! -d "/sys/firmware/efi" ]]; then +# dd bs=440 count=1 conv=notrunc if=/usr/lib/syslinux/bios/gptmbr.bin of=${DISK} +# extlinux --install /mnt/boot +#fi echo "--------------------------------------" echo "-- Arch Install on Main Drive --" echo "--------------------------------------" From 74e2141813887c08f296452e395b6a9262347496 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Sat, 30 Oct 2021 12:51:15 -0500 Subject: [PATCH 7/8] Update 0-preinstall.sh --- 0-preinstall.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/0-preinstall.sh b/0-preinstall.sh index 98c95d6..315ffef 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -66,13 +66,13 @@ fi # make filesystems echo -e "\nCreating Filesystems...\n$HR" if [[ ${DISK} =~ "nvme" ]]; then -mkfs.vfat -F32 -n "EFIBOOT" "${DISK}p1" -mkfs.btrfs -L "ROOT" "${DISK}p2" -f -mount -t btrfs "${DISK}p2" /mnt +mkfs.vfat -F32 -n "EFIBOOT" "${DISK}p2" +mkfs.btrfs -L "ROOT" "${DISK}p3" -f +mount -t btrfs "${DISK}p3" /mnt else -mkfs.vfat -F32 -n "EFIBOOT" "${DISK}1" -mkfs.btrfs -L "ROOT" "${DISK}2" -f -mount -t btrfs "${DISK}2" /mnt +mkfs.vfat -F32 -n "EFIBOOT" "${DISK}2" +mkfs.btrfs -L "ROOT" "${DISK}3" -f +mount -t btrfs "${DISK}3" /mnt fi ls /mnt | xargs btrfs subvolume delete btrfs subvolume create /mnt/@ From 59328ecf31dbbd1e1822acbd2e54b53241cd6c95 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Sun, 31 Oct 2021 13:04:44 -0500 Subject: [PATCH 8/8] Update 0-preinstall.sh --- 0-preinstall.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/0-preinstall.sh b/0-preinstall.sh index 315ffef..855a3f1 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -100,10 +100,6 @@ if ! grep -qs '/mnt' /proc/mounts; then reboot now fi -#if [[ ! -d "/sys/firmware/efi" ]]; then -# dd bs=440 count=1 conv=notrunc if=/usr/lib/syslinux/bios/gptmbr.bin of=${DISK} -# extlinux --install /mnt/boot -#fi echo "--------------------------------------" echo "-- Arch Install on Main Drive --" echo "--------------------------------------"