diff --git a/Amelia.sh b/Amelia.sh index 592c347..0e2db07 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -315,6 +315,7 @@ uefi_check (){ NC " + ______________________________ ${purple}###${nc} UEFI Mode Verification ${purple}###${nc} @@ -406,7 +407,7 @@ ${purple}###${nc} Main Menu ${purple}###${nc} [3] Disk Management - [4] Start ${cyan}Auto-Navigated${nc} Installation " + [4] Start ${bwhite}Auto-Navigated${nc} Installation " BLUE " @@ -4049,7 +4050,7 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc} echo KEYMAP=${SETKBD} > /etc/vconsole.conf && echo " ${mkinitcpio_mods} - ${mkinitcpio_hooks}" | tee /etc/mkinitcpio.conf.d/custom.conf && + ${mkinitcpio_hooks}" | tee /etc/mkinitcpio.conf.d/mkinitcpiod.conf && mkinitcpio -P && ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime && hwclock --systohc && @@ -4062,8 +4063,8 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc} useradd -m -G wheel -s /bin/bash ${USERNAME} && echo ${USERNAME}:${USERPASSWD2} | chpasswd && echo " - %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoedits && - visudo -c /etc/sudoers.d/sudoedits + %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoersd && + visudo -c /etc/sudoers.d/sudoersd VANILLA_CONF if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then @@ -4178,7 +4179,7 @@ NRG ${mkinitcpio_hooks} COMPRESSION="zstd" COMPRESSION_OPTIONS=(-c -T$(nproc) -) - MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf && + MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/mkinitcpiod.conf && mkinitcpio -P && echo ' CFLAGS="-march=native -O2 -pipe -fno-plt -fexceptions \ @@ -4273,7 +4274,7 @@ NRG echo " [Manager] DefaultTimeoutStopSec=5s - DefaultTimeoutAbortSec=5s" | tee /etc/systemd/user.conf.d/00-user.conf && + DefaultTimeoutAbortSec=5s" | tee /etc/systemd/user.conf.d/00-userd.conf && sed -i 's|^hosts.*|hosts: mymachines mdns_minimal resolve [!UNAVAIL=return] files myhostname dns|g' /etc/nsswitch.conf && sed -i 's/ interface = [^ ]*/ interface = all/g' /etc/ipp-usb/ipp-usb.conf && sed -i "/# set linenumbers/"'s/^#//' /etc/nanorc && @@ -4297,8 +4298,8 @@ NRG Defaults env_reset Defaults pwfeedback Defaults editor=/usr/bin/nano - %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoedits && - visudo -c /etc/sudoers.d/sudoedits && + %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoersd && + visudo -c /etc/sudoers.d/sudoersd && systemctl enable avahi-daemon bluetooth cups ipp-usb NetworkManager rngd sddm systemd-boot-update ufw ${trim} ${vm_services} KOPTIMIZED_CONF @@ -4360,7 +4361,7 @@ NRG ${mkinitcpio_hooks} COMPRESSION="zstd" COMPRESSION_OPTIONS=(-c -T$(nproc) -) - MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf && + MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/mkinitcpiod.conf && mkinitcpio -P && echo ' CFLAGS="-march=native -O2 -pipe -fno-plt -fexceptions \ @@ -4455,7 +4456,7 @@ NRG echo " [Manager] DefaultTimeoutStopSec=5s - DefaultTimeoutAbortSec=5s" | tee /etc/systemd/user.conf.d/00-user.conf && + DefaultTimeoutAbortSec=5s" | tee /etc/systemd/user.conf.d/00-userd.conf && sed -i 's|^hosts.*|hosts: mymachines mdns_minimal resolve [!UNAVAIL=return] files myhostname dns|g' /etc/nsswitch.conf && sed -i 's/ interface = [^ ]*/ interface = all/g' /etc/ipp-usb/ipp-usb.conf && sed -i "/# set linenumbers/"'s/^#//' /etc/nanorc && @@ -4479,8 +4480,8 @@ NRG Defaults env_reset Defaults pwfeedback Defaults editor=/usr/bin/nano - %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoedits && - visudo -c /etc/sudoers.d/sudoedits && + %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoersd && + visudo -c /etc/sudoers.d/sudoersd && systemctl enable avahi-daemon bluetooth cups gdm ipp-usb NetworkManager rngd systemd-boot-update ufw ${trim} ${vm_services} GNOPTIMIZED_CONF @@ -4544,8 +4545,8 @@ NVIDIAHOOK useradd -m -G wheel -s /bin/bash ${USERNAME} && echo ${USERNAME}:${USERPASSWD2} | chpasswd && echo " - %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoedits && - visudo -c /etc/sudoers.d/sudoedits + %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoersd && + visudo -c /etc/sudoers.d/sudoersd CUSTOM_CONF if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then