notes_to_self.txt

@@ -16,6 +16,7 @@ make our own or extract (if feasible) kb selection and time zone selection to hi
 overview of the installation process at the start
 overall progress indication (step x out of y)
 look into roxterm as an alternative terminal
+include arandr or something similar in fully featured desktop utils
 deal with the entropy thing that runs after rc.shutdown
 first run message in .xinitrc.d
   - auto-removes itself
@@ -23,25 +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
-tell user about expected GRUB error messaegs
-disable suspend and hibernate
-when shutting down, let Xorg exit first, then run `loginctl {poweroff,reboot}`
-add polkit to common packages
-https://github.com/aarnt/octoxbps
-system-image
-  make all output appear on current TTY
-  sync before and after creating the image
 package selections:
   desktop
     icewm-full
       packages
-        -> audio applet -> volctl
+        -> audio applet
         -> system monitor, file browser, image viewer, text editor, archive manager
         -> GUI package manager? GUI update manager?
         -> notification daemon?
-        xscreensaver
-        blueman
-        -> BT support?
       post-install
         add ultimate.bashrc
         add backgrounds
@@ -49,21 +39,16 @@ package selections:
         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
-          start xscreensaver
-          start blueman
         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
-          startup script
-            choose random background
-          configuration
         configure conky
-        configure xscreensaver
     icewm-lite
       post-install
         add ultimate.bashrc
@@ -104,6 +89,7 @@ Stage 2:
       -> useradd --groups "comma,separated,groups" --create-home --shell /bin/bash $USERNAME
       -> groups: dialout users wheel
       -> ?? groups:
+        -> video - Can use GUI? Can use webcam?
         -> cdrom optical - can listen to CDs? Can watch DVDs? Can mount / unmount CDs/DVDs?
         -> storage - can mount / unmount disks from GUI?
         -> scanner - can scan things (for example using XSane?)

package_selections/desktop/additional_files.lst

@@ -1,3 +1 @@
 resources/common_packages
-resources/xinitrc
-resources/bashrc

package_selections/desktop/icewm-full

@@ -6,7 +6,7 @@ function check {
 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 arandr"
+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/resources/xinitrc

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if grep -F ".local/bin" <<< "$PATH"; then
-  true
-else
-  PATH="$HOME/.local/bin:$PATH"
-fi
-
-export PATH
-
-if [ -d "$HOME/.xinitrc.d" ]; then
-  for FILE in "$HOME/.xinitrc.d"/*; do
-    [ -x "$FILE" ] && "$FILE" &
-  done
-fi
-
-
-# The line below is placed by the package selection script.

skel/bashrc

@@ -2,15 +2,12 @@
 # ==========
 # things to always set up, even for non-interactive shells
 
+# Fuck vi!
 EDITOR=nano
+# On FreeBSD this is being set for whatever reason in the other shell rc files. I'll leave it here for compatibility.
 PAGER=less
-
-if grep -F ".local/bin" <<< "$PATH"; then
-  true
-else
-  PATH="$HOME/.local/bin:$PATH"
-fi
-
+# add a user-specific bin directory to PATH
+PATH=$HOME/.local/bin:$PATH
 export EDITOR PAGER PATH
 
 # CHECK INTERACTIVE
@@ -21,14 +18,6 @@ case $- in
       *) return ;;
 esac
 
-# START XORG
-# ==========
-# TODO
-# check if login shell
-# if yes, check if .xinitrc exists
-# if yes, check if xorg is already running
-# if no, startx
-
 # ALIASES
 # =======
 alias aliases="nano $HOME/.bashrc_aliases && source $HOME/.bashrc_aliases"

skel/xinitrc

@@ -0,0 +1,2 @@
+#TODO: open user-readme once and then never again
+#TODO: check which software selection of Void-USB has been installed and start the appropriate things