Remove alternative elogind option

3 files changed, 6 insertions, 26 deletions

diff --git a/README.org b/README.org
index 02a81d9..0b4222e 100644
--- a/README.org
+++ b/README.org
@@ -54,7 +54,6 @@ 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, [[https://sr.ht/~kennylevinsen/seatd/][seatd]] and [[https://github.com/chimera-linux/turnstile][turnstile]] is used                           |
 | =greeter=      | greetd         | enables greetd with [[https://github.com/apognu/tuigreet][tuigreet]] or the default =agetty= login prompt |
 
 * Notes
diff --git a/config b/config
index 6e4170a..4280f29 100644
--- a/config
+++ b/config
@@ -38,9 +38,6 @@ locale=en_GB
 autologin=false
 #greeter=greetd
 
-# Use elogind, if false setup uses seatd & turnstile instead
-elogind=true
-
 encrypt=true
 
 # Arch
diff --git a/install.sh b/install.sh
index 5012811..661c078 100755
--- a/install.sh
+++ b/install.sh
@@ -170,16 +170,7 @@ mount "${boot}" /mnt/boot
 pacman -Syy
 
 # Base packages
-basestrap /mnt \
-          base base-devel \
-          dinit
-
-if [[ "${elogind}" == true ]]; then
-    basestrap /mnt elogind-dinit
-else
-    # install seatd & turnstile in-place of elogind
-    basestrap /mnt seatd-dinit turnstile-dinit
-fi
+basestrap /mnt base base-devel dinit elogind-dinit
 
 # Linux & utilities
 basestrap /mnt --needed \
@@ -221,7 +212,6 @@ basestrap /mnt --needed \
 
 # Enable services
 services="dbus ufw iwd dhcpcd ntpd"
-[[ "${elogind}" == false ]] && services+=" turnstiled seatd"
 
 # Generate file-system table
 fstabgen -L /mnt >> /mnt/etc/fstab
@@ -260,7 +250,6 @@ EOF
 artix-chroot /mnt bash -c "echo root:artix | chpasswd"
 
 # Add new user
-[[ "${elogind}" == false ]] && user_groups+=",seat"
 artix-chroot /mnt bash -c "useradd -mG ${user_groups} ${user}"
 artix-chroot /mnt bash -c "echo \"${user}:${password}\" | chpasswd"
 
@@ -331,22 +320,17 @@ done
 # Enable firewall
 sed "s/ENABLED=no/ENABLED=yes/" -i /mnt/etc/ufw/ufw.conf
 
-# When using elogind
-if [[ "${elogind}" == false ]]; then
-    # Manage rundir with turnstile when not using elogind
-    sed "s/manage_rundir = no/manage_rundir = yes/" -i /mnt/etc/turnstile/turnstiled.conf
-else
-    # Enable iwd's DHCP client (in-place of dhcpcd when using elogind)
-    [[ ! -d /mnt/etc/iwd ]] && mkdir /mnt/etc/iwd
-    echo "
+# Enable iwd's DHCP client (instead of dhcpcd)
+[[ ! -d /mnt/etc/iwd ]] && mkdir /mnt/etc/iwd
+echo "
 [General]
 EnableNetworkConfiguration=true
 
 [Network]
 NameResolvingService=resolvconf
 " > /mnt/etc/iwd/main.conf
-    unlink /mnt/etc/dinit.d/boot.d/dhcpcd
-fi
+
+unlink /mnt/etc/dinit.d/boot.d/dhcpcd
 
 # Set MAKEFLAGS to match CPU threads for faster compiling
 cp /etc/makepkg.conf /etc/makepkg.conf.bak