[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: services: slim: Make the logged-in session show up in "w".
From: |
Danny Milosavljevic |
Subject: |
01/01: services: slim: Make the logged-in session show up in "w". |
Date: |
Tue, 20 Feb 2018 15:20:46 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit 736e45a278b44208fa6ded58a71e57081a58b1bf
Author: Danny Milosavljevic <address@hidden>
Date: Sat Feb 17 17:34:12 2018 +0100
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".
---
doc/guix.texi | 3 +++
gnu/services/xorg.scm | 9 +++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7ed39ff..ee70994 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}.
address@hidden @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 50af240..ea8433a 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"