diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-24 19:04:13 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-24 19:04:13 +0100 |
| commit | 5f9b018aa8334d5a38ac83ebe040ba36ce511305 (patch) | |
| tree | 1e67a1fd0444e6073f7d33091322528ccc8c3849 /gnu/services/xorg.scm | |
| parent | fb6550058e167c25bbcbe0ebcf51590f83506f23 (diff) | |
| parent | f09cb93e3a2310f7726cb98fa5679c1a8483c39f (diff) | |
| download | guix-5f9b018aa8334d5a38ac83ebe040ba36ce511305.tar guix-5f9b018aa8334d5a38ac83ebe040ba36ce511305.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/xorg.scm')
| -rw-r--r-- | gnu/services/xorg.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 50af2408b1..ea8433af3a 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -437,7 +437,9 @@ desktop session from the system or user profile will be used." (auto-login-session slim-configuration-auto-login-session (default #f)) (startx slim-configuration-startx - (default (xorg-start-command)))) + (default (xorg-start-command))) + (sessreg slim-configuration-sessreg + (default sessreg))) (define (slim-pam-service config) "Return a PAM service for @command{slim}." @@ -454,7 +456,8 @@ desktop session from the system or user profile will be used." (xauth (slim-configuration-xauth config)) (startx (slim-configuration-startx config)) (shepherd (slim-configuration-shepherd config)) - (theme-name (slim-configuration-theme-name config))) + (theme-name (slim-configuration-theme-name config)) + (sessreg (slim-configuration-sessreg config))) (mixed-text-file "slim.cfg" " default_path /run/current-system/profile/bin default_xserver " startx " @@ -467,6 +470,8 @@ authfile /var/run/slim.auth login_cmd exec " xinitrc " %session sessiondir /run/current-system/profile/share/xsessions session_msg session (F1 to change): +sessionstart_cmd " sessreg "/bin/sessreg -a -l $DISPLAY %user +sessionstop_cmd " sessreg "/bin/sessreg -d -l $DISPLAY %user halt_cmd " shepherd "/sbin/halt reboot_cmd " shepherd "/sbin/reboot\n" |