[bug#30497] [PATCH] services: slim: Make the logged-in session show up in "w".

[bug#30497] [PATCH] services: slim: Make the logged-in session show up in "w".

[Danny Milosavljevic]

* gnu/services/xorg.scm (slim-shepherd-service): Make the logged-in session
show up in "w".
---
 gnu/services/xorg.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 50af2408b..b73dbe0d7 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -467,6 +467,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"

[bug#30497] [PATCH] services: slim: Make the logged-in session show up in "w".

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1185 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/services/xorg.scm (slim-shepherd-service): Make the logged-in session
> show up in "w".

Nit-pick: Instead of reusing the commit title here, it would be better
to mention what is being done, e.g. "Use SESSREG to register X11
session".

[...]

> diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
> index 50af2408b..b73dbe0d7 100644
> --- a/gnu/services/xorg.scm
> +++ b/gnu/services/xorg.scm
> @@ -467,6 +467,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

I'm surprised that this works.  I would have expected sessreg to be
unbound in this context, and that it would have to be added to the
<slim-configuration> record similar to xauth and startx.

However I suspect it may be better to add it to the record regardless,
to stay consistent and allow overriding it.  WDYT?

This is a change that affects most GuixSD users, so we better not break
anything here :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30497] [PATCH v2] services: slim: Make the logged-in session show up in "w".

[Danny Milosavljevic]

* gnu/services/xorg.scm (slim-shepherd-service): Use SESSREG to register X11
session.
---
 gnu/services/xorg.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 50af2408b..ea8433af3 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"

[bug#30497] [PATCH v2] services: slim: Make the logged-in session show up in "w".

[Ludovic Courtès]

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> * gnu/services/xorg.scm (slim-shepherd-service): Use SESSREG to register X11
> session.

Please mention the new field in <slim-configuration>, and also add it to
doc/guix.texi.

If you’ve confirmed that it works for you, OK for master.

Thank you!

Ludo’.