From ab643323f3cbd04b9743373c81a508f0d08340d5 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sat, 21 Dec 2019 16:29:17 -0800
Subject: [PATCH] Add auto startx when using xinit regardless of autologin

---
 archlabs-installer | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/archlabs-installer b/archlabs-installer
index 9d783d1..9044848 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -1678,13 +1678,15 @@ xinit_config()
 		ExecStart=
 		ExecStart=-/sbin/agetty --autologin $NEWUSER --noclear %I 38400 linux
 		EOF
-		cat > "$MNT/home/$NEWUSER/$LOGINRC" <<- EOF
-		# automatically run startx when logging in on tty1
-		[ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && startx
-		EOF
 	else
 		rm -rf "$AUTOLOGIN_SERV"
 	fi
+
+	# run `startx` after logging in regardless of autologin
+	cat > "$MNT/home/$NEWUSER/$LOGINRC" <<- EOF
+	# automatically run startx when logging in on tty1
+	[ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && startx
+	EOF
 }
 
 lightdm_config()