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.

install-stage1.sh

@@ -10,7 +10,7 @@ function press_any_key {
 }
 
 function are_you_really_really_sure {
-  echo "Enter the following to continue: $1"
+  echo "Enter the following exactly to continue: $1"
   read -p "> " DISCARD_ME
   echo ""
   if [ "$1" = "$DISCARD_ME" ]; then
@@ -86,13 +86,13 @@ KBD_LAYOUT="de-latin1"
 clear
 echo "Select the USB stick to install to (NAME column below)...
 "
-# exclude loop devices
+# exclude loop devices and optical drives
-lsblk --exclude 7 --nodeps --output NAME,SIZE,MODEL
+lsblk --exclude 7,11 --nodeps --output NAME,SIZE,MODEL
 echo ""
 read -p "> " TARGET_DISK
 
 while [ ! -b "/dev/$TARGET_DISK" ]; do
-  lsblk --exclude 7 --nodeps --output NAME,SIZE,MODEL
+  lsblk --exclude 7,11 --nodeps --output NAME,SIZE,MODEL
   echo "$TARGET_DISK is not a valid device!"
   read -p "> " TARGET_DISK
 done
@@ -136,7 +136,7 @@ fi
 echo -n "Wiping and partitioning storage... "
 # new GPT
 # 2M BIOS GRUB
-# 268M ESP
+# 66592 sectors ESP (first sector + 66591 sectors, the minimum to format FAT32 with default settings)
 # everything else one big partition
 echo "g
 n
@@ -146,7 +146,7 @@ n
 n
 
 
-+268M
++66591
 n
 
 
@@ -424,6 +424,12 @@ for I in ${!SECTIONS[@]}; do
   for J in ${!OPTIONS[@]}; do
     get_stage2_file "package_selections/${SECTIONS[$I]}/${OPTIONS[$J]}"
   done
+
+  get_stage2_file "package_selections/${SECTIONS[$I]}/additional_files.lst"
+  readarray -t FILES < "$STAGE2_DIR/package_selections/${SECTIONS[$I]}/additional_files.lst"
+  for J in ${!FILES[@]}; do
+    get_stage2_file "package_selections/${SECTIONS[$I]}/${FILES[$J]}"
+  done
 done
 
 mv /mnt/target/etc/sv/agetty-tty1/conf /mnt/target/etc/sv/agetty-tty1/conf.bak >> $LOGFILE 2>&1

kernel.d/pre-install/99-void-usb

@@ -1,24 +1,17 @@
 #!/usr/bin/env bash
 #
 # Kernel pre-install hook for Void-USB
-# This script removes old kernels when disk space is low.
+# This script removes old kernels to save disk space.
 #
 # Arguments: $1 package name, $2 kernel version
 PKGNAME="$1"
 VERSION="$2"
 
-MB_LOW=250
+KEEP_OLD_KERNELS=3
-MB_FREE="$(df --block-size=1M --output=avail /boot | tail -n1)"
 
-if [ "$MB_FREE" -lt "$MB_LOW" ]; then
+while [ "$(vkpurge list | wc -l)" -gt "$KEEP_OLD_KERNELS" ]; do
-  echo
   OLDEST_KERNEL="$(vkpurge list | sort | head -n1)"
-  if [ -z "$OLDEST_KERNEL" ]; then
-    echo -e "\033[31m================================================\n\033[33mWARNING:\033[0m Failed to find an old kernel to remove.\nThe /boot partition is running out of space.\nThis will become an issue if left unaddressed.\n\033[31m================================================\033[0m"
-  else
   echo "Removing old kernel $OLDEST_KERNEL using vkpurge..."
   vkpurge rm "$OLDEST_KERNEL"
   fi
-else
+done
-  echo "Not doing anything, /boot has plenty of space."
-fi

notes_to_self.txt

@@ -1,4 +1,6 @@
 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?
 adjust required USB stick and RAM size in README
@@ -11,34 +13,61 @@ make our own or extract (if feasible) kb selection and time zone selection to hi
   - potentially interesting packages
     - ckbcomp
     - kbd-data
-vkpurge old stuff - only keep 2 vkpurgeable kernels
-  - change kernel pre-install hook
 overview of the installation process at the start
 overall progress indication (step x out of y)
-exclude optical drives
-add bash completion along the line somewhere
-replace OpenBox with something lighter
-allow unprivileged users to mount / unmount disks in GUI sessions
 look into roxterm as an alternative terminal
-add a zram swap option to package_selections
 include arandr or something similar in fully featured desktop utils
 deal with the entropy thing that runs after rc.shutdown
-add firewall option to package_selections
+first run message in .xinitrc.d
-first run message in xinitrc
+  - auto-removes itself
-  - auto-disables itself
   - displays README.txt on root dir of the F2FS partition
-put a README.txt on root dir of F2FS partition
 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:
+  desktop
+    icewm-full
+      packages
+        -> audio applet
+        -> system monitor, file browser, image viewer, text editor, archive manager
+        -> GUI package manager? GUI update manager?
+        -> notification daemon?
+      post-install
+        add ultimate.bashrc
+        add backgrounds
+        modify bashrc to auto-start X if not already running
+        kick off scripts in .xinitrc.d from .xinitrc
+        exec icewm-session from .xinitrc
+        add to .xinitrc.d
+          choose random background
+          start pipewire, pipewire-pulse, wireplumber
+          start conky
+          start nm-applet, audio applet
+          display README
+        put README.txt with relevant information on root dir of F2FS partition
+          symlink to /home/README.txt
+        add a symlink ~/.local/bin/xterm that points to lxterminal
+        configure icewm
+        configure conky
+    icewm-lite
+      post-install
+        add ultimate.bashrc
+        modify bashrc to auto-start X if not already running
+        kick off scripts in .xinitrc.d from .xinitrc
+        exec icewm (not session) from .xinitrc
+        add to .xinitrc.d
+          start pipewire, pipewire-pulse, wireplumber
+          display README
+        put README.txt with relevant information on root dir of F2FS partition
+          symlink to /home/README.txt
+        configure icewm
+    none
+      post-install
+        add ultimate.bashrc
+        modify bashrc to display README
+        put README.txt with relevant information on root dir of F2FS partition
+          symlink to /home/README.txt
 
-when installing GUI also install elogind xdg-utils dbus-elogind dbus-elogind-libs dbus-elogind-x11
-allow backgrounds only for icewm-fancy
-when pre-configuring desktop
-  -> check if pipewire installed
-    -> add pipewire, pipewire-pulse, wireplumber
-  -> run IceWM directly if the lighter setup was selected
 
 musl downsides:
   - no nvidia drivers
@@ -48,7 +77,7 @@ musl upsides:
 
 Stage 1:
   -> select kb layout
-  -> select installation type (x86_32/x86_64/aarch64, glibc/musl)
+  -> select installation type (x86_32/x86_64, glibc/musl)
   -> configure time zone
     -> selection dialog?
     -> symlink /etc/localtime

package_selections/audio/description.txt

@@ -1 +0,0 @@
-Choose which audio packages to install

package_selections/audio/none

@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="No audio"
-
-PACKAGES=""
-
-function post_install {
-  echo "audio/none" >> /tmp/stage-2-choices
-}

package_selections/audio/options.lst

@@ -1,3 +0,0 @@
-pipewire
-pipewire-slim
-none

package_selections/audio/pipewire

@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Pipewire with GUI settings (Pavucontrol)"
-
-PACKAGES="pipewire pavucontrol"
-
-function post_install {
-  echo "audio/pipewire" >> /tmp/stage-2-choices
-}

package_selections/audio/pipewire-slim

@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Pipewire with text-based settings (pulsemixer)"
-
-PACKAGES="pipewire pulsemixer"
-
-function post_install {
-  echo "audio/pipewire-slim" >> /tmp/stage-2-choices
-}

package_selections/desktop/additional_files.lst

@@ -0,0 +1 @@
+resources/common_packages

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

package_selections/desktop/resources/common_packages

@@ -0,0 +1 @@
+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 pipewire

package_selections/extras/all

@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="All of the above"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  # TODO: configure desktop backgounds if using IceWM
-  echo "extras/all" >> /tmp/stage-2-choices
-}

package_selections/extras/all-no-minecraft

@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="All of the above except Minecraft"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  # TODO: configure desktop backgounds if using IceWM
-  echo "extras/all-no-minecraft" >> /tmp/stage-2-choices
-}

package_selections/extras/description.txt

@@ -1 +0,0 @@
-Choose some extras to install

package_selections/extras/desktop-backgrounds

@@ -1,19 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-DESCRIPTION="Add some desktop backgrounds and randomly choose one on login"
-
-PACKAGES=""
-
-function post_install {
-  # TODO: install wget
-  # TODO: configure
-  # TODO: remove wget
-  echo "extras/desktop-backgrounds" >> /tmp/stage-2-choices
-}

package_selections/extras/minecraft

@@ -1,17 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Prism Launcher for Minecraft"
-
-#TODO: Java stuff
-PACKAGES="PrismLauncher"
-
-function post_install {
-  echo "extras/minecraft" >> /tmp/stage-2-choices
-}

package_selections/extras/minesweeper

@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="??? (Minesweeper)"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "extras/minesweeper" >> /tmp/stage-2-choices
-}

package_selections/extras/none

@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="None"
-
-PACKAGES=""
-
-function post_install {
-  echo "extras/none" >> /tmp/stage-2-choices
-}

package_selections/extras/options.lst

@@ -1,7 +0,0 @@
-desktop-backgrounds
-minesweeper
-snake
-minecraft
-all-no-minecraft
-all
-none

package_selections/extras/snake

@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="nSnake"
-
-#TODO
-PACKAGES="nSnake"
-
-function post_install {
-  echo "extras/snake" >> /tmp/stage-2-choices
-}

package_selections/multimedia/description.txt

@@ -1 +0,0 @@
-Install a media player?

package_selections/multimedia/none

@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="No"
-
-PACKAGES=""
-
-function post_install {
-  echo "multimedia/none" >> /tmp/stage-2-choices
-}

package_selections/multimedia/options.lst

@@ -1,2 +0,0 @@
-vlc
-none

package_selections/multimedia/vlc

@@ -1,17 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Install VLC"
-
-#TODO: fluidsynth MIDI stuff
-PACKAGES="vlc"
-
-function post_install {
-  echo "multimedia/vlc" >> /tmp/stage-2-choices
-}

package_selections/nvidia/description.txt

@@ -2,8 +2,9 @@ Do you want to install the proprietary Nvidia driver?
 
 By default, Void Linux ships with the open-source nouveau driver.
 This is nice because it gets the system up and running when using an
-Nvidia GPU but, due to Nvidia’s secrecy, it isn’t particularly good.
+Nvidia GPU but, due to Nvidia’s secrecy, nouveau isn’t particularly good.
 
 Installing the proprietary driver is recommended if you want to use Nvidia GPUs.
+This will enable the nonfree repository.
 
 Different versions are available. You can only choose one.

package_selections/nvidia/nvidia

@@ -9,7 +9,6 @@ function check {
 
 DESCRIPTION="Latest Nvidia driver, supports GTX ??? series and up"
 
-#TODO: optimus support?
 #TODO: void-repo-nonfree
 PACKAGES="nvidia"
 

package_selections/nvidia/nvidia390

@@ -9,7 +9,6 @@ function check {
 
 DESCRIPTION="Legacy Nvidia driver, version 390, supports GTX ??? series"
 
-#TODO: Optimus support?
 #TODO: void-repo-nonfree
 PACKAGES="nvidia390"
 

package_selections/nvidia/nvidia470

@@ -9,7 +9,6 @@ function check {
 
 DESCRIPTION="Legacy Nvidia driver, version 470, supports GTX ??? series"
 
-#TODO: optimus support?
 #TODO: void-repo-nonfree
 PACKAGES="nvidia470"
 

package_selections/pre-configure/bashrc

@@ -1,14 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="Only add custom bashrc (advanced users)"
-
-PACKAGES=""
-
-function post_install {
-  #TODO: configure things
-  # (probably by barfing the bashrc using echo)
-
-  echo "pre-configure/bashrc" >> /tmp/stage-2-choices
-}

package_selections/pre-configure/description.txt

@@ -1 +0,0 @@
-Do you want some quality-of-life configuration done?

package_selections/pre-configure/gui-and-bashrc

@@ -1,17 +0,0 @@
-function check {
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Auto-start GUI session on login and add custom bashrc (recommended)"
-
-PACKAGES=""
-
-function post_install {
-  #TODO: configure things
-
-  echo "pre-configure/gui-and-bashrc" >> /tmp/stage-2-choices
-}

package_selections/pre-configure/none

@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="No (advanced users)"
-
-PACKAGES=""
-
-function post_install {
-  echo "pre-configure/none" >> /tmp/stage-2-choices
-}

package_selections/pre-configure/options.lst

@@ -1,3 +0,0 @@
-gui-and-bashrc
-bashrc
-none

package_selections/sections.lst

@@ -1,10 +1,2 @@
 nvidia
 desktop
-audio
-systray
-terminal
-utilities
-pre-configure
-web
-multimedia
-extras

package_selections/systray/description.txt

@@ -1 +0,0 @@
-Do you want to install system tray applets?

package_selections/systray/network

@@ -1,21 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
-    if grep "audio/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
-
-DESCRIPTION="Add tray icon for network"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "systray/network" >> /tmp/stage-2-choices
-}

package_selections/systray/network-and-audio

@@ -1,21 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
-    if grep "audio/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-      return 1
-    else
-      return 0
-    fi
-  else
-    return 1
-  fi
-}
-
-DESCRIPTION="Add tray icon for network and audio"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "systray/network-and-audio" >> /tmp/stage-2-choices
-}

package_selections/systray/none

@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="Don’t install additional tray icons"
-
-PACKAGES=""
-
-function post_install {
-  echo "systray/none" >> /tmp/stage-2-choices
-}

package_selections/systray/options.lst

@@ -1,3 +0,0 @@
-network-and-audio
-network
-none

package_selections/terminal/description.txt

@@ -1 +0,0 @@
-Which GUI terminal emulator do you want to install?

package_selections/terminal/lxterminal

@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="LXDE Terminal (recommended)"
-
-PACKAGES="lxterminal"
-
-function post_install {
-  echo "terminal/lxterminal" >> /tmp/stage-2-choices
-}

package_selections/terminal/none

@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="None (advanced users only)"
-
-PACKAGES="none"
-
-function post_install {
-  echo "terminal/none" >> /tmp/stage-2-choices
-}

package_selections/terminal/options.lst

@@ -1,3 +0,0 @@
-lxterminal
-xterm
-none

package_selections/terminal/xterm

@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Xterm"
-
-PACKAGES="xterm"
-
-function post_install {
-  echo "terminal/xterm" >> /tmp/stage-2-choices
-}

package_selections/utilities/description.txt

@@ -1 +0,0 @@
-Which set of desktop utilities do you want to install?

package_selections/utilities/desktop-integrated-guisysmon

@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="Fully featured (list of things) (recommended)"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "utilities/desktop-integrated-guisysmon" >> /tmp/stage-2-choices
-}

package_selections/utilities/desktop-integrated-htop

@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="Fully featured (list of things with htop)"
-
-#TODO
-PACKAGES=""
-
-function post_install {
-  echo "utilities/desktop-integrated-htop" >> /tmp/stage-2-choices
-}

package_selections/utilities/none

@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="None"
-
-PACKAGES=""
-
-function post_install {
-  echo "utilities/none" >> /tmp/stage-2-choices
-}

package_selections/utilities/options.lst

@@ -1,5 +0,0 @@
-desktop-integrated-guisysmon
-xfe-guisysmon
-desktop-integrated-htop
-xfe-htop
-none

package_selections/utilities/xfe-guisysmon

@@ -1,18 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-#TODO
-DESCRIPTION="Smaller set of desktop utilities (XFE + ???)"
-
-#TODO
-PACKAGES="xfe"
-
-function post_install {
-  echo "utilities/xfe-guisysmon" >> /tmp/stage-2-choices
-}

package_selections/utilities/xfe-htop

@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Smaller set of desktop utilities (XFE + Htop)"
-
-PACKAGES="xfe htop"
-
-function post_install {
-  echo "utilities/xfe-htop" >> /tmp/stage-2-choices
-}

package_selections/web/description.txt

@@ -1 +0,0 @@
-Install a web browser?

package_selections/web/elinks

@@ -1,12 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  return 0
-}
-
-DESCRIPTION="Install ELinks (terminal-based browser)"
-
-PACKAGES="elinks"
-
-function post_install {
-  echo "web/elinks" >> /tmp/stage-2-choices
-}

package_selections/web/evil

@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Join the dark side with Chromium (Consider Firefox... You can still install Chromium later.)"
-
-PACKAGES="chromium"
-
-function post_install {
-  echo "web/evil" >> /tmp/stage-2-choices
-}

package_selections/web/firefox

@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Install Firefox (recommended)"
-
-PACKAGES="firefox"
-
-function post_install {
-  echo "web/firefox" >> /tmp/stage-2-choices
-}

package_selections/web/firefox-esr

@@ -1,16 +0,0 @@
-function check {
-  [ "$INTERNET" = "down" ] && return 1
-  if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
-    return 1
-  else
-    return 0
-  fi
-}
-
-DESCRIPTION="Install Firefox - Extended Support Release (ESR)"
-
-PACKAGES="firefox-esr"
-
-function post_install {
-  echo "web/firefox-esr" >> /tmp/stage-2-choices
-}

package_selections/web/none

@@ -1,11 +0,0 @@
-function check {
-  return 0
-}
-
-DESCRIPTION="No web browser"
-
-PACKAGES=""
-
-function post_install {
-  echo "web/none" >> /tmp/stage-2-choices
-}

package_selections/web/options.lst

@@ -1,5 +0,0 @@
-firefox
-firefox-esr
-evil
-elinks
-none