Add option to use elogind

3 files changed, 28 insertions, 9 deletions

diff --git a/README.org b/README.org
index e2eda08..904acdf 100644
--- a/README.org
+++ b/README.org
@@ -55,6 +55,7 @@ Configuration options are available in the =config= file.
 | =arch_support= | false          | enables extra & multilib repositories            |
 | =enable_aur=   | false          | installs the =trizen= AUR helper                   |
 | =autologin=    | false          | automatically login system                       |
+| =elogind=      | true           | if false, =seatd= and =turnstile= is used            |
 
 * Notes
 Last tested using =artix-base-dinit-20240823-x86_64.iso= on a UEFI system.
diff --git a/config b/config
index e64d3e9..0b83351 100644
--- a/config
+++ b/config
@@ -44,6 +44,9 @@ locale=en_GB
 # Login
 autologin=false
 
+# Use elogind, if false setup uses seatd & turnstile instead
+elogind=true
+
 # NOTE: encryption not currently working
 encrypt=false
 
diff --git a/install.sh b/install.sh
index 4eadbdf..3d89926 100644
--- a/install.sh
+++ b/install.sh
@@ -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