diff options
| author | muradm <mail@muradm.net> | 2025-02-05 16:09:14 +0300 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-02-06 22:26:45 +0900 |
| commit | ee0d1b144c1572433c9475c32c74d61c3be9c058 (patch) | |
| tree | 65f04098a52a789fa37f129f59e514b032ec175f /gnu/tests | |
| parent | 7786b4e477b888cda42cffd764aacea705631dc1 (diff) | |
services: greetd: Improve greeter configurations.
This improvement focuses on providing common user session scripts
for use by multiple greeters. Now user session entry point is
factored out into '<greetd-user-session>', which can be reused
as is with different greeters. By default it uses 'bash' as
first user process. Then user normally starts additional programs
with '.profile' or '.bashrc'. Using 'command', 'command-args' and
'extra-env' one can specify something else, which could be
'dbus-session' wrapped process, some desktop environment or else.
While the above is possible, one is still encouraged to use
'.bashrc', '.profile' or similar.
It also fixes incorrect use of 'XDG_RUNTIME_DIR' for 'wlgreet'.
'wlgreet' requires a compositor to run. We provide common sway based
greeter script, which can be shared by other graphical greeters.
* gnu/services/base.scm (<greetd-user-session>): Common user session
factored out, for shared use by multiple greeters.
(<greetd-agreety-session>): Switch to common user session.
(<greetd-wlgreet-configuration>): Refactor 'wlgreet' configuration.
(<greetd-wlgreet-sway-session>): Switch to common user session.
(<greetd-terminal-configuration>): Add 'extra-shepherd-requirement'
for establishing configurable Shepherd service dependency.
* gnu/tests/desktop.scm (%minimal-services): Reflect configuration
changes.
* doc/guix.texi (Base Services): Document refactoring changes.
Change-Id: I9d45a592b355eb9c438be5b1d4d15555ce4956fa
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/desktop.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/tests/desktop.scm b/gnu/tests/desktop.scm index 1c32076ccb2..3f861b253b0 100644 --- a/gnu/tests/desktop.scm +++ b/gnu/tests/desktop.scm | |||
| @@ -141,13 +141,21 @@ | |||
| 141 | (terminal-vt "2") | 141 | (terminal-vt "2") |
| 142 | (default-session-command | 142 | (default-session-command |
| 143 | (greetd-agreety-session | 143 | (greetd-agreety-session |
| 144 | (extra-env '(("MY_VAR" . "1"))) | 144 | (command |
| 145 | (xdg-env? #f)))) | 145 | (greetd-user-session |
| 146 | (extra-env '(("MY_VAR" . "1"))) | ||
| 147 | (xdg-env? #f)))))) | ||
| 146 | ;; we can use different shell instead of default bash | 148 | ;; we can use different shell instead of default bash |
| 147 | (greetd-terminal-configuration | 149 | (greetd-terminal-configuration |
| 148 | (terminal-vt "3") | 150 | (terminal-vt "3") |
| 149 | (default-session-command | 151 | (default-session-command |
| 150 | (greetd-agreety-session (command (file-append zsh "/bin/zsh"))))) | 152 | (greetd-agreety-session |
| 153 | (command | ||
| 154 | (greetd-user-session | ||
| 155 | (command (file-append zsh "/bin/zsh")) | ||
| 156 | (command-args '("-l")) | ||
| 157 | (extra-env '(("MY_VAR" . "1"))) | ||
| 158 | (xdg-env? #f)))))) | ||
| 151 | ;; we can use any other executable command as greeter | 159 | ;; we can use any other executable command as greeter |
| 152 | (greetd-terminal-configuration | 160 | (greetd-terminal-configuration |
| 153 | (terminal-vt "4") | 161 | (terminal-vt "4") |
