opt/grub-config: hartd-code keymap (fixme)

custom-scripts/icewm_bodgemaster_env.sh

@@ -54,7 +54,8 @@ xbps-install -y -S \
     xterm \
     libjack-pipewire \
     xreader \
-    wget
+    wget \
+    qView
 
 rm /var/cache/xbps/*
 ln -s /etc/sv/elogind /var/service
@@ -269,11 +270,12 @@ mkdir -p /etc/skel/.config/conky
 echo "-- placeholder file, should be replaced on login by scripts" > /etc/skel/.config/conky/conky.conf
 
 mkdir -p /etc/skel/.icewm/bkg
+mkdir -p /usr/local/share/wallpapers
 # backgrounds will be populated at the end of the script
 cat > /etc/skel/.icewm/startup << EOF
 #!/usr/bin/env bash
 
-icewmbg --replace --image "\$(find "\$HOME/.icewm/bkg/" -type f | shuf | head -n1)" --scaled=1 --center=0 &
+icewmbg --replace --image "\$(find "\$HOME/.icewm/bkg/" | shuf | head -n1)" --scaled=1 --center=0 &
 nm-applet &
 blueman-applet &
 pipewire &
@@ -317,6 +319,8 @@ hidden_files=Ctrl-H
 
 [PROGS]
 pdfviewer=xreader
+imgviewer=qview
+archiver=xarchiver
 videoplayer=vlc --started-from-file
 audioplayer=vlc --started-from-file
 xterm=lxterminal
@@ -329,6 +333,12 @@ md=xfw;Markdown Document;;;;
 php=<txteditor>,<txtviewer>,<txteditor>;PHP Source;html_32x32.png;html_16x16.png;;
 EOF
 
+mkdir /etc/skel/.config/qView
+cat > /etc/skel/.config/qView/qView.conf << EOF
+[shortcuts]
+quit=Ctrl+Q, Esc, Ctrl+W
+EOF
+
 mkdir /etc/X11/xorg.conf.d
 cat > /etc/X11/xorg.conf.d/30-touchpad.conf << EOF
 Section "InputClass"

install-stage1.sh

@@ -324,7 +324,105 @@ else
   echo "KEYMAP=\"$KBD_LAYOUT\"" >> /mnt/target/etc/rc.conf
 fi
 
-#TODO timezone
+clear
+REGIONS="$(find /usr/share/zoneinfo/ -mindepth 1 -maxdepth 1 -type d -exec basename \{\} \; | sort)"
+I=1
+echo "
+To set up time zone information, you will now be prompted for a region and location.
+The location should be the one that determines your timezone, it isn't necessarily the one nearest to you.
+
+Please choose a region:"
+for REGION in $REGIONS; do
+  echo "$I: $REGION"
+  I=$((I+1))
+done
+REGION=""
+CHOICE=0
+while ! [ "$CHOICE" -gt 0 -a "$CHOICE" -le "$(wc -l <<< "$REGIONS")" ]; do
+  read -p "Select an option [1-$(wc -l <<< "$REGIONS")]: " CHOICE
+  if [ "$CHOICE" -gt 0 -a "$CHOICE" -le "$(wc -l <<< "$REGIONS")" ]; then
+    REGION="$(sed -n -e "${CHOICE}p" <<< "$REGIONS")"
+  else
+    echo "Invalid choice."
+  fi
+done
+LOCATIONS="$(find /usr/share/zoneinfo/"$REGION"/ -mindepth 1 -maxdepth 1 -exec basename \{\} \; | sort)"
+I=1
+echo "
+Please choose a location or sub-region:"
+for LOCATION in $LOCATIONS; do
+  if [ "$((I % 3))" -eq 0 ]; then
+    echo "$I: $LOCATION"
+  else
+    echo -n "$I: $LOCATION"
+    echo -ne "\t"
+  fi
+  I=$((I+1))
+done
+LOCATION=""
+CHOICE=0
+while ! [ "$CHOICE" -gt 0 -a "$CHOICE" -le "$(wc -l <<< "$LOCATIONS")" ]; do
+  read -p "Select an option [1-$(wc -l <<< "$LOCATIONS")]: " CHOICE
+  if [ "$CHOICE" -gt 0 -a "$CHOICE" -le "$(wc -l <<< "$LOCATIONS")" ]; then
+    LOCATION="$(sed -n -e "${CHOICE}p" <<< "$LOCATIONS")"
+  else
+    echo "Invalid choice."
+  fi
+done
+if [ -d "/usr/share/zoneinfo/$REGION/$LOCATION" ]; then
+  REGION="$REGION/$LOCATION"
+  LOCATIONS="$(find /usr/share/zoneinfo/"$REGION"/ -mindepth 1 -maxdepth 1 -exec basename \{\} \; | sort)"
+  I=1
+  echo "
+  Please choose a location:"
+  for LOCATION in $LOCATIONS; do
+    if [ "$((I % 3))" -eq 0 ]; then
+      echo "$I: $LOCATION"
+    else
+      echo -n "$I: $LOCATION"
+      echo -ne "\t"
+    fi
+    I=$((I+1))
+  done
+  LOCATION=""
+  CHOICE=0
+  while ! [ "$CHOICE" -gt 0 -a "$CHOICE" -le "$(wc -l <<< "$LOCATIONS")" ]; do
+    read -p "Select an option [1-$(wc -l <<< "$LOCATIONS")]: " CHOICE
+    if [ "$CHOICE" -gt 0 -a "$CHOICE" -le "$(wc -l <<< "$LOCATIONS")" ]; then
+      LOCATION="$(sed -n -e "${CHOICE}p" <<< "$LOCATIONS")"
+    else
+      echo "Invalid choice."
+    fi
+  done
+fi
+TIMEZONE="$REGION/$LOCATION"
+echo "Configuring timezone."
+if grep "#TIMEZONE=" /mnt/target/etc/rc.conf; then
+  sed -i -e 's/#TIMEZONE=.*/TIMEZONE="'"$TIMEZONE"'"/' /mnt/target/etc/rc.conf
+else
+  clear
+  echo "WARNING: Could not locate the time zone setting in rc.conf." | tee --append $LOGFILE
+  echo "The script will attempt to add one." | tee --append $LOGFILE
+  echo ""
+  press_any_key
+  echo "" >> /mnt/target/etc/rc.conf
+  echo "# Install script could not find time zone setting, adding one here." >> /mnt/target/etc/rc.conf
+  echo "TIMEZONE=\"$TIMEZONE\"" >> /mnt/target/etc/rc.conf
+fi
+
+echo "Setting SEEDRNG_SKIP_CREDIT=true"
+if grep "#SEEDRNG_SKIP_CREDIT=" /mnt/target/etc/rc.conf; then
+  sed -i -e 's/#SEEDRNG_SKIP_CREDIT=.*/SEEDRNG_SKIP_CREDIT=true/' /mnt/target/etc/rc.conf
+else
+  clear
+  echo "WARNING: Could not locate the SEEDRNG_SKIP_CREDIT setting in rc.conf." | tee --append $LOGFILE
+  echo "The script will attempt to add one." | tee --append $LOGFILE
+  echo ""
+  press_any_key
+  echo "" >> /mnt/target/etc/rc.conf
+  echo "# Install script could not find SEEDRNG_SKIP_CREDIT setting, adding one here." >> /mnt/target/etc/rc.conf
+  echo "SEEDRNG_SKIP_CREDIT=true" >> /mnt/target/etc/rc.conf
+fi
 
 clear
 echo "Assume that the hardware clock is UTC?
@@ -386,6 +484,8 @@ done
 
 echo "$TARGET_HOSTNAME" > /mnt/target/etc/hostname
 
+#TODO: set up / fix locale on glibc
+
 clear
 echo -n "Installing bootloader... "
 mkdir /mnt/target/boot/efi/LOADER >> $LOGFILE 2>&1

opt/grub-config

@@ -5,7 +5,8 @@ GRUB_PREFIX="/boot/efi/LOADER/grub"
 CFG_CUSTOM_BEFORE="custom_before.cfg"
 CFG_CUSTOM_AFTER="custom_after.cfg"
 CONTAINER_UUID="$(blkid --output value --match-tag UUID "$(grep " /run/void-usb/container " /proc/mounts | sed -e 's/ .*//')")"
-LINUX_CMDLINE="quiet root=/dev/loop0 ro void-usb-container=UUID=$CONTAINER_UUID"
+# TODO: rd.vconsole.keymap
+LINUX_CMDLINE="quiet root=/dev/loop0 ro void-usb-container=UUID=$CONTAINER_UUID rd.vconsole.keymap=de-latin1"
 
 DEFAULT_LINUX=/boot/vmlinu?
 if [ ! -f "$DEFAULT_LINUX" ]; then