pastilhasandClaude Opus 5
16f5175205
cleanup-desktop.sh still described the era when Officer installed a desktop of its own — XFCE on a TigerVNC Xvnc — so tearing the remote desktop down meant deleting a desktop nobody else used. That stopped being true when the setup moved to mirroring the machine's existing session with x11vnc, and the script was left actively dangerous: it purged dbus-x11 and Brave, deleted ~/.vnc, and reinstalled gnome-keyring, all of which the current GNOME setup depends on or deliberately removes. Running it today broke the desktop rather than cleaning it up. Rewritten as the actual inverse of setup-desktop.sh: - removes what Officer added — x11vnc, ~/.vnc, the GDM auto-login and forced Xorg keys, the forced EDID and its kernel command line, the login-time mode setter, the legacy officer-vnc unit, the VNC entries in .env - keeps ubuntu-desktop, gdm3 and dbus-x11, which are the machine's own desktop and not Officer's to delete - still purges XFCE and TigerVNC when present, since a host set up by the older script carries them and they are precisely what this undoes - Brave is opt-in behind --purge-brave: setup installs it, but by teardown time it is usually just the user's browser with their profile in it The GRUB and GDM edits were checked against copies of the real files: stripping the EDID parameters leaves other kernel arguments intact wherever they sit in the line, and the GDM revert does not disturb the commented examples that ship in custom.conf. The package matcher names each xfce-family prefix rather than globbing '^libxf', which would have taken libxfixes, libxft and libxfont with it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>