Desktops improvements (#18)

* Update ideas

* don't allow long workload names to mess up alignment in status output

* another idea

* fix completions

* Add nested wayland containers to make it easier to configure kms & vnc containers. Add desktop environment niceties

* smol fixes

* remove invalid cliphist package, improve sunshine error output

* small adjustments

* update the other wayfire containers too

* minor details

* add nano, sort package names

Author: BenSmith

docs/TROUBLESHOOTING.md

@@ -478,18 +478,18 @@ If it fails:
 
 ### File locations
 
-| Path | Purpose |
-|------|---------|
-| `/etc/workloads.d/*.toml` | Workload configs |
-| `/run/systemd/generator/workload-*.service` | Generated service files (temporary) |
-| `/run/sysusers.d/workload-*.conf` | Generated sysusers configs |
-| `/var/lib/workloads/<name>/` | Default home directory |
-| `/run/workload-env/workload-*.env` | EnvironmentFiles with XDG_RUNTIME_DIR |
-| `/run/user/<uid>/` | Runtime directory (requires linger) |
-| `/etc/subuid` `/etc/subgid` | UID/GID mapping ranges |
-| `/var/lib/systemd/linger/<user>` | Linger enabled marker |
+| Path                                                   | Purpose |
+|--------------------------------------------------------|---------|
+| `/etc/workloads.d/*.toml`                              | Workload configs |
+| `/run/systemd/generator/workload-*.service`            | Generated service files (temporary) |
+| `/run/systemd/system/workload-*.conf`                  | Generated sysusers configs |
+| `/var/lib/workloads/<name>/`                           | Default home directory |
+| `/run/workload-env/workload-*.env`                     | EnvironmentFiles with XDG_RUNTIME_DIR |
+| `/run/user/<uid>/`                                     | Runtime directory (requires linger) |
+| `/etc/subuid` `/etc/subgid`                            | UID/GID mapping ranges |
+| `/var/lib/systemd/linger/<user>`                       | Linger enabled marker |
 | `/usr/share/containers/seccomp-workload-baseline.json` | Hardened seccomp profile (applied by default) |
-| `/usr/share/containers/seccomp.json` | Podman default seccomp profile (less strict) |
+| `/usr/share/containers/seccomp.json`                   | Podman default seccomp profile (less strict) |
 
 ### Useful commands
 

docs/ideas.md

@@ -166,3 +166,4 @@ Start here when unsure what to work on:
   Could add configurable schedule, notification on updates, and update log.
 - Workloads get LVM provisioned to cap or flex storage
 - consider python3-tomlkit for toml edits that preserve comments
+- consider using podman api instead of podman cli to bypass all the quoting and escaping mess

hypervisor.Containerfile

@@ -208,7 +208,9 @@ COPY bin/cosy /usr/bin/
 COPY man/cosy.1 /usr/share/man/man1/cosy.1
 RUN chmod 0755 /usr/bin/cosy && \
     chmod 0644 /usr/share/man/man1/cosy.1 && \
-    chmod 0644 /usr/lib/systemd/system/emergency.target.d/emergency-access.conf
+    chmod 0644 /usr/lib/systemd/system/emergency.target.d/emergency-access.conf && \
+    /usr/bin/cosy completion bash > /usr/share/bash-completion/completions/cosy && \
+    chmod 0644 /usr/share/bash-completion/completions/cosy
 
 # Define required labels for this bootc image to be recognized as such
 LABEL containers.bootc 1

justfile

@@ -134,7 +134,7 @@ build-amd:
   podman build \
     --env=http_proxy={{proxy}} --env=https_proxy={{proxy}} \
     -t localhost/hypervisor-amd:{{tag}} \
-    -t {{local_registry}}/hypervisor-amd:{{tag}} \
+    -t {{local_registry}}/hypervisor-amd:latest \
     -t localhost/hypervisor-amd:latest \
     -f hypervisor-amd.Containerfile .
 

security/pwquality-no-dictionary.conf

@@ -1 +1,2 @@
+# avoids a crash when system dictionary isn't available
 dictcheck = 0

tests/vm/run-vm-tests.sh

@@ -650,7 +650,7 @@ if [ -n "$_update_uid" ]; then
     # Record current image ID
     _old_id=$(cd "$_update_home" && runuser -u "$_update_user" -- \
         env XDG_RUNTIME_DIR="/run/user/${_update_uid}" \
-        podman images --format '{{.ID}}' "192.168.0.64:5000/library/registry:2" 2>/dev/null | head -1)
+        podman images --format '{{.ID}}' "registry.local:5000/library/registry:2" 2>/dev/null | head -1)
 
     if [ -n "$_old_id" ]; then
         pass "update: current image ID recorded (${_old_id:0:12})"

workloadctl/completions/workloadctl-completion.bash

@@ -18,7 +18,7 @@ _workload_ctl_completion() {
     # Get list of credential names (without path)
     local credentials=""
     if [[ -d "$credstore_dir" ]]; then
-        credentials=$(cd "$credstore_dir" 2>/dev/null && ls -1 2>/dev/null | xargs -n1 basename)
+        credentials=$(cd "$credstore_dir" 2>/dev/null && ls -1 2>/dev/null)
     fi
 
     # First argument: complete commands
@@ -136,18 +136,9 @@ _workload_ctl_completion() {
             fi
             return 0
             ;;
-        ps)
-            # Complete with --json
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "--json" -- "$cur") )
-            fi
-            return 0
-            ;;
-        list)
+        ps|list)
             # Complete with --json flag
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "--json" -- "$cur") )
-            fi
+            COMPREPLY=( $(compgen -W "--json" -- "$cur") )
             return 0
             ;;
         create)
@@ -160,8 +151,6 @@ _workload_ctl_completion() {
                 COMPREPLY=( $(compgen -W "always true false" -- "$cur") )
             elif [[ "$prev" == "--network" ]]; then
                 COMPREPLY=( $(compgen -W "host pasta none" -- "$cur") )
-            elif [[ "$prev" == "--volume" ]]; then
-                _filedir
             fi
             return 0
             ;;
@@ -258,12 +247,6 @@ _workload_ctl_completion() {
             return 0
             ;;
     esac
-
-    # Third argument for disable: workload name after --purge
-    if [[ $cword -eq 3 && "${words[1]}" == "disable" && "${words[2]}" == "--purge" ]]; then
-        COMPREPLY=( $(compgen -W "$workloads" -- "$cur") )
-        return 0
-    fi
 }
 
 complete -F _workload_ctl_completion workloadctl

workloadctl/containers/desktop-labwc-kms/Containerfile

@@ -10,36 +10,44 @@ RUN dnf install --setopt=install_weak_deps=False --nodocs -y \
     fuzzel \
     grim \
     htop \
+    imv \
     labwc \
     libevdev \
     libinput \
     libseat \
+    mako \
     mesa-dri-drivers \
     mesa-libEGL \
     mesa-libGL \
     mesa-libgbm \
     mesa-vulkan-drivers \
+    nano \
     neovim \
     pipewire \
     pipewire-alsa \
     pipewire-pulseaudio \
     procps-ng \
     slurp \
     sudo \
+    swappy \
     swaybg \
     systemd \
     systemd-udev \
     util-linux \
     waybar \
+    wdisplays \
+    wf-recorder \
     wireplumber \
     wl-clipboard \
+    wlr-randr \
     xorg-x11-server-Xwayland \
     && dnf clean all
 
 # Labwc config
 COPY --link --chmod=0644 labwc-config/rc.xml /etc/xdg/labwc/rc.xml
 COPY --link --chmod=0755 labwc-config/autostart /etc/xdg/labwc/autostart
 COPY --link --chmod=0644 labwc-config/waybar-config /etc/xdg/waybar/config
+COPY --link --chmod=0644 foot.ini /etc/xdg/foot/foot.ini
 
 # systemd services
 COPY --link --chmod=0644 systemd/labwc.service /usr/lib/systemd/system/labwc.service

workloadctl/containers/desktop-labwc-kms/foot.ini

@@ -0,0 +1,11 @@
+[main]
+font=Fira Code:size=12
+initial-window-size-chars=100x30
+pad=8x8
+shell=/bin/bash -l
+
+[cursor]
+style=beam
+
+[colors]
+alpha=0.95

workloadctl/containers/desktop-labwc-kms/labwc-config/autostart

@@ -1,6 +1,7 @@
 #!/bin/bash
 swaybg -c '#2e3440' &
 waybar &
+mako &
 
 # Audio — start PipeWire stack under labwc's D-Bus session
 # SPA's udev-based ALSA enumeration fails in containers (podman's /dev tmpfs