Updated convert to server option.

.includes/convert-to-server.sh

@@ -36,12 +36,9 @@ for i in \
     bluez \
     bluez-utils \
     brltty \
-    cloud-utils \
     espeak-ng \
     fenrir-git \
-    growpartfs \
     go \
-    nodm-dgw \
     pipewire \
     pipewire-alsa \
     pipewire-jack \
@@ -52,8 +49,11 @@ for i in \
     python-evdev \
     python-dbus \
     python-pyte \
+    python-pyenchant \
+    python-pyperclip \
     rhvoice-voice-bdl \
     screen \
+    socat \
     sox \
     speech-dispatcher \
     wireplumber \

.includes/functions.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 install_package() {
     # If for some reason we have to change AUR helpers, this function should make it easy to update everything all at once.
     # make sure system is up to date
@@ -26,3 +28,73 @@ if dialog --clear --backtitle "Stormux" --yesno "Would you like to reboot now to
 attention() {
     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
 }
+
+add_stormux_repo() {
+    # Check if StormUX repository is already configured
+    if grep -q "\[stormux\]" /etc/pacman.conf; then
+        msgbox "StormUX repository is already configured."
+        return 0
+    fi
+    
+    infobox "Adding StormUX repository and importing signing key..."
+    
+    # Import the repository signing key
+    if ! curl -s https://packages.stormux.org/stormux_repo.pub | sudo "${sudoFlags[@]}" pacman-key --add -; then
+        msgbox "Failed to download StormUX repository key."
+        return 1
+    fi
+    
+    # Locally sign the key
+    if ! sudo "${sudoFlags[@]}" pacman-key --lsign-key 52ADA49000F1FF0456F8AEEFB4CDE1CD56EF8E82; then
+        msgbox "Failed to sign StormUX repository key."
+        return 1
+    fi
+    
+    # Add repository to pacman.conf before [core] to give it highest priority
+    local temp_conf
+    temp_conf=$(mktemp)
+    local added_repo=false
+    
+    while IFS= read -r line; do
+        # Add StormUX repo before [core] section
+        if [[ "$line" == "[core]" ]] && [[ "$added_repo" == false ]]; then
+            {
+                echo "[stormux]"
+                echo "SigLevel = Required DatabaseOptional"
+                echo "Server = https://packages.stormux.org/\$arch"
+                echo ""
+            } >> "$temp_conf"
+            added_repo=true
+        fi
+        echo "$line" >> "$temp_conf"
+    done < /etc/pacman.conf
+    
+    # If we didn't find [core] section, add it at the end
+    if [[ "$added_repo" == false ]]; then
+        {
+            echo ""
+            echo "[stormux]"
+            echo "SigLevel = Required DatabaseOptional"
+            echo "Server = https://packages.stormux.org/\$arch"
+        } >> "$temp_conf"
+    fi
+    
+    # Replace the original pacman.conf
+    if ! sudo "${sudoFlags[@]}" cp "$temp_conf" /etc/pacman.conf; then
+        rm -f "$temp_conf"
+        msgbox "Failed to update pacman.conf with StormUX repository."
+        return 1
+    fi
+    
+    rm -f "$temp_conf"
+    
+    # Refresh package databases
+    if ! sudo "${sudoFlags[@]}" pacman -Syy; then
+        msgbox "Failed to refresh package databases after adding StormUX repository."
+        return 1
+    fi
+    
+    msgbox "StormUX repository added successfully!"
+    return 0
+}
+

.includes/gui.sh

@@ -1,6 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
+# Remove existing nodm from /etc/pam.d so package installation goes smoothly
+if [[ -e /etc/pam.d/nodm ]]; then
+    sudo rm -f /etc/pam.d/nodm
+fi
+
+# be sure there is no Xorg interference
+yay -Runcds --noconfirm libx11
+
 packages="$1"
 packages="${packages//lxqt/lxqt lxterminal oxygen-icons ratpoison network-manager-applet}"
 packages="${packages//mate/mate mate-extra network-manager-applet}"
@@ -15,17 +23,15 @@ case "${1}" in
 esac
 
 ./.includes/toggle-screen.sh -n
-install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-drivers xorg-server xorg-xinit
+
+# Install X11Libre and GUI packages
+install_package ${packages} brave-bin nodm-dgw orca speech-dispatcher xclip xlibre-xserver xlibre-input-libinput xlibre-video-fbdev xlibre-video-dummy-with-vt
 
 # GUI bluetooth manager
 if [[ "${architecture}" == "aarch64" ]]; then
     install_package blueman
 fi
 
-# replace xf86-video-dummy with xf86-video-dummy-with-vt
-yay --noconfirm -Rdd xf86-video-dummy
-url_install 'https://stormux.org/packages/xf86-video-dummy-with-vt-0.4.1-1-aarch64.pkg.tar.xz'
-
 # Configure nodm
 sudo sed -i "s/{user}/$USER/g" /etc/nodm.conf
 
@@ -64,7 +70,7 @@ if [[ "$1" == "i3" ]]; then
 gitDir="$(mktemp -d)"
 echo "Loading I38, please wait..."
 git clone -q https://git.stormux.org/storm/I38 "$gitDir"
-cd "$gitDir"
+cd "$gitDir" || return
 # Play a sound to let the user know the next part is interactive.
 attention
 ./i38.sh -x

configure-stormux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Configure Stormux
 # A script to configure the system for new users.
 #
@@ -73,7 +73,7 @@ fi
 while [[ "$choice" != "Exit" ]]; do
     case "$choice" in
         "Change username")
-            ./.includes/chuser.sh $(inputbox "Please enter the new username, letters, dashes, and underscores only.")
+            ./.includes/chuser.sh "$(inputbox "Please enter the new username, letters, dashes, and underscores only.")"
             restart
         ;;
         "Configure Fenrir")
@@ -121,6 +121,9 @@ while [[ "$choice" != "Exit" ]]; do
         "Convert to Server")
             source .includes/convert-to-server.sh
         ;;
+        "Configure StormUX Repository")
+            add_stormux_repo
+        ;;
     esac
     options=(
         "Change username"
@@ -145,6 +148,7 @@ while [[ "$choice" != "Exit" ]]; do
         "Get help on IRC"
         "Update configure-stormux"
         "Convert to Server"
+        "Configure StormUX Repository"
     )
     choice="$(menulist "${options[@]}")" || break
 done