gein.sh: Update config command; Formatting cleanup

gein.sh

@@ -155,11 +155,11 @@ BOOTSTRAP() {
         cp "$0" /mnt/gentoo/ &&
         cd /mnt/gentoo &&
 
-    echo "gein: Setting system time via ntpd..."
+        echo "gein: Setting system time via ntpd..."
     [ -x "$(command -v ntpd)" ] &&
         ntpd -q -g &&
 
-    echo "gein: Downloading and extracting Stage3 tarball..."
+        echo "gein: Downloading and extracting Stage3 tarball..."
     if [ -n "$Stage3" ]; then
         $Wget "$Stage3" &&
             tar -xpf stage3-* --xattrs --numeric-owner &&
@@ -202,7 +202,7 @@ BOOTSTRAP() {
     echo "gein: Copying '/etc/resolv.conf'..." &&
         cp -L /etc/resolv.conf /mnt/gentoo/etc/ &&
 
-    echo "gein: Chroot'ing into /mnt/gentoo..." &&
+        echo "gein: Chroot'ing into /mnt/gentoo..." &&
         chroot /mnt/gentoo /usr/bin/env -i \
                HOME="/root" TERM="$TERM" PS1="[chroot \u@\h \W]$ " \
                PATH="/usr/local/sbin/:/usr/local/bin:/usr/sbin" \
@@ -219,13 +219,13 @@ BOOTSTRAP() {
 MINIMAL() {
     echo "gein: getting configuration files from 'cfg'..." &&
         $Wget $Config/cfg.sh &&
-        source cfg.sh &&
+        source ./cfg.sh -g &&
 
-    echo "gein: Setting CPU cores and GPU type..." &&
+        echo "gein: Setting CPU cores and GPU type..." &&
         sed -i "s/Video_Cards/$VideoCards/g; s/Make_Opts/-j$CPUCores/g" \
             /etc/portage/make.conf &&
 
-    echo "gein: Syncing Portage and selecting profile..." &&
+        echo "gein: Syncing Portage and selecting profile..." &&
         emerge -q --sync &&
         eselect profile list $ProfileFilter &&
         echo "gein: choose the latest stable release" &&
@@ -236,11 +236,11 @@ MINIMAL() {
         eselect profile set "$TargetProfile" &&
         $Emerge -uDN @world &&
 
-    echo "gein: Setting timezone..." &&
+        echo "gein: Setting timezone..." &&
         echo "$TimeZone" > /etc/timezone &&
         $Emerge --config sys-libs/timezone-data &&
 
-    echo "gein: Setting locale..." &&
+        echo "gein: Setting locale..." &&
         echo "$Locale" > /etc/locale.gen &&
         locale-gen && locale -a &&
         LocaleMain=$(echo $Locale | awk -F '[-]' '{print $1}') &&
@@ -253,10 +253,10 @@ MINIMAL() {
     echo "gein: Emerging minimal packages..." &&
         $Emerge @gein-base &&
 
-    if grep -Rqi 'intel' /proc/cpuinfo; then
-        echo "gein: emerging intel-microcode" &&
-            $Emerge intel-microcode
-    fi
+        if grep -Rqi 'intel' /proc/cpuinfo; then
+            echo "gein: emerging intel-microcode" &&
+                $Emerge intel-microcode
+        fi
 
     echo "gein: Configuring Linux kernel..."
     cd /usr/src/linux
@@ -284,18 +284,18 @@ MINIMAL() {
         $Make distclean &&
         cd / &&
 
-    echo "gein: Adding services to OpenRC..." &&
+        echo "gein: Adding services to OpenRC..." &&
         rc-update add dhcpcd default &&
         rc-update add cronie default &&
 
-    echo "gein: Setting hostname..." &&
+        echo "gein: Setting hostname..." &&
         echo "hostname=$Hostname" > /etc/conf.d/hostname &&
 
-    echo "gein: Installing Grub to $PartitionBoot..." &&
+        echo "gein: Installing Grub to $PartitionBoot..." &&
         grub-install "$PartitionBoot" &&
         grub-mkconfig -o /boot/grub/grub.cfg &&
 
-    echo "gein: Setting root password..."
+        echo "gein: Setting root password..."
     [ -x $(command -v chpasswd) ] && \
         echo "root:$Hostname" | chpasswd
 }
@@ -376,7 +376,7 @@ case $1 in
                 DesktopChoice="@gein-lxqt"
                 MINIMAL && DESKTOP &&
 
-                echo "azryn: Set SDDM as the display manager" &&
+                    echo "azryn: Set SDDM as the display manager" &&
                     sed -i 's/DISPLAYMANAGER="xdm"/DISPLAYMANAGER="sddm"/g' \
                         /etc/conf.d/xdm &&
                     sed -i 's/startl|xqt/"ck-launch-session dbus-launch startlxqt"/g' \