From 14e4646f0bc995a766113b83ecbe95e513c125e7 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sat, 19 Oct 2019 00:18:21 -0700
Subject: [PATCH] Move base-devel out of base_pkgs, add base_pkgs for live
 session

---
 archlabs-installer | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/archlabs-installer b/archlabs-installer
index e87533d..224605f 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -5,7 +5,7 @@
 # Some ideas and code reworked from other resources
 # AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due
 
-VER=2.0.85
+VER=2.0.86
 
 # bulk default values {
 
@@ -23,7 +23,7 @@ RUN=/run/archiso/bootmnt/arch/boot # path for live system /boot
 VM="$(dmesg | grep -i hypervisor)" # system running in a virtual machine
 export DIALOGOPTS="--cr-wrap"      # see `man dialog`
 
-BASE_PKGS="base base-devel xorg xorg-drivers sudo git gvfs gtk3 libmad libmatroska tumbler "
+BASE_PKGS="base xorg xorg-drivers sudo git gvfs gtk3 libmad libmatroska tumbler "
 BASE_PKGS+="playerctl pulseaudio pulseaudio-alsa pavucontrol pamixer scrot xdg-user-dirs "
 BASE_PKGS+="ffmpeg gstreamer gst-libav gst-plugins-base gst-plugins-good bash-completion xterm"
 
@@ -1329,6 +1329,7 @@ install_user()
 	errshow 1 "useradd -m -u 1000 -g users -G $groups -s /bin/$MYSHELL $NEWUSER"
 	chrun "chpasswd <<< '$NEWUSER:$USER_PASS'" 2>$ERR 2>&1
 	errshow 1 "set $NEWUSER password"
+	chrun "pamixer --unmute"
 
 	if [[ $INSTALL_WMS == *dwm* ]];then
 		install_suckless "/home/$NEWUSER" chroot
@@ -1418,8 +1419,8 @@ install_packages()
 	fi
 
 	# update and install crucial packages first to avoid issues
-	chrun "pacman -Syyu $KERNEL $BASE_PKGS ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed" 2>$ERR 2>&1
-	errshow 1 "pacman -Syyu $KERNEL $BASE_PKGS ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed"
+	chrun "pacman -Syyu $KERNEL $BASE_PKGS base-devel ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed" 2>$ERR 2>&1
+	errshow 1 "pacman -Syyu $KERNEL $BASE_PKGS base-devel ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed"
 
 	# remove the packages we don't want on the installed system
 	[[ $rmpkg ]] && chrun "pacman -Rnsc $rmpkg --noconfirm"
@@ -2182,20 +2183,22 @@ live()
 	elif ! net_connect; then
 		msg "Not Connected" "\nRunning live requires an active internet connection.\n\nExiting..\n" 2
 		die 1
-	elif (( $(awk '/MemTotal/ {print int($2 / 1024)}' /proc/meminfo) < 4096)); then
-		msg "Not Enough Memory" "\nRunning live requires at least 4G of system memory.\n\nExiting..\n" 2
+	elif (( $(awk '/MemTotal/ {print int($2 / 1024)}' /proc/meminfo) < 2500)); then
+		msg "Not Enough Memory" "\nRunning live requires at least 2.5G of system memory.\n\nExiting..\n" 2
 		die 1
 	else
 		clear
+		echo "Sorting mirrorlist first"
 		mount /run/archiso/cowspace -o remount,size=2G
 		install_mirrorlist "/etc/pacman.d/mirrorlist"
-		pacman -Syyu archlinux-keyring --needed --noconfirm || die 1
-		pacman -S $AL_BASE_PKGS xterm xorg-xinit xorg-server --needed --noconfirm || die 1
+		pacman -Syyu --noconfirm || die 1
+		pacman -S $BASE_PKGS $AL_BASE_PKGS xorg-xinit --needed --noconfirm || die 1
 		case "$ses" in
 			i3-gaps|openbox|fluxbox|bspwm|awesome) pacman -S "$ses" $WM_BASE_PKGS ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
 			gnome|plasma|cinnamon|xfce4) pacman -S "$ses" ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
 			dwm) { pacman -S git --needed --noconfirm || die 1; }; install_suckless "/root" nochroot ;;
 		esac
+		pamixer --unmute
 		pacman -Scc --noconfirm
 		rm -rf "/var/cache/pacman/pkg/"*
 		cp -rfT /etc/skel /root || die 1