fix(desktop): show tuigreet shortcut keys on slate
Some checks are pending
ci / test (push) Waiting to run

This commit is contained in:
Phoebus 2026-10-03 04:50:05 -07:00
parent ac65b362de
commit 187ab25cce
6 changed files with 32 additions and 2 deletions

View file

@ -5,6 +5,14 @@ this file is the curated, human-readable summary.
## Unreleased — Fast defaults with user-controlled source builds ## 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 - **Slate console login (2026-10-03).** Installed Phoebus systems now give
tuigreet a short welcome greeting and soft white controls, and set the Linux 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 virtual-console palette to the slate background shown in tuigreet's Usage

View file

@ -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 greeter. Fresh-install and reboot verification remain; the 20 GiB free-space
gate for a fresh ISO/VM is still unmet. 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 - **External overlay leads (2026-10-02):** GPO lists
`app-misc/chatgpt-desktop` in Gentoo community overlays, but `sys search` `app-misc/chatgpt-desktop` in Gentoo community overlays, but `sys search`
previously queried only Portage repositories enabled locally. The new previously queried only Portage repositories enabled locally. The new

View file

@ -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 + 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 | | 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 | | 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 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 | | Live welcome autostart + duplicate prevention | yes | guards tested | live graphical VM | no |
| Welcome primary action keyboard-focus | yes | guards tested | live graphical VM | no | | Welcome primary action keyboard-focus | yes | guards tested | live graphical VM | no |

View file

@ -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 restart. A fresh install and reboot with the installer-generated assets are
still pending. No physical disk was touched. 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 ## 2026-10-01 Visible playground `sys` presentation
A rebuilt `sys` binary was installed only in the writable overlay of the A rebuilt `sys` binary was installed only in the writable overlay of the

View file

@ -2523,7 +2523,7 @@ pub fn greetd_config(default_cmd: &str) -> String {
vt = 7\n\ vt = 7\n\
\n\ \n\
[default_session]\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" user = \"greeter\"\n"
) )
} }
@ -3356,6 +3356,7 @@ mod tests {
assert!(cfg.contains("tuigreet")); assert!(cfg.contains("tuigreet"));
assert!(cfg.contains("--greeting 'Welcome to Phoebus OS'")); assert!(cfg.contains("--greeting 'Welcome to Phoebus OS'"));
assert!(cfg.contains("--theme 'border=white;text=white;time=white;container=black;")); 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("--sessions /usr/share/wayland-sessions"));
assert!(cfg.contains("--cmd /usr/local/bin/phoebus-session-mango")); assert!(cfg.contains("--cmd /usr/local/bin/phoebus-session-mango"));
assert!(mango_desktop_packages().contains(&"sys-apps/kbd")); assert!(mango_desktop_packages().contains(&"sys-apps/kbd"));

View file

@ -821,6 +821,7 @@ mod tests {
assert!(login.contains("phoebus-session-mango")); assert!(login.contains("phoebus-session-mango"));
assert!(login.contains("tuigreet")); assert!(login.contains("tuigreet"));
assert!(login.contains("--greeting 'Welcome to Phoebus OS'")); assert!(login.contains("--greeting 'Welcome to Phoebus OS'"));
assert!(login.contains(";button=yellow'"));
assert_eq!( assert_eq!(
std::fs::read_to_string(exec.root.join("etc/greetd/phoebus.vtrgb")).unwrap(), std::fs::read_to_string(exec.root.join("etc/greetd/phoebus.vtrgb")).unwrap(),
sysgen::greetd_vt_palette() sysgen::greetd_vt_palette()