mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 01:17:35 +02:00
Add: Main menu > Personalization > Shell Selection : The installer now offers 3 shells to choose from.
Bash-Zsh-Fish. Change: 'Pacstrap System' function : There are changes about the packages included in the available Desktop setups. Now, the Xfce-Cinnamon-Deepin-Budgie-Lxqt-Mate-Cosmic Desktops, instead of being completely barebones, include many additional packages for a more complete experience. Add: Main Menu > System Configuration > Desktop Setup > Optimizations : Now, if 'Optimizations' have been selected, a configuration file will dictate the 'Udisks2' mount options for 'Ntfs' & 'Exfat' volumes.
This commit is contained in:
Jane Doe
@@ -2,26 +2,26 @@
|
||||
|
||||
# Amelia Installer
|
||||
# Source: https://gitlab.com/prism7/archery
|
||||
# Version: 9.0.6
|
||||
# Version: 9.1.0
|
||||
|
||||
set -euo pipefail
|
||||
###################################################################################################
|
||||
# COLOR FUNCTIONS
|
||||
magentabg="\e[1;45m"
|
||||
yellowbg="\e[1;43m"
|
||||
yellowl="\e[93m"
|
||||
greenbg="\e[1;42m"
|
||||
magenta="\e[35m"
|
||||
yellow="\e[33m"
|
||||
bluebg="\e[1;44m"
|
||||
cyanbg="\e[1;46m"
|
||||
bwhite="\e[0;97m"
|
||||
green="\e[32m"
|
||||
redbg="\e[1;41m"
|
||||
blue="\e[94m"
|
||||
cyan="\e[36m"
|
||||
red="\e[31m"
|
||||
nc="\e[0m"
|
||||
red="\e[31m"
|
||||
cyan="\e[36m"
|
||||
blue="\e[94m"
|
||||
green="\e[32m"
|
||||
yellow="\e[33m"
|
||||
magenta="\e[35m"
|
||||
yellowl="\e[93m"
|
||||
redbg="\e[1;41m"
|
||||
bwhite="\e[0;97m"
|
||||
cyanbg="\e[1;46m"
|
||||
bluebg="\e[1;44m"
|
||||
greenbg="\e[1;42m"
|
||||
yellowbg="\e[1;43m"
|
||||
magentabg="\e[1;45m"
|
||||
MAGENTABG() { echo -e "${magentabg} $1${nc}" ;}
|
||||
YELLOWBG() { echo -e "${yellowbg} $1${nc}" ;}
|
||||
YELLOWL() { echo -e "${yellowl} $1${nc}" ;}
|
||||
@@ -637,6 +637,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pers
|
||||
|
||||
[2] User, Root User & Hostname Setup
|
||||
|
||||
[3] Shell Selection
|
||||
|
||||
[ ] Return to Main Menu "
|
||||
BLUE "
|
||||
|
||||
@@ -656,6 +658,8 @@ Enter a number: "
|
||||
until rootuser_setup; do : ; done
|
||||
until slct_hostname; do : ; done
|
||||
return 1 ;;
|
||||
3) until slct_shell; do : ; done
|
||||
return 1 ;;
|
||||
"")
|
||||
until main_menu; do : ; done ;;
|
||||
*)
|
||||
@@ -915,6 +919,70 @@ Enter a hostname: "
|
||||
ok
|
||||
}
|
||||
###################################################################################################
|
||||
slct_shell() {
|
||||
|
||||
local prompt="Shell"
|
||||
sleep 0.2
|
||||
NC "
|
||||
|
||||
|
||||
${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Shell Selection${nc} ${magenta}]${nc}-------------------------------------${magenta}###
|
||||
"
|
||||
YELLOW "
|
||||
|
||||
> Select a Shell: "
|
||||
NC "
|
||||
|
||||
[1] Bash
|
||||
|
||||
[2] Zsh
|
||||
|
||||
[3] Fish "
|
||||
BLUE "
|
||||
|
||||
|
||||
Enter a number: "
|
||||
read -r -p "
|
||||
==> " shellnmbr
|
||||
echo
|
||||
|
||||
case "${shellnmbr}" in
|
||||
1)
|
||||
shell=""
|
||||
shellname="bash"
|
||||
shellname2="Bash"
|
||||
shell_pkgs="bash-completion powerline powerline-fonts" ;;
|
||||
2)
|
||||
shell="zsh"
|
||||
shellname="zsh"
|
||||
shellname2="Zsh"
|
||||
shell_pkgs="powerline powerline-fonts zsh-autocomplete zsh-autosuggestions zsh-completions zsh-syntax-highlighting" ;;
|
||||
3)
|
||||
shell="fish"
|
||||
shellname="fish"
|
||||
shellname2="Fish"
|
||||
shell_pkgs="powerline powerline-fonts which" ;;
|
||||
"")
|
||||
sleep 0.2
|
||||
RED "
|
||||
-------------------------------
|
||||
### ${yellow}Please select a Shell ${red}###
|
||||
-------------------------------"
|
||||
reload
|
||||
return 1 ;;
|
||||
*)
|
||||
invalid
|
||||
return 1 ;;
|
||||
esac
|
||||
|
||||
sleep 0.2
|
||||
YELLOW "
|
||||
|
||||
### The ${shellname2} shell has been selected
|
||||
"
|
||||
ok
|
||||
}
|
||||
###################################################################################################
|
||||
sys_submn() {
|
||||
|
||||
sleep 0.2
|
||||
@@ -1891,7 +1959,7 @@ gfxpkgs_set() {
|
||||
if [[ "${vendor}" == "Intel" || "${vendors}" =~ "Intel" ]]; then
|
||||
# /etc/sysctl.d/99-sysctld.conf
|
||||
perf_stream="dev.i915.perf_stream_paranoid = 0"
|
||||
gfxpkgs+=(intel-compute-runtime intel-media-driver intel-media-sdk libva-intel-driver opencl-headers vpl-gpu-rt vkd3d vulkan-intel vulkan-mesa-layers)
|
||||
gfxpkgs+=(intel-compute-runtime intel-media-driver intel-media-sdk libva-intel-driver libva-utils opencl-headers vpl-gpu-rt vkd3d vulkan-intel vulkan-mesa-layers)
|
||||
fi
|
||||
# AMD Graphics
|
||||
if [[ "${vendor}" == "AMD" || "${vendors}" =~ "AMD" ]]; then
|
||||
@@ -2025,11 +2093,11 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Deskt
|
||||
|
||||
[1] Plasma
|
||||
|
||||
[2] Minimal Plasma + Desktop Apps
|
||||
[2] Plasma Light (Amelia's version)
|
||||
|
||||
[3] Gnome
|
||||
|
||||
[4] Minimal Gnome + Desktop Apps
|
||||
[4] Gnome Light (Amelia's version)
|
||||
|
||||
[5] Xfce
|
||||
|
||||
@@ -2047,7 +2115,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Deskt
|
||||
|
||||
[12] Custom Arch Linux
|
||||
|
||||
[13] Cosmic ${red}### ${yellow}Alpha ${red}### "
|
||||
[13] Cosmic ${red}## ${yellow}Alpha ${red}## "
|
||||
BLUE "
|
||||
|
||||
|
||||
@@ -2061,13 +2129,13 @@ Enter a number: "
|
||||
desktopname="Plasma"
|
||||
deskname ;;
|
||||
2)
|
||||
desktopname="Minimal Plasma + Desktop Apps"
|
||||
desktopname="Plasma Light"
|
||||
deskname ;;
|
||||
3)
|
||||
desktopname="Gnome"
|
||||
deskname ;;
|
||||
4)
|
||||
desktopname="Minimal Gnome + Desktop Apps"
|
||||
desktopname="Gnome Light"
|
||||
deskname ;;
|
||||
5)
|
||||
desktopname="Xfce"
|
||||
@@ -4581,11 +4649,12 @@ instl() {
|
||||
fi
|
||||
|
||||
if [[ -z "${USERNAME}" ]]; then
|
||||
local stage_prompt="User, Root User & Hostname Setup"
|
||||
local stage_prompt="User, Root User, Hostname & Shell Setup"
|
||||
completion_err
|
||||
until user_setup; do : ; done
|
||||
until rootuser_setup; do : ; done
|
||||
until slct_hostname; do : ; done
|
||||
until slct_shell; do : ; done
|
||||
fi
|
||||
|
||||
if [[ -z "${kernelnmbr}" ]]; then
|
||||
@@ -5590,7 +5659,7 @@ ${magenta}###${nc}-------------------------------${magenta}[ ${bwhite}Confirm In
|
||||
revise() {
|
||||
|
||||
revision="yes"
|
||||
reset=(xbootloader="" gfxconf="" vendor_slct="" vendor="" packages="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" autoroot="" autoxboot="" autohome="" autoswap="" vendors="" lowlat="" nogsp="" sanity="" smartpart="" partok="" preset="" presetpart="" set_optm="" ask_param="" kill_watchdog="" genoptm="" desk_setup="" web_slct="" set_optm_slct="" oomd="" irqbalance="" thermald="" rngd="" rtkit="")
|
||||
reset=(xbootloader="" gfxconf="" vendor_slct="" vendor="" packages="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" autoroot="" autoxboot="" autohome="" autoswap="" vendors="" lowlat="" nogsp="" sanity="" smartpart="" partok="" preset="" presetpart="" set_optm="" ask_param="" kill_watchdog="" genoptm="" desk_setup="" devel="" web="" web_browser="" web_slct="" set_optm_slct="" oomd="" irqbalance="" thermald="" rngd="" rtkit="")
|
||||
export "${reset[@]}"
|
||||
gfxpkgs=()
|
||||
|
||||
@@ -6017,15 +6086,25 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
|
||||
fi
|
||||
fi
|
||||
|
||||
basepkgs=(base efibootmgr nano networkmanager pipewire-pulse pkgstats sudo vim xdg-user-dirs "${fstools}" "${kernel}" "${microcode}")
|
||||
if [[ -n "${shell}" ]]; then
|
||||
basepkgs=(base efibootmgr nano networkmanager pkgstats sudo vim "${bootldr_pkgs}" "${fstools}" "${kernel}" "${microcode}" "${shell}")
|
||||
else
|
||||
basepkgs=(base efibootmgr nano networkmanager pkgstats sudo vim "${bootldr_pkgs}" "${fstools}" "${kernel}" "${microcode}")
|
||||
fi
|
||||
|
||||
if [[ -n "${nrg_plc}" ]]; then
|
||||
basepkgs+=("${nrg_plc}")
|
||||
fi
|
||||
if [[ "${vendor}" == "Virtual Machine" ]]; then
|
||||
basepkgs+=("${vmpkgs}")
|
||||
else
|
||||
basepkgs+=(linux-firmware sof-firmware)
|
||||
basepkgs+=(alsa-firmware linux-firmware sof-firmware)
|
||||
fi
|
||||
if [[ -n "${bootldr_pkgs}" ]]; then
|
||||
basepkgs+=("${bootldr_pkgs}")
|
||||
if [[ ! "${packages}" =~ ^(11|12)$ ]]; then
|
||||
basepkgs+=(7zip alsa-utils exfatprogs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugins-bad gst-plugins-good gst-plugins-ugly libfido2 man-db man-pages mesa-utils nano-syntax-highlighting pacman-contrib pipewire-libcamera pipewire-pulse pipewire-zeroconf reflector xdg-user-dirs)
|
||||
fi
|
||||
if [[ "${packages}" != "12" ]]; then
|
||||
basepkgs+=("${shell_pkgs}")
|
||||
fi
|
||||
if [[ -n "${ukify}" ]]; then
|
||||
basepkgs+=("${ukify}")
|
||||
@@ -6055,87 +6134,76 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
|
||||
case "${packages}" in
|
||||
|
||||
1) # Plasma Desktop:
|
||||
deskpkgs="${basepkgs[*]} plasma dolphin konsole"
|
||||
deskpkgs="${basepkgs[*]} dolphin-plugins konsole plasma plasma-x11-session qt6-multimedia-gstreamer"
|
||||
displaymanager="sddm"
|
||||
bluetooth="bluetooth"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
2) # Minimal Plasma Desktop + Apps:
|
||||
deskpkgs="${basepkgs[*]} plasma-desktop ark bluedevil breeze-gtk colord-kde dolphin ffmpegthumbs kate kcalc kclock kde-cli-tools kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdf kdialog keditbookmarks kget kimageformats kio-admin kio-extras kio-fuse kio-gdrive kio-zeroconf kompare konsole kscreen kwayland-integration kwrited okular purpose ocean-sound-theme packagekit-qt6 partitionmanager plasma5-integration plasma-browser-integration plasma-disks plasma-firewall plasma-integration plasma-nm plasma-pa plasma-systemmonitor plasma-wayland-protocols plasma-x11-session spectacle sddm-kcm 7zip alsa-firmware alsa-utils arj ccache exfatprogs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugin-qmlgl gst-plugins-ugly icoutils kvantum libappimage libfido2 libva-utils man-db man-pages mesa-utils nano-syntax-highlighting pacman-contrib pipewire-libcamera pipewire-zeroconf power-profiles-daemon powerline powerline-fonts qbittorrent qt6-imageformats reflector ttf-ubuntu-font-family unarchiver unrar vlc zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}"
|
||||
2) # Plasma Light Desktop:
|
||||
deskpkgs="${basepkgs[*]} ark bluedevil breeze-gtk colord-kde dolphin-plugins flatpak-kcm freerdp kate kcalc kclock kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdf kdialog keditbookmarks kget kimageformats kio-admin kio-gdrive kio-zeroconf konsole krdc krfb kscreen kwayland-integration kwrited okular purpose ocean-sound-theme packagekit-qt6 partitionmanager plasma5-integration plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-systemmonitor plasma-wayland-protocols plasma-x11-session sddm-kcm spectacle appmenu-gtk-module arj bluez-obex dosfstools ffmpegthumbs icoutils kvantum libappimage lrzip lzop maliit-keyboard ntfs-3g power-profiles-daemon qt5-xmlpatterns qt6-connectivity qt6-multimedia-gstreamer unarchiver unrar xdg-desktop-portal-gtk"
|
||||
displaymanager="sddm"
|
||||
bluetooth="bluetooth"
|
||||
network="NetworkManager"
|
||||
shell="zsh" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
3) # Gnome Desktop:
|
||||
deskpkgs="${basepkgs[*]} gnome"
|
||||
displaymanager="gdm"
|
||||
bluetooth="bluetooth"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
4) # Minimal Gnome Desktop + Apps:
|
||||
deskpkgs="${basepkgs[*]} dconf-editor file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gnome-user-share gvfs gvfs-afc gvfs-mtp loupe papers sushi 7zip alsa-firmware alsa-utils ccache exfatprogs git glib2-devel glibc-locales gnome-browser-connector gparted gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugin-qmlgl gst-plugins-ugly libfido2 libva-utils man-db man-pages meld mesa-utils nano-syntax-highlighting pacman-contrib pipewire-libcamera pipewire-zeroconf power-profiles-daemon powerline powerline-fonts qbittorrent reflector ttf-ubuntu-font-family unrar unzip vlc zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}"
|
||||
4) # Gnome Light Desktop:
|
||||
deskpkgs="${basepkgs[*]} dconf-editor file-roller gdm gnome-browser-connector gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gnome-user-share gvfs gvfs-afc gvfs-mtp gvfs-smb loupe papers sushi dosfstools glib2-devel gparted ntfs-3g power-profiles-daemon unrar unzip xorg-xhost zip"
|
||||
displaymanager="gdm"
|
||||
bluetooth="bluetooth"
|
||||
network="NetworkManager"
|
||||
shell="zsh" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
5) # Xfce Desktop:
|
||||
deskpkgs="${basepkgs[*]} xfce4 blueman gvfs lightdm-gtk-greeter network-manager-applet pavucontrol thunar-archive-plugin thunar-volman xfce4-battery-plugin xfce4-clipman-plugin xfce4-indicator-plugin xfce4-pulseaudio-plugin xfce4-screensaver xfce4-screenshooter xfce4-taskmanager xfce4-volumed-pulse xfce4-whiskermenu-plugin xfce4-power-manager"
|
||||
deskpkgs="${basepkgs[*]} blueman catfish ffmpegthumbnailer gvfs gvfs-afc gvfs-mtp gvfs-smb libgsf libopenraw lightdm-gtk-greeter mousepad mugshot network-manager-applet pavucontrol poppler-glib ristretto thunar-archive-plugin thunar-media-tags-plugin thunar-shares-plugin xfce4 xfce4-artwork xfce4-battery-plugin xfce4-clipman-plugin xfce4-datetime-plugin xfce4-indicator-plugin xfce4-mount-plugin xfce4-power-manager xfce4-pulseaudio-plugin xfce4-screensaver xfce4-screenshooter xfce4-taskmanager xfce4-whiskermenu-plugin xfce4-power-manager xiccd"
|
||||
displaymanager="lightdm"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
6) # Cinnamon Desktop:
|
||||
deskpkgs="${basepkgs[*]} cinnamon blueberry gnome-keyring lightdm-slick-greeter ${terminal}"
|
||||
deskpkgs="${basepkgs[*]} blueman cinnamon ffmpegthumbnailer gnome-color-manager gnome-keyring lightdm-slick-greeter touchegg wget ${terminal}"
|
||||
displaymanager="lightdm"
|
||||
bluetooth="bluetooth"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
7) # Deepin Desktop:
|
||||
deskpkgs="${basepkgs[*]} deepin deepin-kwin deepin-terminal"
|
||||
deskpkgs="${basepkgs[*]} adobe-source-han-sans-otc-fonts bluez deepin deepin-album deepin-calculator deepin-camera deepin-clipboard deepin-community-wallpapers deepin-compressor deepin-device-formatter deepin-editor deepin-font-manager deepin-grand-search deepin-kwin deepin-movie deepin-printer deepin-reader deepin-screensaver deepin-shortcut-viewer deepin-terminal gtk-engine-murrine iw proxychains-ng qt6-multimedia-gstreamer redshift zssh"
|
||||
displaymanager="lightdm"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
8) # Budgie Desktop:
|
||||
deskpkgs="${basepkgs[*]} budgie blueman lightdm-gtk-greeter papirus-icon-theme nautilus network-manager-applet ${terminal}"
|
||||
deskpkgs="${basepkgs[*]} blueman budgie gnome-user-share lightdm-gtk-greeter nautilus network-manager-applet openssh papirus-icon-theme power-profiles-daemon rygel ${terminal}"
|
||||
displaymanager="lightdm"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
9) # Lxqt Desktop:
|
||||
deskpkgs="${basepkgs[*]} lxqt blueman breeze-icons gvfs lxqt-archiver network-manager-applet sddm xscreensaver"
|
||||
deskpkgs="${basepkgs[*]} blueman breeze-icons gvfs gvfs-mtp kimageformats libarchive lxqt network-manager-applet oxygen-icons python-pyxdg qt6-imageformats qt6-multimedia-gstreamer sddm xscreensaver xsettingsd"
|
||||
displaymanager="sddm"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
10) # Mate Desktop:
|
||||
deskpkgs="${basepkgs[*]} mate blueman lightdm-gtk-greeter mate-media mate-power-manager mate-terminal network-manager-applet"
|
||||
deskpkgs="${basepkgs[*]} atril blueman caja-actions caja-audio-video-properties caja-open-terminal caja-sendto caja-share caja-wallpaper cpio engrampa eom gnome-keyring gtk-engine-murrine gtk-engines lightdm-gtk-greeter mate mate-applets mate-calc mate-icon-theme mate-icon-theme-faenza mate-media mate-netbook mate-power-manager mate-screensaver mate-system-monitor mate-terminal mate-user-share mate-utils mozo network-manager-applet pluma python-gobject unace unrar webp-pixbuf-loader xdg-user-dirs-gtk"
|
||||
displaymanager="lightdm"
|
||||
bluetooth="bluetooth"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
11) # Base System:
|
||||
deskpkgs="${basepkgs[*]}"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
|
||||
12) # Custom System:
|
||||
custarray=(base sudo "${custompkgs}" "${fstools}" "${kernel}" "${microcode}")
|
||||
custarray=(base sudo "${bootldr_pkgs}" "${custompkgs}" "${fstools}" "${kernel}" "${microcode}")
|
||||
|
||||
if [[ -n "${shell}" ]]; then
|
||||
custarray+=("${shell}")
|
||||
fi
|
||||
if [[ "${vendor}" == "Virtual Machine" ]]; then
|
||||
custarray+=("${vmpkgs}")
|
||||
else
|
||||
custarray+=(linux-firmware)
|
||||
fi
|
||||
if [[ -n "${bootldr_pkgs}" ]]; then
|
||||
custarray+=("${bootldr_pkgs}")
|
||||
fi
|
||||
if [[ -n "${ukify}" ]]; then
|
||||
custarray+=("${ukify}")
|
||||
fi
|
||||
@@ -6157,14 +6225,12 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
|
||||
if [[ -n "${web_browser}" ]]; then
|
||||
custarray+=("${web_browser}")
|
||||
fi
|
||||
deskpkgs="${custarray[*]}"
|
||||
shell="bash" ;;
|
||||
deskpkgs="${custarray[*]}" ;;
|
||||
|
||||
13) # Cosmic Desktop:
|
||||
deskpkgs="${basepkgs[*]} cosmic cosmic-player"
|
||||
deskpkgs="${basepkgs[*]} cosmic cosmic-player dconf packagekit power-profiles-daemon pulseaudio-alsa"
|
||||
displaymanager="cosmic-greeter"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
network="NetworkManager" ;;
|
||||
esac
|
||||
|
||||
pkg_displ
|
||||
@@ -6278,8 +6344,8 @@ MKINITCPIO
|
||||
127.0.1.1 ${HOSTNAME}.localdomain ${HOSTNAME}
|
||||
HOSTS
|
||||
echo root:${ROOTPASSWD2} | chpasswd || exit
|
||||
chsh -s /bin/${shell} || exit
|
||||
useradd -m -G wheel -s /bin/${shell} ${USERNAME} || exit
|
||||
chsh -s /bin/${shellname} || exit
|
||||
useradd -m -G wheel -s /bin/${shellname} ${USERNAME} || exit
|
||||
echo ${USERNAME}:${USERPASSWD2} | chpasswd || exit
|
||||
echo "%wheel ALL=(ALL) ALL" | tee /etc/sudoers.d/sudoersd || exit
|
||||
visudo -c /etc/sudoers.d/sudoersd || exit
|
||||
@@ -6677,7 +6743,7 @@ optimizations() {
|
||||
if [[ "${genoptm}" == "y" ]]; then
|
||||
local stage_prompt="General System Optimizations"
|
||||
if arch-chroot /mnt <<-GENOPTM > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
pacman -S --noconfirm ntfs-3g pbzip2 pigz || exit
|
||||
pacman -S --noconfirm ccache ntfs-3g pbzip2 pigz || exit
|
||||
sed -i 's/^#Color/Color\nILoveCandy/' /etc/pacman.conf || exit
|
||||
update-pciids || exit
|
||||
cat <<-MKINITCPIO >> /etc/mkinitcpio.conf.d/mkinitcpiod.conf || exit
|
||||
@@ -6792,15 +6858,15 @@ GENOPTM
|
||||
stage_fail
|
||||
fi
|
||||
|
||||
if [[ -f /mnt/etc/udisks2/mount_options.conf ]]; then
|
||||
if [[ -d /mnt/etc/udisks2 ]]; then
|
||||
local stage_prompt="Udisks2 Mount Options"
|
||||
if arch-chroot /mnt <<-UDISKS2 > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
cat <<-UDISKS_CONF > /etc/udisks2/mount_options.conf || exit
|
||||
[defaults]
|
||||
ntfs_drivers=ntfs,ntfs3
|
||||
ntfs:ntfs_defaults=uid=*,gid=*,iocharset=utf8,windows_names
|
||||
ntfs:ntfs3_defaults=uid=*,gid=*,iocharset=utf8,windows_names
|
||||
exfat_defaults=uid=*,gid=*,iocharset=utf8,errors=remount-ro
|
||||
ntfs_drivers=ntfs3,ntfs
|
||||
ntfs:ntfs3_defaults=uid=*,gid=*,windows_names
|
||||
ntfs:ntfs_defaults=uid=*,gid=*,windows_names
|
||||
exfat_defaults=uid=*,gid=*,errors=remount-ro
|
||||
UDISKS_CONF
|
||||
UDISKS2
|
||||
stage_ok
|
||||
@@ -7164,7 +7230,7 @@ CUSTOMSERV
|
||||
tty="$(tty)"
|
||||
disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)"
|
||||
trg=""
|
||||
vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" gfxconf="" gfx_conf="" gfx_setup="" vendor="" vendor1="" vendor2="" vendor3="" vendor_slct="" packages="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" revision="" greeternmbr="" cust_bootopts="" bluetooth="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" zram_bootopts="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" vendors="" dev="" web="" web_browser="" printer="" print_pkgs="" shell="" genoptm="" set_optm="" ask_param="" desk_setup="" web_slct="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="")
|
||||
vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" gfxconf="" gfx_conf="" gfx_setup="" vendor="" vendor1="" vendor2="" vendor3="" vendor_slct="" packages="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" revision="" greeternmbr="" cust_bootopts="" bluetooth="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" zram_bootopts="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" vendors="" dev="" web="" web_browser="" printer="" print_pkgs="" shellnmbr="" shell="" shellname="" shellname2="" shell_pkgs="" genoptm="" set_optm="" ask_param="" desk_setup="" web_slct="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="")
|
||||
export "${vars[@]}"
|
||||
clear
|
||||
first_check
|
||||
|
||||
Reference in New Issue
Block a user