From 88151291065b3e34a9c63b1503928b46ebf80ea5 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Tue, 30 Jun 2026 20:23:35 -0400
Subject: [PATCH] Modifed I38 and convert to server to match latest images.

---
 .includes/convert-to-server.sh | 31 ++++++++++++++++++++++++++-----
 .includes/remove-i38.sh        |  6 +++++-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/.includes/convert-to-server.sh b/.includes/convert-to-server.sh
index 5128f8a..beb1ef5 100755
--- a/.includes/convert-to-server.sh
+++ b/.includes/convert-to-server.sh
@@ -13,6 +13,10 @@ dialog --backtitle "Configure Stormux" \
     fi
 
 sudoFlags=("${sudoFlags[@]}")
+yaySudoArgs=()
+if [[ ${#sudoFlags[@]} -gt 0 ]]; then
+    yaySudoArgs=(--sudoflags "${sudoFlags[*]}")
+fi
 
 dialog --backtitle "Configure Stormux" \
     --yesno "This will make catastrophic changes to your system. If you are not sure you want to do this, select no by pressing the letter n on your keyboard. Afterwards, you will only be able to login with an ssh key and there will be no screen reader.\nNote, configure-stormux will no longer be available." -1 -1 --stdout || exit 0
@@ -75,38 +79,55 @@ Would you like to remove the lock and continue?" -1 -1 --stdout; then
     fi
 fi
 
-for packageName in \
+serverRemovalPackages=(
     alsa-firmware \
     alsa-utils \
     bluez \
     bluez-utils \
     brltty \
+    cthulhu \
     espeak-ng \
     fenrir \
     fenrir-git \
     gstreamer \
     gst-plugins-base \
     gst-plugins-good \
+    i38 \
     ii \
+    magic-wormhole \
+    nodm-dgw \
     pipewire \
     pipewire-alsa \
     pipewire-jack \
     pipewire-pulse \
     poppler \
-    python-evdev \
     python-dbus \
-    python-pyte \
+    python-evdev \
+    python-gobject \
+    python-msgpack \
     python-pyenchant \
+    python-pyte \
     python-pyperclip \
+    python-tornado \
+    realtime-privileges \
     rhvoice-voice-bdl \
     screen \
     socat \
     sox \
     speech-dispatcher \
+    w3m-git \
     wireplumber \
     xdg-user-dirs \
-    xdg-utils ; do
-    yay -Runcds --noconfirm "$packageName" &> /dev/null
+    xdg-utils \
+    xlibre-input-libinput \
+    xlibre-video-dummy-with-vt \
+    xlibre-video-fbdev \
+    xlibre-xserver \
+    xorg-xinit
+)
+
+for packageName in "${serverRemovalPackages[@]}"; do
+    yay "${yaySudoArgs[@]}" -Runcds --noconfirm "$packageName" &> /dev/null
 done
 
 rm -rfv ~/.config
diff --git a/.includes/remove-i38.sh b/.includes/remove-i38.sh
index f87e4d8..a3f9389 100644
--- a/.includes/remove-i38.sh
+++ b/.includes/remove-i38.sh
@@ -6,6 +6,10 @@ if [[ "$(whoami)" == "root" ]]; then
 fi
 
 sudoFlags=("${sudoFlags[@]}")
+yaySudoArgs=()
+if [[ ${#sudoFlags[@]} -gt 0 ]]; then
+    yaySudoArgs=(--sudoflags "${sudoFlags[*]}")
+fi
 
 confirmRemoval="$(yesno "This will remove the I38 desktop, disable GUI startup, remove the XLibre desktop packages installed for I38, and delete generated I38 configuration from your account. Continue?")"
 if [[ "$confirmRemoval" != "Yes" ]]; then
@@ -44,7 +48,7 @@ for packageName in "${packages[@]}"; do
 done
 
 if [[ ${#installedPackages[@]} -gt 0 ]]; then
-    yay --sudoflags "${sudoFlags[@]}" --noconfirm -Rns "${installedPackages[@]}"
+    yay "${yaySudoArgs[@]}" --noconfirm -Rns "${installedPackages[@]}"
 fi
 
 removeConfig="$(yesno "Delete generated I38 files from $HOME? This removes ~/.config/i3, ~/.xinitrc, ~/.xprofile, and ~/git/I38 if present.")"