bernardo/Nomarchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(system): enable uwsm and fix session detection to allow VM login

Browse Source 
- Enable programs.uwsm for session management.
- Improve SDDM theme session detection logic to be case-insensitive and more robust.
- Perform a global cleanup of 'Nnomarchy' and 'org.nnomarchy' typos across all scripts and configurations.
This commit is contained in:
Bernardo Magri
2026-04-05 11:18:41 +01:00
parent 7f086f07bf
commit 8a72a09bd8
105 changed files with 320 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
bin/apps/nomarchy-windows-vm
View File

@@ -35,7 +35,7 @@ install_windows() {
check_prerequisites
nnomarchy-pkg-add freerdp openbsd-netcat gum
nomarchy-pkg-add freerdp openbsd-netcat gum
mkdir -p "$HOME/.windows"
mkdir -p "$HOME/.config/windows"
@@ -50,7 +50,7 @@ install_windows() {
[Desktop Entry]
Name=Windows
Comment=Start Windows VM via Docker and connect with RDP
Exec=uwsm app -- nnomarchy-windows-vm launch
Exec=uwsm app -- nomarchy-windows-vm launch
Icon=$HOME/.local/share/applications/icons/windows.png
Terminal=false
Type=Application
@@ -177,7 +177,7 @@ EOF
services:
windows:
image: dockurr/windows
container_name: nnomarchy-windows
container_name: nomarchy-windows
environment:
VERSION: "11"
RAM_SIZE: "$SELECTED_RAM"
@@ -236,7 +236,7 @@ EOF
echo ""
echo "Once finished, launch 'Windows' via Super + Space"
echo ""
echo "To stop the VM: nnomarchy-windows-vm stop"
echo "To stop the VM: nomarchy-windows-vm stop"
echo "To change resources: ~/.config/windows/docker-compose.yml"
echo ""
}
@@ -269,7 +269,7 @@ launch_windows() {
# Check if config exists
if [[ ! -f $COMPOSE_FILE ]]; then
echo "Windows VM not configured. Please run: nnomarchy-windows-vm install"
echo "Windows VM not configured. Please run: nomarchy-windows-vm install"
exit 1
fi
@@ -282,7 +282,7 @@ launch_windows() {
[[ -z $WIN_PASS ]] && WIN_PASS="admin"
# Check if container is already running
CONTAINER_STATUS=$(docker inspect --format='{{.State.Status}}' nnomarchy-windows 2>/dev/null)
CONTAINER_STATUS=$(docker inspect --format='{{.State.Status}}' nomarchy-windows 2>/dev/null)
if [[ $CONTAINER_STATUS != "running" ]]; then
echo "Starting Windows VM..."
@@ -292,21 +292,21 @@ launch_windows() {
if ! docker-compose -f "$COMPOSE_FILE" up -d 2>&1; then
echo "❌ Failed to start Windows VM!"
echo " Try checking: nnomarchy-windows-vm status"
echo " View logs: docker logs nnomarchy-windows"
echo " Try checking: nomarchy-windows-vm status"
echo " View logs: docker logs nomarchy-windows"
notify-send -u critical "Windows VM" "Failed to start Windows VM"
exit 1
fi
echo "Waiting for Windows VM to start..."
WAIT_COUNT=0
until docker logs nnomarchy-windows 2>&1 | grep -qi "windows started successfully"; do
until docker logs nomarchy-windows 2>&1 | grep -qi "windows started successfully"; do
sleep 2
WAIT_COUNT=$((WAIT_COUNT + 1))
if (( WAIT_COUNT > 60 )); then # 2 minutes timeout
echo ""
echo "❌ Timeout: Windows VM failed to start within 2 minutes"
echo " Check logs: docker logs nnomarchy-windows"
echo " Check logs: docker logs nomarchy-windows"
exit 1
fi
done
@@ -315,7 +315,7 @@ launch_windows() {
# Build the connection info
if [[ $KEEP_ALIVE = "true" ]]; then
LIFECYCLE="VM will keep running after RDP closes
To stop: nnomarchy-windows-vm stop"
To stop: nomarchy-windows-vm stop"
else
LIFECYCLE="VM will auto-stop when RDP closes"
fi
@@ -342,7 +342,7 @@ To stop: nnomarchy-windows-vm stop"
# If scale is less than 130%, don't set any scale (use default 100)
# Connect with RDP in fullscreen (auto-detects resolution)
xfreerdp3 /u:"$WIN_USER" /p:"$WIN_PASS" /v:127.0.0.1:3389 -grab-keyboard /sound /microphone /clipboard /cert:ignore /title:"Windows VM - Nnomarchy" /dynamic-resolution /gfx:AVC444 /floatbar:sticky:off,default:visible,show:fullscreen $RDP_SCALE
xfreerdp3 /u:"$WIN_USER" /p:"$WIN_PASS" /v:127.0.0.1:3389 -grab-keyboard /sound /microphone /clipboard /cert:ignore /title:"Windows VM - Nomarchy" /dynamic-resolution /gfx:AVC444 /floatbar:sticky:off,default:visible,show:fullscreen $RDP_SCALE
# After RDP closes, stop the container unless --keep-alive was specified
if [[ $KEEP_ALIVE = "false" ]]; then
@@ -353,7 +353,7 @@ To stop: nnomarchy-windows-vm stop"
else
echo ""
echo "RDP session closed. Windows VM is still running."
echo "To stop it: nnomarchy-windows-vm stop"
echo "To stop it: nomarchy-windows-vm stop"
fi
}
@@ -371,15 +371,15 @@ stop_windows() {
status_windows() {
if [[ ! -f $COMPOSE_FILE ]]; then
echo "Windows VM not configured."
echo "To set up: nnomarchy-windows-vm install"
echo "To set up: nomarchy-windows-vm install"
exit 1
fi
CONTAINER_STATUS=$(docker inspect --format='{{.State.Status}}' nnomarchy-windows 2>/dev/null)
CONTAINER_STATUS=$(docker inspect --format='{{.State.Status}}' nomarchy-windows 2>/dev/null)
if [[ -z $CONTAINER_STATUS ]]; then
echo "Windows VM container not found."
echo "To start: nnomarchy-windows-vm launch"
echo "To start: nomarchy-windows-vm launch"
elif [[ $CONTAINER_STATUS = "running" ]]; then
gum style \
--border normal \
@@ -391,16 +391,16 @@ status_windows() {
"Web interface: http://127.0.0.1:8006" \
"RDP available: port 3389" \
"" \
"To connect: nnomarchy-windows-vm launch" \
"To stop: nnomarchy-windows-vm stop"
"To connect: nomarchy-windows-vm launch" \
"To stop: nomarchy-windows-vm stop"
else
echo "Windows VM is stopped (status: $CONTAINER_STATUS)"
echo "To start: nnomarchy-windows-vm launch"
echo "To start: nomarchy-windows-vm launch"
fi
}
show_usage() {
echo "Usage: nnomarchy-windows-vm [command] [options]"
echo "Usage: nomarchy-windows-vm [command] [options]"
echo ""
echo "Commands:"
echo " install Install and configure Windows VM"
@@ -413,10 +413,10 @@ show_usage() {
echo " help Show this help message"
echo ""
echo "Examples:"
echo " nnomarchy-windows-vm install # Set up Windows VM for first time"
echo " nnomarchy-windows-vm launch # Connect to VM (auto-stop on exit)"
echo " nnomarchy-windows-vm launch -k # Connect to VM (keep running)"
echo " nnomarchy-windows-vm stop # Shut down the VM"
echo " nomarchy-windows-vm install # Set up Windows VM for first time"
echo " nomarchy-windows-vm launch # Connect to VM (auto-stop on exit)"
echo " nomarchy-windows-vm launch -k # Connect to VM (keep running)"
echo " nomarchy-windows-vm stop # Shut down the VM"
}
# Main command dispatcher