495d7f8446
greetd only launches the session after the greeter process exits. Quit
on successful StartSession instead of sitting on "Starting session…"
until SIGTERM.
Empty Secret/Visible answers are Some("") (not PAM cancel). The greetd
actor stays up across connect failure and reconnects. Escape cancels
the conversation. Session env sets XDG_SESSION_TYPE/DESKTOP. .desktop
parsing honors Hidden/NoDisplay/TryExec and quoted Exec=. Invalid TOML
warns instead of failing silent. Font, date, and Ken Burns config match
what the greeter actually draws.
67 lines
2 KiB
Rust
67 lines
2 KiB
Rust
use breadlock_ui::config::Appearance;
|
|
use serde::Deserialize;
|
|
use std::path::PathBuf;
|
|
|
|
#[derive(Debug, Clone, Default, Deserialize)]
|
|
#[serde(default)]
|
|
pub struct Config {
|
|
#[serde(flatten)]
|
|
pub appearance: Appearance,
|
|
pub sessions: Sessions,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
#[serde(default)]
|
|
pub struct Sessions {
|
|
pub wayland_dirs: Vec<String>,
|
|
pub xsessions_dirs: Vec<String>,
|
|
/// `.desktop` file stem (without extension) to pre-select in the picker.
|
|
/// Falls back to the first discovered session if this stem is missing.
|
|
pub default: String,
|
|
}
|
|
|
|
impl Default for Sessions {
|
|
fn default() -> Self {
|
|
Self {
|
|
wayland_dirs: vec!["/usr/share/wayland-sessions".to_string()],
|
|
xsessions_dirs: vec!["/usr/share/xsessions".to_string()],
|
|
default: "bos".to_string(),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// `breadgreet` commonly runs as the dedicated `greeter` system user (per
|
|
/// BOS's `/etc/greetd/config.toml` `user = "greeter"`), so a fixed system
|
|
/// path is checked first; XDG is the fallback for local dev/testing under a
|
|
/// normal user session.
|
|
pub fn load() -> Config {
|
|
let system_path = std::path::Path::new("/etc/greetd/breadgreet.toml");
|
|
if system_path.exists() {
|
|
return breadlock_ui::config::load_or_default(system_path);
|
|
}
|
|
breadlock_ui::config::load_or_default(&xdg_config_path())
|
|
}
|
|
|
|
pub(crate) fn xdg_config_dir() -> PathBuf {
|
|
std::env::var_os("XDG_CONFIG_HOME")
|
|
.map(PathBuf::from)
|
|
.or_else(|| std::env::var_os("HOME").map(|h| PathBuf::from(h).join(".config")))
|
|
.unwrap_or_else(|| PathBuf::from("."))
|
|
}
|
|
|
|
fn xdg_config_path() -> PathBuf {
|
|
xdg_config_dir().join("breadgreet").join("breadgreet.toml")
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn default_sessions_match_standard_greetd_dirs() {
|
|
let s = Sessions::default();
|
|
assert_eq!(s.wayland_dirs, vec!["/usr/share/wayland-sessions"]);
|
|
assert_eq!(s.xsessions_dirs, vec!["/usr/share/xsessions"]);
|
|
assert_eq!(s.default, "bos");
|
|
}
|
|
}
|