From e0bb71db98b833e73fc4371a5488662332ce6151 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sat, 12 Jan 2019 03:16:19 -0800
Subject: [PATCH] Remove skel copy to user home, lump package installs together

---
 src/archlabs-installer | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/archlabs-installer b/src/archlabs-installer
index 7743f5b..8500685 100755
--- a/src/archlabs-installer
+++ b/src/archlabs-installer
@@ -8,7 +8,7 @@
 # Some ideas and code has been taken from other installers
 # AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due
 
-VER="1.8.14"     # version
+VER="1.8.15"     # version
 DIST="ArchLabs"  # distributor
 MNT="/mnt"       # mountpoint
 
@@ -1306,8 +1306,6 @@ create_user()
     echeck "useradd -m -u 1000 -g users -G $groups -s $MYSHELL $NEWUSER"
     chrun "chpasswd <<< '$NEWUSER:$USER_PASS'"
 
-    cp -rfv /etc/skel/. $MNT/home/$NEWUSER/
-
     # for neovim set up ~/.config/nvim
     if [[ $PACKAGES =~ neovim ]]; then
         mkdir -p $MNT/home/$NEWUSER/.config/nvim
@@ -1468,13 +1466,12 @@ package_operations()
     fi
     chrun "pacman -Rns $rmpkg --noconfirm"
     chrun "pacman -S iputils --noconfirm"
-    chrun "pacman -S $inpkg --needed --noconfirm"
-    chrun "pacman -S archlabs-common archlabs-dARK archlabs-icons archlabs-scripts archlabs-skel-base archlabs-wallpapers gtk-engine-murrine gtk3 pavucontrol xdg-user-dirs tumbler base base-devel sudo git udisks2 mesa xorg-server xorg-apps xorg-drivers playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good --needed --noconfirm"
+    chrun "pacman -S $inpkg archlabs-common archlabs-dARK archlabs-icons archlabs-scripts archlabs-skel-base archlabs-wallpapers gtk-engine-murrine gtk3 pavucontrol tumbler base base-devel sudo git udisks2 mesa xorg-server xorg-apps xorg-drivers playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good --needed --noconfirm"
     if [[ $LOGIN_TYPE == 'xinit' ]]; then
         chrun "pacman -S xorg-xinit --needed --noconfirm"
     fi
     if [[ $inpkg =~ (openbox|dwm|bspwm|i3) ]]; then
-        chrun "pacman -S arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome volumeicon xclip xdotool compton gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings laptop-detect --needed --noconfirm"
+        chrun "pacman -S arandr archlabs-networkmanager-dmenu xdg-user-dirs nitrogen polkit-gnome volumeicon xclip xdotool compton gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings laptop-detect --needed --noconfirm"
     fi
 
     sed -i "s/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" $MNT/etc/sudoers
@@ -2708,10 +2705,12 @@ for arg in "$@"; do
 done
 
 # initial prep
-# select_language
+
+#select_language
 src $LNG/english.trans
 FONT="ter-i16n"
 LOC="en_US.UTF-8"
+
 select_keymap
 system_checks
 system_identify