diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2018-02-17 17:34:12 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2018-02-20 21:15:54 +0100 |
| commit | 736e45a278b44208fa6ded58a71e57081a58b1bf (patch) | |
| tree | 2a136ffc516c1e210e8961ec380b0737df08d78a | |
| parent | 1b541c3e9375952f4d58dec3783eea2316c65967 (diff) | |
| download | patches-736e45a278b44208fa6ded58a71e57081a58b1bf.tar patches-736e45a278b44208fa6ded58a71e57081a58b1bf.tar.gz | |
services: slim: Make the logged-in session show up in "w".
* gnu/services/xorg.scm (slim-shepherd-service): Use SESSREG to register X11
session.
* doc/guix.texi (slim-configuration): Document new field "sessreg".
| -rw-r--r-- | doc/guix.texi | 3 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 7ed39ff132..ee70994585 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11263,6 +11263,9 @@ The XAuth package to use. The Shepherd package used when invoking @command{halt} and @command{reboot}. +@item @code{sessreg} (default: @code{sessreg}) +The sessreg package used in order to register the session. + @item @code{slim} (default: @code{slim}) The SLiM package to use. @end table 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" |