diff options
Diffstat (limited to 'install.sh')
| -rw-r--r-- | install.sh | 33 |
1 files changed, 24 insertions, 9 deletions
@@ -36,7 +36,7 @@ ping -c 3 artixlinux.org &> /dev/null \ dinitctl start ntpd # Read password -echo "Enter a password for ${user} (also used for encryption if enabled)" +echo "Enter a password for ${user}" while true; do read -sr -p "Password: " password printf "\n" @@ -197,16 +197,26 @@ pacman -Syy # Install base packages basestrap /mnt \ - base base-devel booster artools-base\ - dinit seatd-dinit \ - turnstile-dinit pambase + base base-devel \ + booster dinit + +if [[ "${elogind}" == true ]]; then + basestrap /mnt elogind-dinit +else + # install seatd & turnstile in-place of elogind + basestrap /mnt seatd-dinit turnstile-dinit +fi # Install Linux & utilities basestrap /mnt \ linux linux-firmware \ grub efibootmgr os-prober \ - btrfs-progs \ - git vim man-{db,pages} + btrfs-progs artools-base \ + git man-{db,pages} nano + +# Install minimal packages +basestrap /mnt \ + stow vim btop tmux # Get CPU type for microcode ucode=amd-ucode @@ -220,11 +230,14 @@ if [[ "${encrypt}" == true ]]; then basestrap /mnt cryptsetup-dinit fi +# Install services basestrap /mnt --needed \ - {iwd,dhcpcd,openntpd,cronie,openssh,ufw,dbus,seatd}-dinit + {iwd,dhcpcd,openntpd,cronie,openssh,ufw,dbus}-dinit # Enable services -services="dbus ufw iwd dhcpcd ntpd cronie turnstiled seatd" +services="dbus ufw iwd ntpd" +[[ "${elogind}" == false ]] && services+=" dhcpcd turnstiled seatd" + # NOTE: do not quote 'services' variable or space is ignored for service in ${services}; do artix-chroot /mnt bash -c \ @@ -296,7 +309,9 @@ sed "s/# Misc options/# Misc options\n${pac_options}/g" \ sed "s/ENABLED=no/ENABLED=yes/" -i /mnt/etc/ufw/ufw.conf # Enable turnstile rundir -sed "s/manage_rundir = no/manage_rundir = yes/" -i /mnt/etc/turnstile/turnstiled.conf +if [[ "${elogind}" == false ]]; then + sed "s/manage_rundir = no/manage_rundir = yes/" -i /mnt/etc/turnstile/turnstiled.conf +fi # Set MAKEFLAGS to match CPU threads for faster compiling cp /etc/makepkg.conf /etc/makepkg.conf.bak |