diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-08 16:26:53 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-08 16:35:32 +0200 |
| commit | 04e4e6ab51f271298f9a001ba5c8c6ae6426fd64 (patch) | |
| tree | 030a7cada6c68f6c76b30aeb019660e76d2dba5e | |
| parent | 4467be213a93bab8f38ad5e4214dc947b8ca0bd1 (diff) | |
| download | guix-04e4e6ab51f271298f9a001ba5c8c6ae6426fd64.tar guix-04e4e6ab51f271298f9a001ba5c8c6ae6426fd64.tar.gz | |
doc: Document sessions and ~/.xsession for SLiM.
* gnu/services/xorg.scm (slim-service): Document session types and
~/.xsession.
* doc/guix.texi (X Window): Adjust accordingly.
| -rw-r--r-- | doc/guix.texi | 13 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 7504deab4e..b44811f3cb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4968,6 +4968,19 @@ Return a service that spawns the SLiM graphical login manager, which in turn starts the X display server with @var{startx}, a command as returned by @code{xorg-start-command}. +@cindex X session + +SLiM automatically looks for session types described by the @file{.desktop} +files in @file{/run/current-system/profile/share/xsessions} and allows users +to choose a session from the log-in screen using @kbd{F1}. Packages such as +@var{xfce}, @var{sawfish}, and @var{ratpoison} provide @file{.desktop} files; +adding them to the system-wide set of packages automatically makes them +available at the log-in screen. + +In addition, @file{~/.xsession} files are honored. When available, +@file{~/.xsession} must be an executable that starts a window manager +and/or other X clients. + When @var{allow-empty-passwords?} is true, allow logins with an empty password. When @var{auto-login?} is true, log in automatically as @var{default-user}. diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 8fd003f96a..4821614ba2 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -207,6 +207,19 @@ which should be passed to this script as the first argument. If not, the turn starts the X display server with @var{startx}, a command as returned by @code{xorg-start-command}. +@cindex X session + +SLiM automatically looks for session types described by the @file{.desktop} +files in @file{/run/current-system/profile/share/xsessions} and allows users +to choose a session from the log-in screen using @kbd{F1}. Packages such as +@var{xfce}, @var{sawfish}, and @var{ratpoison} provide @file{.desktop} files; +adding them to the system-wide set of packages automatically makes them +available at the log-in screen. + +In addition, @file{~/.xsession} files are honored. When available, +@file{~/.xsession} must be an executable that starts a window manager +and/or other X clients. + When @var{allow-empty-passwords?} is true, allow logins with an empty password. When @var{auto-login?} is true, log in automatically as @var{default-user} with @var{auto-login-session}. |