albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add: Changes to take use of the 'makepkg.conf.d' drop-in directory, a few changes in the 'custom' and 'vanilla' setups, simplifying configuration, bumped minor program version, cosmetic changes.

Browse source
This commit is contained in:
Jane Doe 2024-05-05 11:29:34 +00:00
parent 83dd5bb5e5
commit 7f0b8ac3e7
1 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Amelia.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Amelia Installer # Amelia Installer
# Version: 3.7 # Version: 3.8
set -euo pipefail set -euo pipefail
########################################################################################### ###########################################################################################
@ -313,6 +313,8 @@ uefi_check (){
local prompt="UEFI "${bootmode}"-bit Mode" local prompt="UEFI "${bootmode}"-bit Mode"
sleep 0.5 sleep 0.5
NC " NC "
______________________________ ______________________________
${purple}###${nc} UEFI Mode Verification ${purple}###${nc} ${purple}###${nc} UEFI Mode Verification ${purple}###${nc}
@ -352,6 +354,7 @@ upd_clock (){
___________________________ ___________________________
${purple}###${nc} System Clock Update ${purple}###${nc} ${purple}###${nc} System Clock Update ${purple}###${nc}
" "
timedatectl timedatectl
ok ok
@ -403,7 +406,7 @@ ${purple}###${nc} Main Menu ${purple}###${nc}
[3] Disk Management [3] Disk Management
[4] ${cyan}Start Auto-Navigated Installation${nc} " [4] Start ${cyan}Auto-Navigated${nc} Installation "
BLUE " BLUE "
@ -1360,11 +1363,11 @@ ${purple}###${nc} Desktop Selection ${purple}###${nc}
[1] Plasma [1] Plasma
[2] Plasma & Systemd-boot & System Optimizations [2] Plasma (custom) & Systemd-boot & System Optimizations
[3] Gnome [3] Gnome
[4] Gnome & Systemd-boot & System Optimizations [4] Gnome (custom) & Systemd-boot & System Optimizations
[5] Xfce [5] Xfce
@ -3765,7 +3768,7 @@ ${purple}###${nc} Pacstrap System ${purple}###${nc}
4) # NOTE: Gnome & Systemd-boot & Optimized Desktop: 4) # NOTE: Gnome & Systemd-boot & Optimized Desktop:
deskpkgs=""${basepkgs}" evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe malcontent nautilus networkmanager power-profiles-daemon simple-scan sushi system-config-printer xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache cups-pdf e2fsprogs efibootmgr exfatprogs fdkaac git glibc-locales gnome-browser-connector gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi gufw htop icoutils ipp-usb libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils nano-syntax-highlighting nss-mdns ntfs-3g p7zip pacman-contrib pdfmixtool pigz pipewire-alsa pipewire-pulse pkgstats powerline powerline-fonts qbittorrent realtime-privileges reflector rng-tools sof-firmware terminus-font ttf-ubuntu-font-family ufw-extras unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting "${nrg_plc}"" ;; deskpkgs=""${basepkgs}" evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe malcontent nautilus networkmanager power-profiles-daemon simple-scan sushi system-config-printer xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache cups-pdf e2fsprogs efibootmgr exfatprogs fdkaac git glibc-locales gnome-browser-connector gparted gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi gufw htop icoutils ipp-usb libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils nano-syntax-highlighting nss-mdns ntfs-3g p7zip pacman-contrib pdfmixtool pigz pipewire-alsa pipewire-pulse pkgstats powerline powerline-fonts qbittorrent realtime-privileges reflector rng-tools sof-firmware terminus-font ttf-ubuntu-font-family ufw-extras unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting "${nrg_plc}"" ;;
5) # NOTE: Xfce Desktop: 5) # NOTE: Xfce Desktop:
@ -4044,11 +4047,9 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc}
echo LANG=${SETLOCALE} > /etc/locale.conf && echo LANG=${SETLOCALE} > /etc/locale.conf &&
export LANG=${SETLOCALE} && export LANG=${SETLOCALE} &&
echo KEYMAP=${SETKBD} > /etc/vconsole.conf && echo KEYMAP=${SETKBD} > /etc/vconsole.conf &&
update-pciids &&
echo " echo "
${mkinitcpio_mods} ${mkinitcpio_mods}
${mkinitcpio_hooks} ${mkinitcpio_hooks}" | tee /etc/mkinitcpio.conf.d/custom.conf &&
COMPRESSION_OPTIONS=(-c -T$(nproc) -)" | tee /etc/mkinitcpio.conf.d/custom.conf &&
mkinitcpio -P && mkinitcpio -P &&
ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime && ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime &&
hwclock --systohc && hwclock --systohc &&
@ -4164,7 +4165,7 @@ NVIDIAHOOK
NRG NRG
fi fi
arch-chroot /mnt <<-OPTIMIZED_CONF arch-chroot /mnt <<-KOPTIMIZED_CONF
sed -i "/^#${SETLOCALE}/s/^#//" /etc/locale.gen && sed -i "/^#${SETLOCALE}/s/^#//" /etc/locale.gen &&
locale-gen && locale-gen &&
echo LANG=${SETLOCALE} > /etc/locale.conf && echo LANG=${SETLOCALE} > /etc/locale.conf &&
@ -4179,16 +4180,18 @@ NRG
COMPRESSION_OPTIONS=(-c -T$(nproc) -) COMPRESSION_OPTIONS=(-c -T$(nproc) -)
MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf && MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf &&
mkinitcpio -P && mkinitcpio -P &&
cp -v /etc/makepkg.conf /etc/makepkg.conf.bak && echo '
sed -i \ CFLAGS="-march=native -O2 -pipe -fno-plt -fexceptions \
-e 's|-march=[^ ]* -mtune=[^ ]*|-march=native|g' \ -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
-e 's|^#RUSTFLAGS.*|RUSTFLAGS="-C opt-level=2"|g' \ -fstack-clash-protection -fcf-protection \
-e 's|^#MAKEFLAGS.*|MAKEFLAGS="-j$(nproc)"|g' \ -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
-e 's|^BUILDENV.*|BUILDENV=(!distcc color ccache check !sign)|g' \ RUSTFLAGS="-C opt-level=3"
-e 's|^OPTIONS.*|OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)|g' \ MAKEFLAGS="-j$(nproc)"
-e 's|^COMPRESSGZ.*|COMPRESSGZ=(pigz -c -f -n)|g' \ BUILDENV=(!distcc color ccache check !sign)
-e 's|^COMPRESSBZ2.*|COMPRESSBZ2=(pbzip2 -c -f)|g' \ OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
-e 's|^COMPRESSXZ.*|COMPRESSXZ=(xz -c -z --threads=0 -)|g' /etc/makepkg.conf && COMPRESSGZ=(pigz -c -f -n)
COMPRESSBZ2=(pbzip2 -c -f)
COMPRESSXZ=(xz -c -z --threads=0 -)' | tee /etc/makepkg.conf.d/makepkgd.conf &&
ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime && ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime &&
hwclock --systohc && hwclock --systohc &&
echo ${HOSTNAME} > /etc/hostname && echo ${HOSTNAME} > /etc/hostname &&
@ -4297,7 +4300,7 @@ NRG
%wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoedits && %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoedits &&
visudo -c /etc/sudoers.d/sudoedits && visudo -c /etc/sudoers.d/sudoedits &&
systemctl enable avahi-daemon bluetooth cups ipp-usb NetworkManager rngd sddm systemd-boot-update ufw ${trim} ${vm_services} systemctl enable avahi-daemon bluetooth cups ipp-usb NetworkManager rngd sddm systemd-boot-update ufw ${trim} ${vm_services}
OPTIMIZED_CONF KOPTIMIZED_CONF
if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then
@ -4344,7 +4347,7 @@ NVIDIAHOOK
NRG NRG
fi fi
arch-chroot /mnt <<-OPTIMIZED_CONF arch-chroot /mnt <<-GNOPTIMIZED_CONF
sed -i "/^#${SETLOCALE}/s/^#//" /etc/locale.gen && sed -i "/^#${SETLOCALE}/s/^#//" /etc/locale.gen &&
locale-gen && locale-gen &&
echo LANG=${SETLOCALE} > /etc/locale.conf && echo LANG=${SETLOCALE} > /etc/locale.conf &&
@ -4359,16 +4362,18 @@ NRG
COMPRESSION_OPTIONS=(-c -T$(nproc) -) COMPRESSION_OPTIONS=(-c -T$(nproc) -)
MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf && MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf &&
mkinitcpio -P && mkinitcpio -P &&
cp -v /etc/makepkg.conf /etc/makepkg.conf.bak && echo '
sed -i \ CFLAGS="-march=native -O2 -pipe -fno-plt -fexceptions \
-e 's|-march=[^ ]* -mtune=[^ ]*|-march=native|g' \ -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
-e 's|^#RUSTFLAGS.*|RUSTFLAGS="-C opt-level=2"|g' \ -fstack-clash-protection -fcf-protection \
-e 's|^#MAKEFLAGS.*|MAKEFLAGS="-j$(nproc)"|g' \ -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
-e 's|^BUILDENV.*|BUILDENV=(!distcc color ccache check !sign)|g' \ RUSTFLAGS="-C opt-level=3"
-e 's|^OPTIONS.*|OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)|g' \ MAKEFLAGS="-j$(nproc)"
-e 's|^COMPRESSGZ.*|COMPRESSGZ=(pigz -c -f -n)|g' \ BUILDENV=(!distcc color ccache check !sign)
-e 's|^COMPRESSBZ2.*|COMPRESSBZ2=(pbzip2 -c -f)|g' \ OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
-e 's|^COMPRESSXZ.*|COMPRESSXZ=(xz -c -z --threads=0 -)|g' /etc/makepkg.conf && COMPRESSGZ=(pigz -c -f -n)
COMPRESSBZ2=(pbzip2 -c -f)
COMPRESSXZ=(xz -c -z --threads=0 -)' | tee /etc/makepkg.conf.d/makepkgd.conf &&
ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime && ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime &&
hwclock --systohc && hwclock --systohc &&
echo ${HOSTNAME} > /etc/hostname && echo ${HOSTNAME} > /etc/hostname &&
@ -4477,7 +4482,7 @@ NRG
%wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoedits && %wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoedits &&
visudo -c /etc/sudoers.d/sudoedits && visudo -c /etc/sudoers.d/sudoedits &&
systemctl enable avahi-daemon bluetooth cups gdm ipp-usb NetworkManager rngd systemd-boot-update ufw ${trim} ${vm_services} systemctl enable avahi-daemon bluetooth cups gdm ipp-usb NetworkManager rngd systemd-boot-update ufw ${trim} ${vm_services}
OPTIMIZED_CONF GNOPTIMIZED_CONF
if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then
@ -4526,8 +4531,7 @@ NVIDIAHOOK
echo KEYMAP=${SETKBD} > /etc/vconsole.conf && echo KEYMAP=${SETKBD} > /etc/vconsole.conf &&
echo " echo "
${mkinitcpio_mods} ${mkinitcpio_mods}
${mkinitcpio_hooks} ${mkinitcpio_hooks}" | tee /etc/mkinitcpio.conf.d/custom.conf &&
COMPRESSION_OPTIONS=(-c -T$(nproc) -)" | tee /etc/mkinitcpio.conf.d/custom.conf &&
mkinitcpio -P && mkinitcpio -P &&
ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime && ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime &&
hwclock --systohc && hwclock --systohc &&