Right alt key should now work as expected in the console.

pi3/build/build-stormux.sh

@@ -1,276 +0,0 @@
-#! /bin/bash
-#
-# Copyright 2020, Stormux, <storm_dragon@linux-a11y.org>
-#
-# This is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 3, or (at your option) any later
-# version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this package; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-
-# keep track of mounted status for exit function
-mounted=1
-
-set -e # Don't want to destroy stuff if this goes majorly wrong.
-trap cleanup EXIT # make sure the script cleans up after itself before closing.
-
-
-cleanup() {
-    if [[ $mounted -eq 0 ]]; then
-        umount -R /mnt
-        partx -d "${loopdev}"
-        losetup --detach "${loopdev}"
-    fi
-    if [[ -n "${imageFileName}" ]]; then
-        rm "${imageFileName}"
-    fi
-    exit 0
-}
-
-help() {
-    echo -e "Usage:\n"
-    echo "With no arguments, build with default parameters."
-    for i in "${!command[@]}" ; do
-        echo "-${i/:/ <parameter>}: ${command[${i}]}"
-    done | sort
-    exit 0
-}
-
-# Array of command line arguments
-declare -A command=(
-    [h]="This help screen."
-    [l:]="Language default is en_US."
-    [n:]="Image name, default is stormux-pi3-<armv7h|aarch64>-<yyyy-mm-dd>.img"
-    [s:]="image size in GB, default is 4."
-    [v:]="Version of the Raspberry Pi for which you are building. (32|64) default is 64."
-)
-
-# Convert the keys of the associative array to a format usable by getopts
-args="${!command[*]}"
-args="${args//[[:space:]]/}"
-while getopts "${args}" i ; do
-    case "$i" in
-        h) help ;;
-        l)
-            imageLanguage="${OPTARG}.UTF-8"
-            ;;
-        n)
-            imageName="${OPTARG}"
-            ;;
-        s)
-            if [[ "${OPTARG}" =~ ^[[:digit:]]+$ ]]; then
-                imageSize="${OPTARG}G"
-            else
-                echo "Image size must be numeric."
-                exit 1
-            fi
-            ;;
-        v)
-            if [[ "${OPTARG}" =~ ^32|64$ ]]; then
-                imageVersion="${OPTARG}"
-            else
-                echo "Image version must be 32 for 32 bit (armv7h), or 64 for 64 bit (aarch64 default)."
-                exit 1
-            fi
-            ;;
-        *)
-            exit 1
-            ;;
-    esac
-done
-
-# make sure variables are set, or use defaults.
-export imageVersion="${imageVersion:-64}"
-export imageSize="${imageSize:-4G}"
-imageName="${imageName:-stormux-pi3-${imageVersion}-$(date '+%Y-%m-%d').img}"
-imageName="${imageName/-64-/-aarch64-}"
-imageName="${imageName/-32-/-armv7h-}"
-export imageName
-export imageLanguage="${imageLanguage:-en_US.UTF-8}"
-
-# Make sure the image file doesn't exist.
-if [[ -e "$imageName" ]]; then
-    echo "${imageName} exists, please remove or move it for this script to continue."
-    exit 1
-fi
-
-# Make sure this script is ran as root.
-if [ "$(whoami)" != "root" ] ; then
-    echo "Error: This script must be run as root."
-    exit 1
-fi
-
-# make sure the needed tools are installed
-if [[ "$(uname -m)" == "x86_64" ]]; then
-    if ! pacman -Q qemu-user-static &> /dev/null ; then
-        echo "Please install qemu-user-static and qemu-user-static-binfmt before continuing."
-        exit 1
-    fi
-    if ! pacman -Q qemu-user-static-binfmt &> /dev/null ; then
-        echo "Please install qemu-user-static and qemu-user-static-binfmt before continuing."
-        exit 1
-    fi
-fi
-for i in arch-install-scripts dosfstools parted wget ; do
-    if ! pacman -Q $i &> /dev/null ; then
-        echo "Please install $i before continuing."
-        exit 1
-    fi
-done
-
-
-# Url for the image to be downloaded.
-url[32]="http://os.archlinuxarm.org/os/ArchLinuxARM-rpi-armv7-latest.tar.gz"
-url[64]="http://os.archlinuxarm.org/os/ArchLinuxARM-rpi-aarch64-latest.tar.gz"
-
-fallocate -l "$imageSize" "$imageName"
-loopdev="$(losetup --find --show "${imageName}")"
-parted --script "${loopdev}" mklabel msdos mkpart primary fat32 0% 200M mkpart primary ext4 200M 100%
-mkfs.vfat -F32 "${loopdev}p1"
-mkfs.ext4 -F "${loopdev}p2"
-mount "${loopdev}p2" /mnt
-mkdir /mnt/boot
-mount "${loopdev}p1" /mnt/boot
-# Things are mounted now, so set mounted to 0 (bash true)
-mounted=0
-imageFileName=$(mktemp)
-wget "${url[$imageVersion]}" -O "${imageFileName}"
-bsdtar -xpf "${imageFileName}" -C /mnt
-arch-chroot /mnt << EOF
-# set up pacman
-pacman-key --init
-pacman-key --populate archlinuxarm
-pacman -Syy
-# Change kernels for aarch64
-if [[ "$imageVersion" == "64" ]]; then
-pacman -R --noconfirm linux-aarch64 uboot-raspberrypi
-pacman -S --noconfirm linux-rpi
-fi
-
-# Install packages
-pacman -Su --needed --noconfirm \
-    alsa-firmware \
-    alsa-utils \
-    base \
-    base-devel \
-    bash-completion \
-    bluez \
-    bluez-utils \
-    brltty \
-    cloud-utils \
-    cronie \
-    dbus-broker \
-    espeak-ng \
-    fake-hwclock \
-    git \
-    go \
-    magic-wormhole \
-    man \
-    man-pages \
-    networkmanager \
-    ntp \
-    pipewire \
-    pipewire-alsa \
-    pipewire-jack \
-    pipewire-pulse \
-    poppler \
-    python-pyudev \
-    python-daemonize \
-    python-evdev \
-    python-dbus \
-    python-pyte \
-    raspberrypi-firmware \
-    realtime-privileges \
-    rhvoice-voice-bdl \
-    rng-tools \
-    rsync \
-    screen \
-    sox \
-    w3m \
-    wget \
-    wireless-regdb \
-    wireplumber \
-    xdg-user-dirs \
-    xdg-utils
-
-# set the language
-sed -i "s/#$imageLanguage/$imageLanguage/" /etc/locale.gen
-echo "LANG=$imageLanguage" > /etc/locale.conf
-locale-gen
-# Configure and enable Hardware Random Number Generator
-echo 'RNGD_OPTS="-o /dev/random -r /dev/hwrng"' > /etc/conf.d/rngd
-systemctl enable rngd.service
-# Set the distribution name.
-echo 'Stormux \r (\l)' > /etc/issue
-echo >> /etc/issue
-# Change the alarm user to be stormux
-usermod -a -g users -G wheel,realtime,audio,video,network,brlapi -m -d /home/stormux -l stormux alarm
-# Grant sudo privileges to the stormux user for package installation.
-echo 'stormux ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/wheel
-# Set the password for the root user
-echo -e "root\nroot" | passwd "root"
-# Set the password for the stormux user
-echo -e "stormux\nstormux" | passwd "stormux"
-# Change to the stormux user and install some packages
-sudo -iu stormux
-# Create desktop, downloads, music, and other directories.
-xdg-user-dirs-update
-# Build AUR packages
-export aurPackages=(fenrir-git \
-    growpartfs \
-    log2ram \
-    yay)
-export PKGDEST=~/packages
-for p in "\${aurPackages[@]}" ; do
-    git clone https://aur.archlinux.org/\${p}.git
-    cd ~/\${p}
-    makepkg -A
-    cd ~
-    rm -rf \${p}
-done
-exit
-# Install built packages
-for p in /home/stormux/packages/* ; do
-    pacman -U --noconfirm \${p}
-done
-rm -rf /home/stormux/packages/
-# Enable linger so that hopefully sound will start at login.
-mkdir -p /var/lib/systemd/linger
-touch /var/lib/systemd/linger/stormux
-systemctl --global enable dbus-broker.service pipewire.service pipewire-pulse.service
-/usr/share/fenrirscreenreader/tools/configure_pipewire.sh
-sudo -u stormux /usr/share/fenrirscreenreader/tools/configure_pipewire.sh
-# Configure sudo for group wheel, remove nopasswd for the stormux user
-echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel
-# Set the hostname
-echo stormux > /etc/hostname
-# Configure services
-systemctl enable brltty.path cronie.service dbus-broker.service fake-hwclock.service fenrirscreenreader.service log2ram.service NetworkManager.service ntpd.service
-systemctl disable dbus.service
-# Cleanup packages
-pacman -Sc --noconfirm
-pacman -R --noconfirm go
-
-# Update fstab for Raspberry Pi 4. Not needed until linux-aarch64 works.
-# [[ $imageVersion -eq 4 ]] && sed -i 's/mmcblk0/mmcblk1/g' /etc/fstab
-EOF
-
-# Copy override files into place.
-cp -rv ../files/boot/* /mnt/boot
-cp -rv ../files/etc/* /mnt/etc
-cp -rv ../files/var/* /mnt/var
-cp -rv ../files/usr/* /mnt/usr
-find ../files/etc/skel/ -mindepth 1 -exec cp -rv "{}" /mnt/home/stormux/ \;
-
-# Exiting calls the cleanup function to unmount.
-exit 0

pi3/files/boot/config.txt

@@ -1,10 +0,0 @@
-# See /boot/overlays/README for all available options
-
-dtoverlay=vc4-kms-v3d
-initramfs initramfs-linux.img followkernel
-dtparam=audio=on,krnbt=on
-hdmi_drive=2
-
-[pi4]
-# Run as fast as firmware / board allows
-arm_boost=1

pi3/files/etc/X11/xorg.conf.d/10-headless.conf

@@ -1,20 +0,0 @@
-Section "Monitor"
-        Identifier "dummy_monitor"
-        HorizSync 28.0-80.0
-        VertRefresh 48.0-75.0
-        Modeline "1920x1080" 172.80 1920 2040 2248 2576 1080 1081 1084 1118
-EndSection
-                                                                                                                                                      
-Section "Device"
-        Identifier "dummy_card"
-        VideoRam 256000
-        Driver "dummy"
-EndSection
-                                                                                                                                                      
-Section "Screen"
-        Identifier "dummy_screen"
-        Device "dummy_card"
-        Monitor "dummy_monitor"
-        SubSection "Display"
-        EndSubSection
-EndSection

pi3/files/etc/audibleprompt.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-play -qnV0 synth 3 pluck D3 pluck A3 pluck D4 pluck F4 pluck A4 delay 0 .1 .2 .3 .4 remix - chorus 0.9 0.9 38 0.75 0.3 0.5 -t &
-read -rsp "$*"$'\n' password
-echo "$password"
-
-exit 0

pi3/files/etc/hostname

@@ -1 +0,0 @@
-stormux

pi3/files/etc/hosts

@@ -1,5 +0,0 @@
-# Static table lookup for hostnames.
-# See hosts(5) for details.
-127.0.0.1       localhost
-::1             localhost
-127.0.1.1       stormux.localdomain  stormux

pi3/files/etc/log2ram.conf

@@ -1,37 +0,0 @@
-# Configuration file for Log2Ram (https://github.com/azlux/log2ram) under MIT license.
-# This configuration file is read by the log2ram service
-
-# Size for the ram folder, it defines the size the log folder will reserve into the RAM.
-# If it's not enough, log2ram will not be able to use ram. Check you /var/log size folder.
-# The default is 40M and is basically enough for a lot of applications.
-# You will need to increase it if you have a server and a lot of log for example.
-SIZE=128M
-
-# This variable can be set to true if you prefer "rsync" rather than "cp".
-# I use the command cp -u and rsync -X, so I don't copy the all folder every time for optimization.
-# You can choose which one you want. Be sure rsync is installed if you use it.
-USE_RSYNC=true
-
-# If there are some errors with available RAM space, a system mail will be send
-# Change it to false and you will have only a log if there is no place on RAM anymore.
-MAIL=false
-
-# Variable for folders to put in RAM. You need to specify the real folder `/path/folder` , the `/path/hdd.folder` will be automatically created. Multiple path can be separeted by `;`. Do not add the final `/` !
-# example : PATH_DISK="/var/log;/home/test/FolderInRam"
-PATH_DISK="/var/log"
-
-# **************** Zram backing conf  *************************************************
-
-# ZL2R Zram Log 2 Ram enables a zram drive when ZL2R=true ZL2R=false is mem only tmpfs
-ZL2R=false
-# COMP_ALG this is any compression algorithm listed in /proc/crypto
-# lz4 is fastest with lightest load but deflate (zlib) and Zstandard (zstd) give far better compression ratios
-# lzo is very close to lz4 and may with some binaries have better optimisation
-# COMP_ALG=lz4 for speed or Zstd for compression, lzo or zlib if optimisation or availabilty is a problem
-COMP_ALG=lz4
-# LOG_DISK_SIZE is the uncompressed disk size. Note zram uses about 0.1% of the size of the disk when not in use
-# LOG_DISK_SIZE is expected compression ratio of alg chosen multiplied by log SIZE
-# lzo/lz4=2.1:1 compression ratio zlib=2.7:1 zstandard=2.9:1
-# Really a guestimate of a bit bigger than compression ratio whilst minimising 0.1% mem usage of disk size
-LOG_DISK_SIZE=100M
-

pi3/files/etc/motd

@@ -1,10 +0,0 @@
-Welcome to Stormux, powered by Arch Linux ARM
-
-            Stormux Website: https://stormux.org
-       Arch Linux ARM Forum: https://archlinuxarm.org/forum
-
-                Stormux IRC: #stormux on irc.stormux.org
-         Arch Linux ARM IRC: #archlinuxarm on irc.libera.chat
-
-         Thank you Stormux supporters! https://ko-fi.com/stormux/leaderboard
-

pi3/files/etc/pam.d/nodm

@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth      include   system-local-login
-account   include   system-local-login
-password  include   system-local-login
-session   include   system-local-login

pi3/files/etc/skel/.bash_aliases

@@ -1 +0,0 @@
-alias sudo='sudo '

pi3/files/etc/skel/.bash_functions

@@ -1,21 +0,0 @@
-memuse() {
-    ps axo rss,comm,pid \
-        | awk '{ proc_list[$2] += $1; } END \
-        { for (proc in proc_list) { printf("%d\t%s\n", proc_list[proc],proc); }}' \
-        | sort -n | tail -n 10 | sort -rn \
-        | awk '{$1/=1024;printf "%.0fMB\t",$1}{print $2}'
-}
-
-
-pdf()
-{
-    if [[ $# -ne 1 ]]; then
-        echo 'Usage: pdf <file>' >&2
-    else
-        local dir=$(mktemp -d -p /tmp pdf_conversion.XXXXXX)
-        local outFile="${1##*/}"
-        local outFile="${outFile%.*}"
-        pdftohtml -noframes -i -s "$1" "${dir}/${outFile}.html"
-        w3m -s "${dir}/${outFile}.html"
-    fi
-}

pi3/files/etc/skel/.bashrc

@@ -1,24 +0,0 @@
-#
-# ~/.bashrc
-#
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-#Change directories without using cd
-shopt -s autocd
-
-# Keep bash history in screen
-export HISTFILE="${HISTFILE}${WINDOW:+.${WINDOW}}"
-
-# load Aliases and functions
-[[ -f ".bash_aliases" ]] && source .bash_aliases
-[[ -f ".bash_functions" ]] && source .bash_functions
-#Invironment variables
-PS1='[\u@\h \W] \$ '
-export DIALOGOPTS='--no-lines --visit-items'
-GPG_TTY=$(tty)
-export GPG_TTY
-# Don't put commands prefixed with space, or duplicate commands in history
-export HISTCONTROL=ignoreboth
-

pi3/files/etc/skel/.inputrc

@@ -1,6 +0,0 @@
-# Reload changes with control+x followed by control+r
-set echo-control-characters off
-
-# History searching with up and down arrows.
-"\e[A": history-search-backward
-"\e[B": history-search-forward

pi3/files/etc/skel/.screenrc

@@ -1,18 +0,0 @@
-vbell off
-bell_msg ""
-hardstatus off
-startup_message off
-defscrollback 4096
-bind ! select 10
-bind @ select 11
-bind \# select 12
-bind $ select 13
-bind % select 14
-bind ^ select 15
-bind & select 16
-bind * select 17
-bind ( select 18
-bind ) select 19
-bind b eval "writebuf" 'exec !!! xclip -selection "clipboard" -i /tmp/screen-exchange'
-#termcapinfo xterm|xterms|xs|rxvt ti@:te@
-termcapinfo xterm* ti@:te@

pi3/files/etc/sysctl.d/20-quiet-printk.conf

@@ -1 +0,0 @@
-kernel.printk = 3 3 3 3

pi3/files/etc/systemd/journald.conf

@@ -1,47 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-# Entries in this file show the compile time defaults. Local configuration
-# should be created by either modifying this file, or by creating "drop-ins" in
-# the journald.conf.d/ subdirectory. The latter is generally recommended.
-# Defaults can be restored by simply deleting this file and all drop-ins.
-#
-# Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config.
-#
-# See journald.conf(5) for details.
-
-[Journal]
-#Storage=auto
-#Compress=yes
-#Seal=yes
-#SplitMode=uid
-#SyncIntervalSec=5m
-#RateLimitIntervalSec=30s
-#RateLimitBurst=10000
-SystemMaxUse=20M
-#SystemKeepFree=
-#SystemMaxFileSize=
-#SystemMaxFiles=100
-#RuntimeMaxUse=
-#RuntimeKeepFree=
-#RuntimeMaxFileSize=
-#RuntimeMaxFiles=100
-#MaxRetentionSec=
-#MaxFileSec=1month
-#ForwardToSyslog=no
-#ForwardToKMsg=no
-#ForwardToConsole=no
-#ForwardToWall=yes
-#TTYPath=/dev/console
-#MaxLevelStore=debug
-#MaxLevelSyslog=debug
-#MaxLevelKMsg=notice
-#MaxLevelConsole=info
-#MaxLevelWall=emerg
-#LineMax=48K
-#ReadKMsg=yes
-#Audit=yes

pi3/files/etc/systemd/resolved.conf.d/dnssec.conf

@@ -1,2 +0,0 @@
-[Resolve]
-DNSSEC=no

pi3/files/usr/lib/systemd/system/ntpd.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=Network Time Service
-After=network.target nss-lookup.target
-Conflicts=systemd-timesyncd.service
-
-[Service]
-Type=forking
-PrivateTmp=true
-ExecStartPre=/usr/bin/ntpd -Ggq
-ExecStart=/usr/bin/ntpd -g -u ntp:ntp
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

pi3/files/usr/local/bin/configure-stormux

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-trap 'popd &> /dev/null' EXIT
-
-export SUDO_ASKPASS=/etc/audibleprompt.sh
-if [[ ! -d /opt/configure-stormux ]]; then
-    # Offer to switch fenrir layout.
-    echo "Would you like to switch Fenrir to laptop layout? (y/n)"
-    read -r continue
-    continue="${continue::1}"
-    if [[ "${continue,}" == "y" ]];then
-        sudo -A sed -i 's/=desktop/=laptop/' /etc/fenrirscreenreader/settings/settings.conf
-        sudo -A systemctl restart fenrirscreenreader.service
-        clear
-    fi
-    if ! ping -c1 stormux.org &> /dev/null ; then
-        echo "No internet connection detected. Press enter to open NetworkManager."
-        echo "Note, it is best to put Fenrir into highlight mode while using NetworkManager."
-        echo "In desktop layout this is done by pressing Fenrir+numpad asterisk."
-        echo "That is the key just above numpad 9."
-        echo "In laptop mode, press Fenrir+y."
-        echo "In desktop mode the Fenrir key is numpad insert."
-        echo "In laptop mode the Fenrir key is the Super key, sometimes called the Windows key."
-        echo "Press enter to continue."
-        read -r continue
-        nmtui-connect
-    fi
-# Check for internet connectivity
-if ping -qc1 -W 1 stormux.org &> /dev/null; then
-  echo "Updating the clock to prevent certificate errors..."
-  # Get current date and time
-  date_time=$(curl -s http://worldtimeapi.org/api/ip | grep -oP '(?<="datetime":")[^"]*')
-  echo "Current date and time: $date_time"
-  # set date and time
-  sudo -A date -s "$date_time"
-else
-  echo "Please connect to the internet and run ${0##*/} again."
-  exit 1
-fi
-    echo "Installing configure-stormux..."
-    sudo -A git -C /opt clone -q https://git.stormux.org/storm/configure-stormux || exit 1
-fi
-
-pushd /opt/configure-stormux
-./configure-stormux.sh
-
-exit 0

pi3/files/var/lib/alsa/asound.state

@@ -1,79 +0,0 @@
-state.ALSA {
-	control.1 {
-		iface MIXER
-		name 'PCM Playback Volume'
-		value -197
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '-10239 - 400'
-			dbmin -9999999
-			dbmax 400
-			dbvalue.0 -197
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'PCM Playback Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'PCM Playback Route'
-		value 1
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 2'
-		}
-	}
-	control.4 {
-		iface PCM
-		name 'IEC958 Playback Default'
-		value '0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write'
-			type IEC958
-			count 1
-		}
-	}
-	control.5 {
-		iface PCM
-		name 'IEC958 Playback Con Mask'
-		value '0200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access read
-			type IEC958
-			count 1
-		}
-	}
-	control.6 {
-		iface PCM
-		name 'IEC958 Playback PCM Stream'
-		value '0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read write inactive'
-			type IEC958
-			count 1
-		}
-	}
-}
-state.vc4hdmi {
-	control.1 {
-		iface PCM
-		name ELD
-		value '100008006a10000100000000000000000469fd22415355532056533232380917070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read volatile'
-			type BYTES
-			count 128
-		}
-	}
-}

pi4/build/build-stormux.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright 2020, Stormux, <storm_dragon@linux-a11y.org>
+# Copyright 2020, Stormux, <storm_dragon@stormux.org>
 #
 # This is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free
@@ -91,7 +91,7 @@ done
 
 # make sure variables are set, or use defaults.
 export imageVersion="${imageVersion:-64}"
-export imageSize="${imageSize:-4G}"
+export imageSize="${imageSize:-6G}"
 imageName="${imageName:-stormux-pi4-${imageVersion}-$(date '+%Y-%m-%d').img}"
 imageName="${imageName/-64-/-aarch64-}"
 imageName="${imageName/-32-/-armv7h-}"
@@ -136,8 +136,8 @@ url[64]="http://os.archlinuxarm.org/os/ArchLinuxARM-rpi-aarch64-latest.tar.gz"
 fallocate -l "$imageSize" "$imageName"
 loopdev="$(losetup --find --show "${imageName}")"
 parted --script "${loopdev}" mklabel msdos mkpart primary fat32 0% 200M mkpart primary ext4 200M 100%
-mkfs.vfat -F32 "${loopdev}p1"
-mkfs.ext4 -F "${loopdev}p2"
+mkfs.vfat -F32 -n STRMX_BOOT "${loopdev}p1"
+mkfs.ext4 -F -L STRMX_ROOT "${loopdev}p2"
 mount "${loopdev}p2" /mnt
 mkdir /mnt/boot
 mount "${loopdev}p1" /mnt/boot
@@ -152,7 +152,8 @@ fi
 bsdtar -xpf "${imageFileName}" -C /mnt
 # Set -e in case it got unset for 32 bit image
 set -e
-arch-chroot /mnt << EOF
+PS1="(Chroot) [\u@\h \W] \$" arch-chroot /mnt << EOF
+echo "Chroot started."
 # set up pacman
 pacman-key --init
 pacman-key --populate archlinuxarm
@@ -175,7 +176,6 @@ pacman -Su --needed --noconfirm \
     brltty \
     cloud-utils \
     cronie \
-    dbus-broker \
     espeak-ng \
     fake-hwclock \
     firmware-raspberrypi \
@@ -185,7 +185,6 @@ pacman -Su --needed --noconfirm \
     man \
     man-pages \
     networkmanager \
-    ntp \
     pipewire \
     pipewire-alsa \
     pipewire-jack \
@@ -195,7 +194,9 @@ pacman -Su --needed --noconfirm \
     python-daemonize \
     python-evdev \
     python-dbus \
+    python-pyenchant \
     python-pyte \
+    socat \
     raspberrypi-utils \
     realtime-privileges \
     rhvoice-voice-bdl \
@@ -210,6 +211,8 @@ pacman -Su --needed --noconfirm \
     xdg-user-dirs \
     xdg-utils
 
+# Restart gpg agents.
+gpgconf --kill all
 # set the language
 sed -i "s/#$imageLanguage/$imageLanguage/" /etc/locale.gen
 echo "LANG=$imageLanguage" > /etc/locale.conf
@@ -230,17 +233,23 @@ echo -e "root\nroot" | passwd "root"
 echo -e "stormux\nstormux" | passwd "stormux"
 # Change to the stormux user and install some packages
 sudo -iu stormux
+# suppress git spam about default branch name
+git config --global init.defaultBranch master
 # Create desktop, downloads, music, and other directories.
 xdg-user-dirs-update
 # Build AUR packages
-export aurPackages=(fenrir-git \
+export aurPackages=(fenrir \
     growpartfs \
     log2ram \
+    python-pythondialog \
     yay)
 export PKGDEST=~/packages
 for p in "\${aurPackages[@]}" ; do
     git clone https://aur.archlinux.org/\${p}.git
     cd ~/\${p}
+    if [[ "\${p}" == "python-pythondialog" ]]; then
+        gpg --import keys/pgp/*.asc
+    fi
     makepkg -A
     cd ~
     rm -rf \${p}
@@ -254,7 +263,7 @@ rm -rf /home/stormux/packages/
 # Enable linger so that hopefully sound will start at login.
 mkdir -p /var/lib/systemd/linger
 touch /var/lib/systemd/linger/stormux
-systemctl --global enable dbus-broker.service pipewire.service pipewire-pulse.service
+systemctl --global enable pipewire.service pipewire-pulse.service
 /usr/share/fenrirscreenreader/tools/configure_pipewire.sh
 sudo -u stormux /usr/share/fenrirscreenreader/tools/configure_pipewire.sh
 # Configure sudo for group wheel, remove nopasswd for the stormux user
@@ -262,8 +271,8 @@ echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel
 # Set the hostname
 echo stormux > /etc/hostname
 # Configure services
-systemctl enable brltty.path cronie.service dbus-broker.service fake-hwclock.service fenrirscreenreader.service log2ram.service NetworkManager.service ntpd.service
-systemctl disable dbus.service
+systemctl disable systemd-networkd.service systemd-networkd.socket
+systemctl enable brltty.path cronie.service fake-hwclock.service fenrirscreenreader.service log2ram.service NetworkManager.service
 # Cleanup packages
 pacman -Sc --noconfirm
 pacman -R --noconfirm go

pi4/files/boot/cmdline.txt

@@ -0,0 +1 @@
+root=LABEL=STRMX_ROOT rw rootwait console=serial0,115200 console=tty1 fsck.repair=yes

pi4/files/etc/X11/xorg.conf.d/10-headless.conf

@@ -1,20 +0,0 @@
-Section "Monitor"
-        Identifier "dummy_monitor"
-        HorizSync 28.0-80.0
-        VertRefresh 48.0-75.0
-        Modeline "1920x1080" 172.80 1920 2040 2248 2576 1080 1081 1084 1118
-EndSection
-                                                                                                                                                      
-Section "Device"
-        Identifier "dummy_card"
-        VideoRam 256000
-        Driver "dummy"
-EndSection
-                                                                                                                                                      
-Section "Screen"
-        Identifier "dummy_screen"
-        Device "dummy_card"
-        Monitor "dummy_monitor"
-        SubSection "Display"
-        EndSubSection
-EndSection

pi4/files/etc/fstab

@@ -0,0 +1,6 @@
+# Static information about the filesystems.
+# See fstab(5) for details.
+
+# <file system> <dir> <type> <options> <dump> <pass>
+LABEL=STRMX_BOOT  /boot   vfat    defaults        0       1
+LABEL=STRMX_ROOT  /       ext4    defaults,noatime  0       1

pi4/files/etc/modprobe.d/brcmfmac.conf

@@ -0,0 +1 @@
+options brcmfmac feature_disable=0x82000

pi4/files/etc/profile.d/stormux_first_boot.sh

@@ -1,7 +1,25 @@
 #!/usr/bin/env bash
 
-if [[ "$(tty)" = "/dev/tty1" ]]; then
-    cat << "EOF"
+if [[ "$(tty)" != "/dev/tty1" ]]; then
+    return
+fi
+
+if [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then
+    return
+fi
+
+if ! [[ -x /usr/local/bin/configure-stormux ]]; then
+    return
+fi
+
+# For audible sudo prompts:
+unset sudoFlags
+if [[ -x /etc/audibleprompt.sh ]]; then
+    export SUDO_ASKPASS=/etc/audibleprompt.sh
+    export sudoFlags=("-A")
+fi
+
+cat << "EOF"
 Hello, and welcome to Stormux!
 
 Let's get you set up. After you press enter, you will be prompted for the sudo password.
@@ -12,7 +30,5 @@ Once again, the password is stormux in all lower case letters.
 
 Please press enter to continue.
 EOF
-    read -r
-    sudo configure-stormux
-    sudo rm -- "/etc/profile.d/stormux_first_boot.sh"
-fi
+read -r
+sudo "${sudoFlags[@]}" configure-stormux

pi4/files/etc/skel/.bash_aliases

@@ -1,3 +1,4 @@
 # Raspberry Pi Information
 alias pi-temp='/usr/bin/vcgencmd measure_temp'
 alias pi-version='cat /sys/firmware/devicetree/base/model;echo'
+alias pi-ip='ip a | grep -v "127.0.0.1" | grep -E -o "([0-9]{1,3}\.){3}[0-9]{1,3}/[0-9]{1,2}"'

pi4/files/etc/systemd/journald.conf

@@ -1,47 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-# Entries in this file show the compile time defaults. Local configuration
-# should be created by either modifying this file, or by creating "drop-ins" in
-# the journald.conf.d/ subdirectory. The latter is generally recommended.
-# Defaults can be restored by simply deleting this file and all drop-ins.
-#
-# Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config.
-#
-# See journald.conf(5) for details.
-
-[Journal]
-#Storage=auto
-#Compress=yes
-#Seal=yes
-#SplitMode=uid
-#SyncIntervalSec=5m
-#RateLimitIntervalSec=30s
-#RateLimitBurst=10000
-SystemMaxUse=20M
-#SystemKeepFree=
-#SystemMaxFileSize=
-#SystemMaxFiles=100
-#RuntimeMaxUse=
-#RuntimeKeepFree=
-#RuntimeMaxFileSize=
-#RuntimeMaxFiles=100
-#MaxRetentionSec=
-#MaxFileSec=1month
-#ForwardToSyslog=no
-#ForwardToKMsg=no
-#ForwardToConsole=no
-#ForwardToWall=yes
-#TTYPath=/dev/console
-#MaxLevelStore=debug
-#MaxLevelSyslog=debug
-#MaxLevelKMsg=notice
-#MaxLevelConsole=info
-#MaxLevelWall=emerg
-#LineMax=48K
-#ReadKMsg=yes
-#Audit=yes

pi4/files/etc/systemd/journald.conf.d/99-ramlog.conf

@@ -0,0 +1,3 @@
+[Journal]
+Storage=volatile
+SystemMaxUse=20M

pi4/files/etc/systemd/system/time_sync_at_boot.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Update system time from worldtimeapi.org
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/sync_time.sh
+
+[Install]
+WantedBy=multi-user.target

pi4/files/etc/vconsole.conf

@@ -0,0 +1,3 @@
+# This is the fallback vconsole configuration provided by systemd.
+
+KEYMAP=us_alt

pi4/files/root/rename-user.sh

@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+
+# Renames a user
+# Required arguments: old user name, new user name
+
+set -e
+
+question() {
+    echo
+    echo "$@"
+    read -r answer
+    answer="${answer:0:1}"
+    answer="${answer^}"
+}
+
+if [[ $# -ne 2 ]]; then
+    echo "Usage: $0 old-user new-user"
+    exit 1
+fi
+
+oldUser="$1"
+newUser="$2"
+
+# Make sure old user exists
+if ! id "$oldUser" >/dev/null 2>&1; then
+    echo "The user $oldUser does not exist."
+    exit 1
+fi
+
+# Make sure old user is not logged in
+if pgrep -u "$oldUser" >/dev/null; then
+    echo "The user $oldUser is currently logged in or has running processes. Cannot continue."
+    question "Would you like to forcibly log out $oldUser? (Y/N)"
+    if [[ "$answer" != "Y" ]]; then
+        exit 1
+    fi
+    systemctl stop display-manager
+    loginctl terminate-user "$oldUser"
+    sleep 2
+    if pgrep -u "$oldUser" >/dev/null; then
+        echo "The user $oldUser still has running processes after termination. Cannot continue."
+        exit 1
+    fi
+fi
+
+# Make sure new user does not exist
+if id "$newUser" >/dev/null 2>&1; then
+    echo "The user name $newUser is already taken."
+    exit 1
+fi
+
+# Make sure the new name is acceptable
+if ! [[ "$newUser" =~ ^[a-z_][a-z0-9_-]{0,31}$ ]]; then
+    echo "$newUser is not an acceptable user name."
+    exit 1
+fi
+
+# Passed all safety checks, proceed with the rename
+echo "Renaming $oldUser to $newUser..."
+groups=$(id -nG "$oldUser")
+groups="${groups// /,}"
+usermod -G "$groups" -m -d "/home/$newUser" -l "$newUser" "$oldUser"
+
+# Update nodm.conf if it exists
+if [[ -e /etc/nodm.conf ]]; then
+    echo "Updating /etc/nodm.conf..."
+    sed -i -e "s#^NODM_USER=.*#NODM_USER='$newUser'#" -e "s#^NODM_XSESSION=.*#NODM_XSESSION='/home/$newUser/.xinitrc'#" /etc/nodm.conf
+fi
+
+# Copy over crontab if it exists
+if crontab -u "$oldUser" -l >/tmp/${oldUser}_crontab.bak 2>/dev/null; then
+    echo "Copying over crontab..."
+    if crontab -u "$newUser" "/tmp/${oldUser}_crontab.bak"; then
+        rm "/tmp/${oldUser}_crontab.bak"
+    else
+        echo "Warning: failed to restore crontab for $newUser."
+        rm "/tmp/${oldUser}_crontab.bak"
+    fi
+fi
+
+# Update linger
+if [[ -e "/var/lib/systemd/linger/$oldUser" ]]; then
+    echo "Enabling linger..."
+    mv "/var/lib/systemd/linger/$oldUser" "/var/lib/systemd/linger/$newUser"
+fi
+
+# Optionally update files in new home directory
+echo
+echo "Would you like to search for references to $oldUser and update them to $newUser in files located in /home/$newUser?"
+question "This can take a while. (Y/N)"
+if [[ "$answer" == "Y" ]]; then
+    echo "Updating files..."
+    find "/home/$newUser" -type f -exec grep -Iq . "{}" \; -and -exec sed -i "s|$oldUser|$newUser|g" "{}" \;
+fi
+
+echo
+echo "Rename complete. The user, $newUser, is now available."
+question "Would you like to reboot?"
+if [[ "${answer}" == "Y" ]]; then
+    reboot
+fi
+
+exit 0

pi4/files/usr/local/bin/configure-stormux

@@ -1,54 +1,156 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-trap 'popd &> /dev/null' EXIT
+# For audible sudo prompts:
+unset sudoFlags
+if [[ -x /etc/audibleprompt.sh ]]; then
+    export SUDO_ASKPASS=/etc/audibleprompt.sh
+    export sudoFlags=("-A")
+fi
 
-export SUDO_ASKPASS=/etc/audibleprompt.sh
-if [[ ! -d /opt/configure-stormux ]]; then
-    # Offer to switch fenrir layout.
-    echo "Would you like to switch Fenrir to laptop layout? (y/n)"
+trap cleanup EXIT
+cleanup() {
+    popd &> /dev/null
+    if ! [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then
+        echo "Initial setup is not complete."
+        echo "To continue setup, please run:"
+        echo "sudo configure-stormux"
+    fi
+}
+
+
+if [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then
+    pushd /opt/configure-stormux
+    ./configure-stormux.sh
+    exit 0
+fi
+
+export DIALOGOPTS='--insecure --no-lines --visit-items'
+
+set_timezone() {
+    # Get the list of timezones
+    mapfile -t regions < <(timedatectl --no-pager list-timezones | cut -d '/' -f1 | sort -u)
+
+    # Use the same text twice here and just hide the tag field.
+        region=$(dialog --backtitle "Please select your Region" \
+                --no-tags \
+                --menu "Use up and down arrows or page-up and page-down to navigate the list, and press 'Enter' to make your selection." 0 0 0 \
+                $(for i in ${regions[@]} ; do echo "$i";echo "$i";done) --stdout)
+
+
+    mapfile -t cities < <(timedatectl --no-pager list-timezones | grep "$region" | cut -d '/' -f2 | sort -u)
+
+    # Use the same text twice here and just hide the tag field.
+        city=$(dialog --backtitle "Please select a city near you" \
+                --no-tags \
+                --menu "Use up and down arrow or page-up and page-down to navigate the list." 0 0 10 \
+                $(for i in ${cities[@]} ; do echo "$i";echo "$i";done) --stdout)
+
+    # Set the timezone
+    if [[ -f /etc/localtime ]]; then
+        rm /etc/localtime
+    fi
+    ln -sf /usr/share/zoneinfo/${region}/${city} /etc/localtime
+    timedatectl set-ntp true
+}
+
+
+# make sure the system is at a decent volume
+volume=50
+wait=0
+
+# Wait for pipewire to become available
+while [[ $wait -lt 30 ]]; do
+    if pgrep pipewire &> /dev/null ; then
+        wait=30 # We don't want to continue the loop
+    else
+        sleep 1
+        continue
+    fi
+    while [[ $volume -le 130 ]]; do
+        clear
+        spd-say "If this is loud enough, press enter."
+        if read -t4 ; then
+            break
+        else
+            ((volume+=10))
+        fi
+        pactl set-sink-volume @DEFAULT_SINK@ "${volume}%"
+    done
+    ((wait++))
+done
+# Offer to switch fenrir layout.
+echo "Would you like to switch Fenrir to laptop layout?"
+echo "Press y for yes or n for no followed by enter."
+read -r continue
+continue="${continue::1}"
+if [[ "${continue,}" == "y" ]];then
+    sed -i 's/=desktop/=laptop/' /etc/fenrirscreenreader/settings/settings.conf
+    clear
+    systemctl restart fenrirscreenreader.service
+fi
+
+# Check for possible resize
+diskSource="$(df --output='source' / | tail -1)"
+diskSize="$(df -h --output='size' / | tail -1 | tr -cd '[:digit:].')"
+diskSize=${diskSize%.*}
+if [[ $diskSize -le 7 ]]; then
+    echo "$diskSource is only $diskSize gigs, which means it probably needs to be resized. Would you like to do this now?"
+    echo "Press y for yes or n for no followed by enter."
     read -r continue
     continue="${continue::1}"
     if [[ "${continue,}" == "y" ]];then
-        sed -i 's/=desktop/=laptop/' /etc/fenrirscreenreader/settings/settings.conf
-        systemctl restart fenrirscreenreader.service
-        clear
+        sudo "${sudoFlags[@]}" growpartfs $diskSource
     fi
-    if ! ping -c1 stormux.org &> /dev/null ; then
+fi
+ 
+if ! ping -c1 stormux.org &> /dev/null ; then
     echo "No internet connection detected. Press enter to open NetworkManager."
-        echo "Note, it is best to put Fenrir into highlight mode while using NetworkManager."
-        echo "In desktop layout this is done by pressing Fenrir+numpad asterisk."
-        echo "That is the key just above numpad 9."
-        echo "In laptop mode, press Fenrir+y."
-        echo "In desktop mode the Fenrir key is numpad insert."
-        echo "In laptop mode the Fenrir key is the Super key, sometimes called the Windows key."
-        echo "Press enter to continue."
     read -r continue
+    echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
     nmtui-connect
-    fi
-    # Check for internet connectivity
-    if ping -qc1 -W 1 stormux.org &> /dev/null; then
+    echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+fi
+# Check for internet connectivity
+if ping -qc1 -W 1 stormux.org &> /dev/null; then
     echo "Updating the clock to prevent certificate errors..."
     # Get current date and time
     date_time=$(curl -s http://worldtimeapi.org/api/ip | grep -oP '(?<="datetime":")[^"]*')
     echo "Current date and time: $date_time"
     # set date and time
     date -s "$date_time"
+    echo "If your Pi does not have a CMOS battery and is powered off regularly, it may take a while for the time to be set correctly after boot."
+    echo "Stormux provides a service to sync the time after internet connection is established."
+    read -rp "Would you like the time to sync as soon as the Pi connects to the internet? " answer
+    answer="${answer:0:1}"
+    if [[ "${answer,,}" == "y" ]]; then
+        systemctl enable time_sync_at_boot.service
     else
+       echo "Time sync at boot skipped."
+       echo "If you change your mind later, simply type:"
+       echo "sudo systemctl enable time_sync_at_boot.service"
+    fi
+    set_timezone
+else
     echo "Please connect to the internet and run ${0##*/} again."
     exit 1
-    fi
-    echo "Installing configure-stormux..."
-    git -C /opt clone -q https://git.stormux.org/storm/configure-stormux || exit 1
 fi
+echo "Installing configure-stormux..."
+git -C /opt clone -q https://git.stormux.org/storm/configure-stormux || exit 1
 
 echo
 echo "Initial setup is complete."
 echo
-echo "If you would like more options, run configure-stormux,"
+echo "The default passwords are stormux for the stormux user"
+echo "and root for the root user. It is highly recommended to change them."
+echo "To change the password for stormux, run:"
+echo "passwd"
+echo "To change the password for root, run:"
+echo "sudo passwd"
+echo
+echo "For more configuration options, run configure-stormux,"
 echo "or you may configure your system manually."
 echo
 echo "Thank you for choosing Stormux."
 
 
-
 exit 0

pi4/files/usr/local/bin/sync_time.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+date_time=$(curl -s http://worldtimeapi.org/api/ip | grep -oP '(?<="datetime":")[^"]*')
+date -s "$date_time"