fix(desktop): inset greeter shortcuts and use gray theme
Some checks are pending
ci / test (push) Waiting to run
Some checks are pending
ci / test (push) Waiting to run
This commit is contained in:
parent
187ab25cce
commit
8678a47d6e
5 changed files with 24 additions and 5 deletions
|
|
@ -5,6 +5,12 @@ this file is the curated, human-readable summary.
|
|||
|
||||
## Unreleased — Fast defaults with user-controlled source builds
|
||||
|
||||
- **Greeter spacing and colors (2026-10-03).** The installed greeter now uses
|
||||
two rows of terminal padding so `ESC` and the rest of the status bar sit
|
||||
clear of the screen edge. The text, border, and shortcut keycaps use the
|
||||
same soft gray from the VT palette as tuigreet's Usage screenshot. Source
|
||||
checks pass; a visual check in the running VM is pending guest login.
|
||||
|
||||
- **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
|
||||
|
|
|
|||
|
|
@ -3,6 +3,15 @@
|
|||
Rolling note between work sessions. **Update this file before you finish**, then
|
||||
commit it. It should be short and current; use `git log` for detail.
|
||||
|
||||
- **Greeter reference spacing (2026-10-03):** The current VM screenshot shows
|
||||
`ESC` touching the left edge and yellow keycaps. The upstream Usage image
|
||||
places the status bar roughly two text rows inside the terminal and uses the
|
||||
slate palette's soft gray for the keys and action text. The generated greetd
|
||||
config now adds `--window-padding 2` and uses gray throughout the greeter.
|
||||
Rust format, clippy, workspace tests, release and static builds pass. The
|
||||
existing VM can be updated after guest authentication; inspect the result
|
||||
before closing this item.
|
||||
|
||||
- **Tuigreet slate login (2026-10-03):** The installed greetd command now adds
|
||||
a Phoebus greeting and soft white theme. A greetd pre-start drop-in applies
|
||||
a Nord slate VT palette with `setvtrgb`, supplied explicitly by
|
||||
|
|
|
|||
|
|
@ -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, 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 |
|
||||
| Slate tuigreet login palette and greeting | yes | yes (generated greetd TOML, 16-color VT palette, installed drop-in, package, inset status bar and soft-gray keycaps) | existing encrypted VM: slate background and yellow shortcut keycaps previously verified (`/var/tmp/phoebus-vm/greeter-slate-shortcuts-20261003.png`); new two-row inset and gray color pending guest visual check; 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 |
|
||||
|
|
|
|||
|
|
@ -2514,6 +2514,8 @@ pub fn wayland_session_entry(profile: DesktopProfile) -> Option<(&'static str, S
|
|||
/// The installed-system greetd configuration: authenticate, then run the
|
||||
/// canonical Mango session. There is deliberately **no** `[initial_session]`:
|
||||
/// the installed system always requires authentication (unlike the live ISO).
|
||||
/// Gray uses the palette's soft-white slot; padding keeps the status shortcuts
|
||||
/// clear of the VT edges, like the upstream Usage screenshot.
|
||||
pub fn greetd_config(default_cmd: &str) -> String {
|
||||
format!(
|
||||
"# /etc/greetd/config.toml - Phoebus login (generated by the installer).\n\
|
||||
|
|
@ -2523,7 +2525,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=yellow' --remember --remember-session --sessions /usr/share/wayland-sessions --cmd {default_cmd}\"\n\
|
||||
command = \"tuigreet --time --window-padding 2 --greeting 'Welcome to Phoebus OS' --theme 'border=gray;text=gray;time=gray;container=black;greet=gray;prompt=gray;input=gray;action=gray;button=gray' --remember --remember-session --sessions /usr/share/wayland-sessions --cmd {default_cmd}\"\n\
|
||||
user = \"greeter\"\n"
|
||||
)
|
||||
}
|
||||
|
|
@ -3354,9 +3356,10 @@ mod tests {
|
|||
// The installed system must never autologin.
|
||||
assert!(!cfg.contains("[initial_session]"));
|
||||
assert!(cfg.contains("tuigreet"));
|
||||
assert!(cfg.contains("--window-padding 2"));
|
||||
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("--theme 'border=gray;text=gray;time=gray;container=black;"));
|
||||
assert!(cfg.contains(";action=gray;button=gray'"));
|
||||
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"));
|
||||
|
|
|
|||
|
|
@ -820,8 +820,9 @@ mod tests {
|
|||
let login = std::fs::read_to_string(exec.root.join("etc/greetd/config.toml")).unwrap();
|
||||
assert!(login.contains("phoebus-session-mango"));
|
||||
assert!(login.contains("tuigreet"));
|
||||
assert!(login.contains("--window-padding 2"));
|
||||
assert!(login.contains("--greeting 'Welcome to Phoebus OS'"));
|
||||
assert!(login.contains(";button=yellow'"));
|
||||
assert!(login.contains(";action=gray;button=gray'"));
|
||||
assert_eq!(
|
||||
std::fs::read_to_string(exec.root.join("etc/greetd/phoebus.vtrgb")).unwrap(),
|
||||
sysgen::greetd_vt_palette()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue