package selections/desktop: update all entries to match TODO list

Making everything fully modular is nice but simply too much work to be reasonable.
To keep my sanity, I’ve decided to cut the feature creep here and return to only offering two options for desktop setups.

notes_to_self.txt

@@ -1,4 +1,5 @@
 TODO:
+make sure that gufw works as intended
 check for Nvidia Optimus support - or make it happen somehow
 compare sizes of glibc and musl installations
 need xdg menu maker?
@@ -23,27 +24,14 @@ first run message in .xinitrc.d
 add online check to all the selections that need internet
 sort out /etc/resolv.conf for the chroot
 set keyboard layout for initramfs
-need some sort of notification handler?
+package selections:
-replace package selections with these options:
-  nvidia
-    keep the old selections
   desktop
-    full - install a well integrated set of desktop utilities and some nice extras
+    icewm-full
       packages
-        pipewire pavucontrol
-        setxkbmap xauth xorg-video-drivers mesa mesa-dri xorg-server elogind xorg-input-drivers xrandr acpilight xhost xinit xrdb xinput xgamma xset iceauth sessreg transset xcmsdb xkbutils xmodmap dejavu-fonts-ttf
-        elogind xdg-utils dbus-elogind dbus-elogind-libs dbus-elogind-x11
-        -> some minesweeper clone
-        network-manager-applet
         -> audio applet
-        conky
-        vlc
-        lxterminal
         -> system monitor, file browser, image viewer, text editor, archive manager
-        firefox
-        gufw
         -> GUI package manager? GUI update manager?
-        bash-completion
+        -> notification daemon?
       post-install
         add ultimate.bashrc
         add backgrounds
@@ -60,15 +48,8 @@ replace package selections with these options:
           symlink to /home/README.txt
         add a symlink ~/.local/bin/xterm that points to lxterminal
         configure icewm
-    lite - install a small set of desktop utilities
+        configure conky
-      packages
+    icewm-lite
-        pipewire pulsemixer
-        setxkbmap xauth xorg-video-drivers mesa mesa-dri xorg-server elogind xorg-input-drivers xrandr acpilight xhost xinit xrdb xinput xgamma xset iceauth sessreg transset xcmsdb xkbutils xmodmap dejavu-fonts-ttf
-        elogind xdg-utils dbus-elogind dbus-elogind-libs dbus-elogind-x11
-        xterm
-        htop
-        xfe
-        firefox
       post-install
         add ultimate.bashrc
         modify bashrc to auto-start X if not already running
@@ -80,8 +61,7 @@ replace package selections with these options:
         put README.txt with relevant information on root dir of F2FS partition
           symlink to /home/README.txt
         configure icewm
-    none - leave the system as is
+    none
-      no packages
       post-install
         add ultimate.bashrc
         modify bashrc to display README

package_selections/desktop/icewm-fancy

@@ -1,14 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  return 0
-}
-
-DESCRIPTION="BodgeMaster’s IceWM setup (recommended)"
-
-XORG_PACKAGES="setxkbmap xauth xorg-video-drivers mesa mesa-dri xorg-server elogind xorg-input-drivers xrandr acpilight xhost xinit xrdb xinput xgamma xset iceauth sessreg transset xcmsdb xkbutils xmodmap dejavu-fonts-ttf"
-# TODO
-PACKAGES="$XORG_PACKAGES icewm elogind"
-
-function post_install {
-  echo "desktop/icewm-fancy" >> /tmp/stage-2-choices
-}

package_selections/desktop/icewm-full

@@ -0,0 +1,13 @@
+function check {
+  [ "$INTERNET" = "down" ] && return 1
+  return 0
+}
+
+DESCRIPTION="Fully featured desktop with IceWM"
+
+# TODO
+PACKAGES="$(cat /opt/void-usb/installer/package_selections/desktop/resources/common_packages) pavucontrol network-manager-applet vlc lxterminal bash-completion gufw conky icewm firefox"
+
+function post_install {
+  echo "desktop/icewm-light" >> /tmp/stage-2-choices
+}

package_selections/desktop/icewm-light

@@ -1,14 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  return 0
-}
-
-DESCRIPTION="Lighter IceWM setup"
-
-XORG_PACKAGES="setxkbmap xauth xorg-video-drivers mesa mesa-dri xorg-server elogind xorg-input-drivers xrandr acpilight xhost xinit xrdb xinput xgamma xset iceauth sessreg transset xcmsdb xkbutils xmodmap dejavu-fonts-ttf"
-# TODO
-PACKAGES="$XORG_PACKAGES icewm elogind"
-
-function post_install {
-  echo "desktop/icewm-light" >> /tmp/stage-2-choices
-}

package_selections/desktop/icewm-lite

@@ -0,0 +1,13 @@
+function check {
+  [ "$INTERNET" = "down" ] && return 1
+  return 0
+}
+
+DESCRIPTION="Small desktop with IceWM"
+
+# TODO
+PACKAGES="$(cat /opt/void-usb/installer/package_selections/desktop/resources/common_packages) pulsemixer xterm icewm firefox htop xfe"
+
+function post_install {
+  echo "desktop/icewm-light" >> /tmp/stage-2-choices
+}

package_selections/desktop/none

@@ -2,7 +2,7 @@ function check {
   return 0
 }
 
-DESCRIPTION="No desktop - for advanced users that want to set things up themselves"
+DESCRIPTION="Leave the system as-is (no desktop)"
 
 PACKAGES=""
 

package_selections/desktop/openbox

@@ -1,15 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  return 0
-}
-
-# TODO: more information for the user
-DESCRIPTION="OpenBox window manager (even more lightweight???)"
-
-XORG_PACKAGES="setxkbmap xauth xorg-video-drivers mesa mesa-dri xorg-server elogind xorg-input-drivers xrandr acpilight xhost xinit xrdb xinput xgamma xset iceauth sessreg transset xcmsdb xkbutils xmodmap dejavu-fonts-ttf"
-# TODO
-PACKAGES="$XORG_PACKAGES xclock openbox elogind"
-
-function post_install {
-  echo "desktop/openbox" >> /tmp/stage-2-choices
-}

package_selections/desktop/options.lst

@@ -1,4 +1,3 @@
-icewm-fancy
+icewm-full
-icewm-light
+icewm-lite
-openbox
 none