From 886bae9589a5f3155580a2b91f39b904b91f9068 Mon Sep 17 00:00:00 2001 From: Jane Doe Date: Sat, 16 Nov 2024 15:48:14 +0000 Subject: [PATCH] Change: 'Minimal Gnome'/'Minimal Plasma' setups > Enable syntax highlighting for 'nano' package. Change: A few changes have been made to 'mkinitcpiod.conf' drop-in file, on how/which graphics modules is loading, since 'kms' hook automates a lot of this process. --- Amelia.sh | 92 +++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/Amelia.sh b/Amelia.sh index 1734234..181588c 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # https://gitlab.com/prism7/archery -# Version: 8.0.8 +# Version: 8.0.9 set -euo pipefail ################################################################################################### @@ -3022,7 +3022,7 @@ ${multi_root} if [[ "${autoroot}" == "y" ]]; then root_dev="${root_comply}" - multiroot_opts="root=PARTUUID=$(blkid -s PARTUUID -o value "${root_dev}") " + multiroot_bootopts="root=PARTUUID=$(blkid -s PARTUUID -o value "${root_dev}") " elif [[ "${autoroot}" == "n" ]]; then stage_fail else @@ -5695,7 +5695,7 @@ set_vars() { encr_root_dev="/dev/mapper/${ENCROOT}" # Encrypted Root Options encr_root_opts="rd.luks.name=$(blkid -s UUID -o value "${root_dev}")=${ENCROOT}" - # Encrypted Kernel Boot Options + # Encryption Kernel Parameters encr_root_bootopts="${encr_root_opts} root=${encr_root_dev} " ### Encrypted Swap Setup @@ -5703,7 +5703,7 @@ set_vars() { if [[ "${swapmode}" == "1" ]]; then # Encrypted Swap Partition Options encr_swap_opts="rd.luks.name=$(blkid -s UUID -o value "${swap_dev}")=swap" - # Encrypted Swap Partition Kernel Main Boot Options + # Encrypted Swap Kernel Parameters encr_swap_bootopts="resume=/dev/mapper/swap ${encr_swap_opts} " ## Encrypted Swapfile elif [[ "${swapmode}" == "2" ]]; then @@ -5714,15 +5714,15 @@ set_vars() { elif [[ "${fs}" == "2" ]]; then offst="$(btrfs inspect-internal map-swapfile -r /mnt/swap/swapfile)" fi - # Encrypted Swapfile Kernel Boot Options + # Encrypted Swapfile Kernel Parameters encr_swap_bootopts="resume=${encr_root_dev} resume_offset=${offst} " ## Zram Swap elif [[ "${swapmode}" == "3" ]]; then - # Zram Swap Kernel Boot Options + # Zram Swap Kernel Parameters zram_bootopts="zswap.enabled=0 " ## No Swap elif [[ "${swapmode}" == "4" ]]; then - # No Swap Kernel Boot Options + # No Swap Kernel Parameters encr_swap_bootopts="" fi @@ -5732,51 +5732,50 @@ set_vars() { # Intel if [[ "${vendor}" == "Intel" ]]; then # Mkinitcpio Modules (Encryption) - mkinitcpio_mods="MODULES=(i915 ${fs_mod})" + mkinitcpio_mods="MODULES=(${fs_mod})" # Mkinitcpio Hooks (Encryption) mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)" # Nvidia elif [[ "${vendor}" == "Nvidia" ]]; then - # Mkinitcpio Modules (Encryption) [Early Nvidia KMS] + # Mkinitcpio Modules (Encryption) [Nvidia KMS] mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm ${fs_mod})" # Mkinitcpio Hooks (Encryption) mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf sd-vconsole block sd-encrypt filesystems fsck)" - # Graphics Kernel Boot Options + # Graphics Kernel Parameters vga_bootopts="nvidia.NVreg_UsePageAttributeTable=1 " # Amd elif [[ "${vendor}" == "AMD" ]]; then - # Mkinitcpio Modules (Encryption) - mkinitcpio_mods="MODULES=(amdgpu radeon ${fs_mod})" # Mkinitcpio Hooks (Encryption) mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)" # 'Southern Islands' support if [[ "${islands}" == "1" ]]; then - # Graphics Kernel Boot Options + # Mkinitcpio Modules (Encryption) + mkinitcpio_mods="MODULES=(amdgpu ${fs_mod})" + # Graphics Kernel Parameters vga_bootopts="radeon.si_support=0 amdgpu.si_support=1 amdgpu.dc=1 " # 'Sea Islands' support elif [[ "${islands}" == "2" ]]; then - # Graphics Kernel Boot Options + # Mkinitcpio Modules (Encryption) + mkinitcpio_mods="MODULES=(amdgpu ${fs_mod})" + # Graphics Kernel Parameters vga_bootopts="radeon.cik_support=0 amdgpu.cik_support=1 amdgpu.dc=1 " elif [[ -z "${islands}" ]]; then - # Graphics Kernel Boot Options + # Mkinitcpio Modules (Encryption) + mkinitcpio_mods="MODULES=(${fs_mod})" + # Graphics Kernel Parameters vga_bootopts="amdgpu.dc=1 " fi fi ## Configuration = 'No' elif [[ "${vgaconf}" == "n" ]]; then - # Nvidia - if [[ "${vendor}" == "Nvidia" ]]; then - # Mkinitcpio Modules (Encryption) - mkinitcpio_mods="MODULES=(${fs_mod} nouveau)" - # Other Vendors - else - # Mkinitcpio Modules (Encryption) - mkinitcpio_mods="MODULES=(${fs_mod})" - fi + # Mkinitcpio Modules (Encryption) + mkinitcpio_mods="MODULES=(${fs_mod})" # Mkinitcpio Hooks (Encryption) mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)" + # Graphics Kernel Parameters + vga_bootopts="amdgpu.dc=1 " fi - ### Kernel Boot Options (Encryption) + ### Kernel Parameters (Encryption) boot_opts="${encr_root_bootopts}${encr_swap_bootopts}${vga_bootopts}${cust_bootopts}${btrfs_bootopts}${zram_bootopts}" #------------------------------------------------------------------------------------------------------------- @@ -5785,7 +5784,7 @@ set_vars() { ### Swap Setup ## Zram Swap if [[ "${swapmode}" == "3" ]]; then - # Zram Swap Kernel Boot Options + # Zram Swap Kernel Parameters zram_bootopts="zswap.enabled=0 " fi ### Graphics Setup @@ -5794,59 +5793,57 @@ set_vars() { # Intel if [[ "${vendor}" == "Intel" ]]; then # Mkinitcpio Modules - mkinitcpio_mods="MODULES=(i915)" + mkinitcpio_mods="MODULES=()" # Mkinitcpio Hooks mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)" # Nvidia elif [[ "${vendor}" == "Nvidia" ]]; then - # Mkinitcpio Modules [Early Nvidia KMS] + # Mkinitcpio Modules [Nvidia KMS] mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)" # Mkinitcpio Hooks mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf keyboard sd-vconsole block filesystems fsck)" - # Graphics Kernel Boot Options + # Graphics Kernel Parameters vga_bootopts="nvidia.NVreg_UsePageAttributeTable=1 " # Amd elif [[ "${vendor}" == "AMD" ]]; then - # Mkinitcpio Modules - mkinitcpio_mods="MODULES=(amdgpu radeon)" # Mkinitcpio Hooks mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)" # 'Southern Islands' support if [[ "${islands}" == "1" ]]; then - # Graphics Kernel Boot Options + # Mkinitcpio Modules + mkinitcpio_mods="MODULES=(amdgpu)" + # Graphics Kernel Parameters vga_bootopts="radeon.si_support=0 amdgpu.si_support=1 amdgpu.dc=1 " # 'Sea Islands' support elif [[ "${islands}" == "2" ]]; then - # Graphics Kernel Boot Options + # Mkinitcpio Modules + mkinitcpio_mods="MODULES=(amdgpu)" + # Graphics Kernel Parameters vga_bootopts="radeon.cik_support=0 amdgpu.cik_support=1 amdgpu.dc=1 " elif [[ -z "${islands}" ]]; then - # Graphics Kernel Boot Options + # Mkinitcpio Modules + mkinitcpio_mods="MODULES=()" + # Graphics Kernel Parameters vga_bootopts="amdgpu.dc=1 " fi fi ## Configuration = 'No' elif [[ "${vgaconf}" == "n" ]]; then - # Nvidia - if [[ "${vendor}" == "Nvidia" ]]; then - # Mkinitcpio Modules - mkinitcpio_mods="MODULES=(nouveau)" - # Other Vendors - else - # Mkinitcpio Modules - mkinitcpio_mods="MODULES=()" - fi + # Mkinitcpio Modules + mkinitcpio_mods="MODULES=()" # Mkinitcpio Hooks mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)" + # Graphics Kernel Parameters + vga_bootopts="amdgpu.dc=1 " fi if [[ "${autoroot}" == "y" ]]; then - ### Kernel Boot Options [Multi-Root Disk] (No Encryption) - boot_opts="${multiroot_opts}${vga_bootopts}${cust_bootopts}${btrfs_bootopts}${zram_bootopts}" + ### Multi-Root Disk Kernel Parameters (No Encryption) + boot_opts="${multiroot_bootopts}${vga_bootopts}${cust_bootopts}${btrfs_bootopts}${zram_bootopts}" else - ### Kernel Boot Options [Single Root Disk] (No Encryption) + ### Single-Root Disk Kernel Parameters (No Encryption) boot_opts="${vga_bootopts}${cust_bootopts}${btrfs_bootopts}${zram_bootopts}" fi - fi } ################################################################################################### @@ -6141,6 +6138,7 @@ USER sed -i "/# set linenumbers/"'s/^#//' /etc/nanorc || exit sed -i "/# set minibar/"'s/^#//' /etc/nanorc || exit sed -i "/# set mouse/"'s/^#//' /etc/nanorc || exit + echo " include /usr/share/nano/*.nanorc" | tee -a /etc/nanorc || exit echo tcp_bbr | tee /etc/modules-load.d/modulesd.conf || exit cat <<-SUPPLICANT > /etc/wpa_supplicant/wpa_supplicant.conf || exit country=${REGDOM}