From 187ab25cce2c2052b5de8796a0d1a34ff77fdd39 Mon Sep 17 00:00:00 2001 From: Phoebus Date: Sat, 3 Oct 2026 04:50:05 -0700 Subject: [PATCH] fix(desktop): show tuigreet shortcut keys on slate --- docs/CHANGELOG.md | 8 ++++++++ docs/HANDOFF.md | 10 ++++++++++ docs/STATUS.md | 2 +- docs/VM-BOOT-VERIFICATION.md | 10 ++++++++++ installer-rs/crates/phoebus-core/src/system.rs | 3 ++- installer-rs/crates/phoebus-executor/src/desktop.rs | 1 + 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 21cc459..9ae1cfe 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -5,6 +5,14 @@ this file is the curated, human-readable summary. ## Unreleased — Fast defaults with user-controlled source builds +- **Visible greeter shortcuts (2026-10-03).** The slate theme previously set + tuigreet's `button` color to black, hiding the `ESC`, `F2`, `F3`, and `F12` + key hints against the dark VT background. The installer-generated greeter + config now uses the palette's readable yellow for those keys. After an + authenticated update in the existing VM, restarting greetd showed `ESC`, + `F2`, `F3`, `F12`, and `CMD` beside their actions. The screenshot is at + `/var/tmp/phoebus-vm/greeter-slate-shortcuts-20261003.png`; Rust checks pass. + - **Slate console login (2026-10-03).** Installed Phoebus systems now give tuigreet a short welcome greeting and soft white controls, and set the Linux virtual-console palette to the slate background shown in tuigreet's Usage diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md index d87b011..a8e2668 100644 --- a/docs/HANDOFF.md +++ b/docs/HANDOFF.md @@ -15,6 +15,16 @@ commit it. It should be short and current; use `git log` for detail. greeter. Fresh-install and reboot verification remain; the 20 GiB free-space gate for a fresh ISO/VM is still unmet. +- **Greeter shortcut keys (2026-10-03):** The first slate screenshot lacked + `ESC`/`F2`/`F3`/`F12` hints because `button=black` colored those glyphs black + against the dark background. The generated theme now uses `button=yellow`; + the config and installation tests, clippy, workspace tests, and release and + static builds pass. After an authenticated update in the existing VM, + restarting greetd showed yellow `ESC`/`F2`/`F3`/`F12`/`CMD` hints beside + their actions. Screenshot: + `/var/tmp/phoebus-vm/greeter-slate-shortcuts-20261003.png`. The VM remains + open at the corrected greeter; a fresh-install reboot is still pending. + - **External overlay leads (2026-10-02):** GPO lists `app-misc/chatgpt-desktop` in Gentoo community overlays, but `sys search` previously queried only Portage repositories enabled locally. The new diff --git a/docs/STATUS.md b/docs/STATUS.md index 05b341f..ba112e6 100644 --- a/docs/STATUS.md +++ b/docs/STATUS.md @@ -307,7 +307,7 @@ A fresh install with these defaults is not yet verified. | Mango + DankMaterialShell profile | yes | yes | live VM yes; installed desktop_install yes (347 pkgs); **seatd service active and running on detached boot** (`/run/seatd.sock` 0660 root:seat, `phoebus` in seat group); greeter, seat, DRM, PAM authentication and `sys --legacy` are verified | no | | Mango is the canonical desktop | yes | yes | fresh candidate installed graphical seat 30/30: Mango + DMS, first-login Phoebus welcome, terminal, spotlight, lock/unlock/logout | no | | greetd login (Mango + DarkMaterial) | yes | yes | authenticated seat0 + DRM card0 graphical login and logout, `gui-desktop-20261001T084157Z-ccefa3e1` | no | -| Slate tuigreet login palette and greeting | yes | yes (generated greetd TOML, 16-color VT palette, installed drop-in and package) | existing encrypted VM: black baseline captured; after authenticated in-guest update and greetd restart, slate background, white border and Phoebus greeting visually confirmed (`/var/tmp/phoebus-vm/greeter-slate-20261003.png`); fresh-install reboot pending | no | +| Slate tuigreet login palette and greeting | yes | yes (generated greetd TOML, 16-color VT palette, installed drop-in, package and visible shortcut-key color) | existing encrypted VM: after authenticated in-guest update and greetd restart, slate background, white border, Phoebus greeting and yellow `ESC`/`F2`/`F3`/`F12`/`CMD` hints visually confirmed (`/var/tmp/phoebus-vm/greeter-slate-shortcuts-20261003.png`); fresh-install reboot pending | no | | Live desktop ISO (Mango + DMS) | yes | guards tested | candidate ISO SHA `b14f37e1…c7b986b5281`: UEFI GUI 32/32, real OpenCode 18/18; embedded static binaries match | no | | Live welcome autostart + duplicate prevention | yes | guards tested | live graphical VM | no | | Welcome primary action keyboard-focus | yes | guards tested | live graphical VM | no | diff --git a/docs/VM-BOOT-VERIFICATION.md b/docs/VM-BOOT-VERIFICATION.md index ff44f33..d6ddf19 100644 --- a/docs/VM-BOOT-VERIFICATION.md +++ b/docs/VM-BOOT-VERIFICATION.md @@ -17,6 +17,16 @@ RGB `(46, 52, 64)`. This verifies the updated existing guest after a service restart. A fresh install and reboot with the installer-generated assets are still pending. No physical disk was touched. +The capture also exposed missing shortcut-key hints in the bottom status bar. +The original theme used `button=black`, which hid them on slate; the generated +config now uses `button=yellow`. After another authenticated guest login, +updating `/etc/greetd/config.toml` and restarting greetd showed yellow +`ESC`, `F2`, `F3`, `F12`, and `CMD` key labels beside their actions. The +inspected capture is +`/var/tmp/phoebus-vm/greeter-slate-shortcuts-20261003.png`. This verifies +the correction in the existing guest; a fresh install and reboot remain +pending. + ## 2026-10-01 Visible playground `sys` presentation A rebuilt `sys` binary was installed only in the writable overlay of the diff --git a/installer-rs/crates/phoebus-core/src/system.rs b/installer-rs/crates/phoebus-core/src/system.rs index f7d720b..fbacbcd 100644 --- a/installer-rs/crates/phoebus-core/src/system.rs +++ b/installer-rs/crates/phoebus-core/src/system.rs @@ -2523,7 +2523,7 @@ pub fn greetd_config(default_cmd: &str) -> String { vt = 7\n\ \n\ [default_session]\n\ - command = \"tuigreet --time --greeting 'Welcome to Phoebus OS' --theme 'border=white;text=white;time=white;container=black;greet=white;prompt=white;input=white;action=white;button=black' --remember --remember-session --sessions /usr/share/wayland-sessions --cmd {default_cmd}\"\n\ + command = \"tuigreet --time --greeting 'Welcome to Phoebus OS' --theme 'border=white;text=white;time=white;container=black;greet=white;prompt=white;input=white;action=white;button=yellow' --remember --remember-session --sessions /usr/share/wayland-sessions --cmd {default_cmd}\"\n\ user = \"greeter\"\n" ) } @@ -3356,6 +3356,7 @@ mod tests { assert!(cfg.contains("tuigreet")); assert!(cfg.contains("--greeting 'Welcome to Phoebus OS'")); assert!(cfg.contains("--theme 'border=white;text=white;time=white;container=black;")); + assert!(cfg.contains(";button=yellow'")); assert!(cfg.contains("--sessions /usr/share/wayland-sessions")); assert!(cfg.contains("--cmd /usr/local/bin/phoebus-session-mango")); assert!(mango_desktop_packages().contains(&"sys-apps/kbd")); diff --git a/installer-rs/crates/phoebus-executor/src/desktop.rs b/installer-rs/crates/phoebus-executor/src/desktop.rs index 5200c50..9220c9a 100644 --- a/installer-rs/crates/phoebus-executor/src/desktop.rs +++ b/installer-rs/crates/phoebus-executor/src/desktop.rs @@ -821,6 +821,7 @@ mod tests { assert!(login.contains("phoebus-session-mango")); assert!(login.contains("tuigreet")); assert!(login.contains("--greeting 'Welcome to Phoebus OS'")); + assert!(login.contains(";button=yellow'")); assert_eq!( std::fs::read_to_string(exec.root.join("etc/greetd/phoebus.vtrgb")).unwrap(), sysgen::greetd_vt_palette()