From ab0c36ff5f6ecc8de68a02991756a78937b27379 Mon Sep 17 00:00:00 2001
From: BodgeMaster <>
Date: Sat, 15 Jul 2023 02:28:39 +0200
Subject: [PATCH] package selections/desktop: update all entries to match TODO
 list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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                      | 34 ++++++--------------------
 package_selections/desktop/icewm-fancy | 14 -----------
 package_selections/desktop/icewm-full  | 13 ++++++++++
 package_selections/desktop/icewm-light | 14 -----------
 package_selections/desktop/icewm-lite  | 13 ++++++++++
 package_selections/desktop/none        |  2 +-
 package_selections/desktop/openbox     | 15 ------------
 package_selections/desktop/options.lst |  5 ++--
 8 files changed, 36 insertions(+), 74 deletions(-)
 delete mode 100644 package_selections/desktop/icewm-fancy
 create mode 100644 package_selections/desktop/icewm-full
 delete mode 100644 package_selections/desktop/icewm-light
 create mode 100644 package_selections/desktop/icewm-lite
 delete mode 100644 package_selections/desktop/openbox

diff --git a/notes_to_self.txt b/notes_to_self.txt
index 37d4ddf..a76d835 100644
--- a/notes_to_self.txt
+++ b/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?
-replace package selections with these options:
-  nvidia
-    keep the old selections
+package 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
-      packages
-        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
+        configure conky
+    icewm-lite
       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
-      no packages
+    none
       post-install
         add ultimate.bashrc
         modify bashrc to display README
diff --git a/package_selections/desktop/icewm-fancy b/package_selections/desktop/icewm-fancy
deleted file mode 100644
index 5da2c51..0000000
--- a/package_selections/desktop/icewm-fancy
+++ /dev/null
@@ -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
-}
diff --git a/package_selections/desktop/icewm-full b/package_selections/desktop/icewm-full
new file mode 100644
index 0000000..6261188
--- /dev/null
+++ b/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
+}
diff --git a/package_selections/desktop/icewm-light b/package_selections/desktop/icewm-light
deleted file mode 100644
index 135a1ff..0000000
--- a/package_selections/desktop/icewm-light
+++ /dev/null
@@ -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
-}
diff --git a/package_selections/desktop/icewm-lite b/package_selections/desktop/icewm-lite
new file mode 100644
index 0000000..3c3de18
--- /dev/null
+++ b/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
+}
diff --git a/package_selections/desktop/none b/package_selections/desktop/none
index 7961c07..d50091f 100644
--- a/package_selections/desktop/none
+++ b/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=""
 
diff --git a/package_selections/desktop/openbox b/package_selections/desktop/openbox
deleted file mode 100644
index 8106350..0000000
--- a/package_selections/desktop/openbox
+++ /dev/null
@@ -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
-}
diff --git a/package_selections/desktop/options.lst b/package_selections/desktop/options.lst
index 36c89ec..25f975f 100644
--- a/package_selections/desktop/options.lst
+++ b/package_selections/desktop/options.lst
@@ -1,4 +1,3 @@
-icewm-fancy
-icewm-light
-openbox
+icewm-full
+icewm-lite
 none