From 41974531f9ca64246a6c5f71fc5a1a2df6a04497 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Thu, 29 Sep 2022 19:29:06 -0700
Subject: [PATCH] Remove firmware packages causing issues

---
 installer | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/installer b/installer
index a64aea7..880afa6 100755
--- a/installer
+++ b/installer
@@ -6,7 +6,7 @@
 # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
 
 # shellcheck disable=2086,2046,2254,2164,2030,2031,2001
-VER=2.20
+VER=2.22
 
 # default values {
 
@@ -105,7 +105,6 @@ typeset -a WM_PKGS=(
 
 # packages installed to parity the .iso {
 typeset -a ISO_PKGS=(
-"arch-install-scripts"
 "crda"
 "ddrescue"
 "dhclient"
@@ -121,8 +120,6 @@ typeset -a ISO_PKGS=(
 "fsarchiver"
 "hdparm"
 "iputils"
-"ipw2100-fw"
-"ipw2200-fw"
 "lftp"
 "linux-firmware"
 "linux-firmware-marvell"
@@ -2063,8 +2060,8 @@ install_tearfree()
 {
 	if [[ $VIRT != 'none' ]]; then
 		[[ -e "$MNT/etc/X11/xorg.conf.d/40-touchpad.conf" ]] && rm -fv "$MNT/etc/X11/xorg.conf.d/40-touchpad.conf"
-	else
-		if lspci | grep ' VGA ' | grep -q 'Intel'; then
+	elif [[ $TEARFREE ]]; then
+		if lspci | grep ' VGA ' | grep -q 'Intel' && ! lspci | grep ' VGA ' | grep -qi 'NVIDIA'; then
 			echo "Creating Intel Tear Free config /etc/X11/xorg.conf.d/20-intel.conf"
 			cat > "$MNT/etc/X11/xorg.conf.d/20-intel.conf" <<- EOF
 			Section "Device"
@@ -2205,7 +2202,9 @@ config_console()
 		cat > "$AUTOLOGIN_SERV/autologin.conf" <<- EOF
 		[Service]
 		ExecStart=
-		ExecStart=-/sbin/agetty -o '-p -f -- \\\u' --noclear --autologin $NEWUSER - \$TERM
+		ExecStart=-/sbin/agetty -o '-p -f -- \\\u' --noclear --autologin $NEWUSER %I \$TERM
+		Type=simple
+		Environment=XDG_SESSION_TYPE=x11
 		EOF
 	else
 		rm -rf "$AUTOLOGIN_SERV"
@@ -2221,7 +2220,7 @@ config_console()
 		echo \$PATH | grep -q "\$HOME/.local/bin:" || export PATH="\$HOME/.local/bin:\$PATH"
 
 		# automatically run startx when logging in on tty1
-		[ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && sleep 2 && startx
+		[ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && startx
 		EOF
 	else
 		rm -rf "$MNT/home/$NEWUSER/.xinitrc" "$MNT/root/.xinitrc"
@@ -3536,7 +3535,7 @@ fi
 
 trap 'printf "\n^C\n" && die 1' INT
 
-while getopts ":hcnrfDb:m:d:" OPT; do
+while getopts ":hcnrfDtb:m:d:" OPT; do
 	case "$OPT" in
 		D) debug ;;
 		h) usage "${0##*/}" ;;
@@ -3545,6 +3544,7 @@ while getopts ":hcnrfDb:m:d:" OPT; do
 		d) DIST="$OPTARG" ;;
 		c) NONET=true ;;
 		f) NOFONT=true ;;
+		t) TEARFREE=true ;;
 		r)
 			if [[ ! -b $OPTARG ]]; then
 				msg "Invalid Root" "\nThe installer expects a full path to a block device for root, e.g. /dev/sda2.\n\nExiting..\n" 2