gein.sh: Clarify desktop options

Readme.md

@@ -59,16 +59,15 @@ MBR.
           bootstrap    Bootstrap the stage3 tarball
 
         Post-bootstrap:
-          base         Basic headless server & development
-          minimal      X, i3wm, and base packages
-          complete     A complete LXQT Gentoo desktop
+          minimal      Headless installation
+          desktop      Desktop installation
 
 5. Uncomment and set the `PartitionBoot` & `VideoCards` variables. Both
 MUST be set or `gein.sh` will exit. If you don't need any video support,
 then set `VideoCards` to false.
 
         PartitionBoot="/dev/sda"
-        VideoCards="i915 i965 intel"
+        VideoCards="false"
 
 6. Start the bootstrap. Upon completion, the script will chroot into
 `/mnt/gentoo` so we may proceed to the next step.
@@ -79,8 +78,8 @@ then set `VideoCards` to false.
 
         $ sh ./gein.sh minimal
 
-8. Wait a few hours. You will be prompted as few times as possible, and
-as close to the beginning or end of the process.
+8. Wait a few hours. You will be prompted as few times as possible though
+prompts are at the very beginning or end of the process.
 
 9. Enjoy your new Gentoo installation!
 

etc/portage/sets/gein-lxqt

@@ -1,15 +1,12 @@
 # /etc/portage/sets/gein-complete
 
 ## Desktop
-app-office/libreoffice
 media-fonts/noto
 media-libs/alsa-lib
 media-sound/alsa-utils
 media-sound/pavucontrol
 media-sound/pulseaudio
-media-video/mpv
 sys-apps/mlocate
-www-client/chromium
 x11-apps/xset
 x11-apps/xsetroot
 x11-misc/xclip

gein.sh

@@ -55,9 +55,10 @@ CONFIG() {
         /etc/portage/package.use/defaults
         /etc/portage/package.use/multilib
         /etc/portage/package.use/packages
+
         /etc/portage/sets/gein-base
-        /etc/portage/sets/gein-minimal
-        /etc/portage/sets/gein-complete
+        /etc/portage/sets/gein-i3wm
+        /etc/portage/sets/gein-lxqt
         /etc/portage/sets/gein-laptop
 
         /etc/profile
@@ -281,7 +282,7 @@ BOOTSTRAP() {
 # In this section we will update various configuration files, select the
 # desired profile, compile the kernel, and install some basic packages.
 
-BASE() {
+MINIMAL() {
     CONFIG
 
     echo "gein: Setting CPU cores and GPU type..."
@@ -376,16 +377,6 @@ DESKTOP() {
     $Emerge "$DesktopChoice"
     rc-update add consolekit default
 
-    if echo "$DesktopChoice" | grep -iq "@gein-complete"; then
-        echo "azryn: Set SDDM as the display manager"
-        sed -i 's/DISPLAYMANAGER="xdm"/DISPLAYMANAGER="sddm"/g' \
-            /etc/conf.d/xdm
-        sed -i 's/startlxqt/"ck-launch-session dbus-launch startlxqt"/g' \
-            /usr/share/xsessions/lxqt.desktop
-        rc-update add xdm default
-        rc-update add dbus default
-    fi
-
     read -ep "gein: Install laptop packages? [Y/N]: " SetupUser
     if echo "$SetupUser" | grep -iq "^y"; then
         $Emerge @gein-laptop
@@ -429,30 +420,43 @@ case $1 in
         BOOTSTRAP
         ;;
 
-    base)
-        BASE && POSTINSTALL
-        ;;
-
     minimal)
-        if [ $VideoCards == 'false' ]; then
-            echo "gein: VideoCards is false, though this requires xorg drivers"
-            echo "gein: Exiting..."
-            exit
-        fi
-
-        DesktopChoice="@gein-minimal"
-        BASE && DESKTOP && POSTINSTALL
+        MINIMAL && POSTINSTALL
         ;;
 
-    complete)
-        if [ $VideoCards == 'false' ]; then
+    desktop)
+        if [ "$VideoCards" == 'false' ]; then
             echo "gein: VideoCards is false, though this requires xorg drivers"
             echo "gein: Exiting..."
             exit
         fi
 
-        DesktopChoice="@gein-complete"
-        BASE && DESKTOP && POSTINSTALL
+        case $2 in
+            i3wm)
+                DesktopChoice="@gein-i3wm"
+                MINIMAL && DESKTOP && POSTINSTALL
+                ;;
+
+            lxqt)
+                DesktopChoice="@gein-lxqt"
+                MINIMAL && DESKTOP
+
+                echo "azryn: Set SDDM as the display manager"
+                sed -i 's/DISPLAYMANAGER="xdm"/DISPLAYMANAGER="sddm"/g' \
+                    /etc/conf.d/xdm
+                sed -i 's/startlxqt/"ck-launch-session dbus-launch startlxqt"/g' \
+                    /usr/share/xsessions/lxqt.desktop
+                rc-update add xdm default
+                rc-update add dbus default
+
+                POSTINSTALL
+                ;;
+
+            *)
+                echo "gein desktop: Available options"
+                echo "  i3wm         i3wm desktop"
+                echo "  lxqt         LXQT desktop"
+        esac
         ;;
 
     *)
@@ -460,8 +464,7 @@ case $1 in
         echo "  bootstrap    Bootstrap the stage3 tarball"
         echo ""
         echo "Post-bootstrap:"
-        echo "  base         Basic headless server & development"
-        echo "  minimal      X, i3wm, and base packages"
-        echo "  complete     A complete LXQT Gentoo desktop"
+        echo "  minimal      Headless installation"
+        echo "  desktop      Desktop installation"
 esac
 shopt -u nocasematch