doc: Document 'gdm-service-type'.

* doc/guix.texi (X Window): Document 'gdm-service-type' and
'gdm-configuration'.  Take description of '.desktop' files from the
'slim-service-type' description.
* gnu/services/xorg.scm (gdm-service): Remove outdated comment.
This commit is contained in:
Ludovic Courtès 2019-03-31 23:13:51 +02:00
parent 105fa9fcf7
commit 631a6e6377
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 44 additions and 11 deletions

View File

@ -13304,23 +13304,59 @@ example the @code{windowmaker} or @code{openbox} packages---preferably
by adding it to the @code{packages} field of your operating system by adding it to the @code{packages} field of your operating system
definition (@pxref{operating-system Reference, system-wide packages}). definition (@pxref{operating-system Reference, system-wide packages}).
@defvr {Scheme Variable} slim-service-type @defvr {Scheme Variable} gdm-service-type
This is the type for the SLiM graphical login manager for X11. This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME
Desktop Manager} (GDM), a program that manages graphical display servers and
handles graphical user logins. Its value must be a @code{gdm-configuration}
(see below.)
@cindex session types (X11) @cindex session types (X11)
@cindex X11 session types @cindex X11 session types
SLiM looks for @dfn{session types} described by the @file{.desktop} files in GDM looks for @dfn{session types} described by the @file{.desktop} files in
@file{/run/current-system/profile/share/xsessions} and allows users to @file{/run/current-system/profile/share/xsessions} and allows users to choose
choose a session from the log-in screen using @kbd{F1}. Packages such a session from the log-in screen. Packages such as @code{gnome}, @code{xfce},
as @code{xfce}, @code{sawfish}, and @code{ratpoison} provide and @code{i3} provide @file{.desktop} files; adding them to the system-wide
@file{.desktop} files; adding them to the system-wide set of packages set of packages automatically makes them available at the log-in screen.
automatically makes them available at the log-in screen.
In addition, @file{~/.xsession} files are honored. When available, In addition, @file{~/.xsession} files are honored. When available,
@file{~/.xsession} must be an executable that starts a window manager @file{~/.xsession} must be an executable that starts a window manager
and/or other X clients. and/or other X clients.
@end defvr @end defvr
@deftp {Data Type} gdm-configuration
@table @asis
@item @code{auto-login?} (default: @code{#f})
@itemx @code{default-user} (default: @code{#f})
When @code{auto-login?} is false, GDM presents a log-in screen.
When @code{auto-login?} is true, GDM logs in directly as
@code{default-user}.
@item @code{gnome-shell-assets} (default: ...)
List of GNOME Shell assets needed by GDM: icon theme, fonts, etc.
@item @code{xorg-configuration} (default: @code{(xorg-configuration)})
Configuration of the Xorg graphical server.
@item @code{xsession} (default: @code{(xinitrc)})
Script to run before starting a X session.
@item @code{dbus-daemon} (default: @code{dbus-daemon-wrapper})
File name of the @code{dbus-daemon} executable.
@item @code{gdm} (default: @code{gdm})
The GDM package to use.
@end table
@end deftp
@defvr {Scheme Variable} slim-service-type
This is the type for the SLiM graphical login manager for X11.
Like GDM, SLiM looks for session types described by @file{.desktop} files and
allows users to choose a session from the log-in screen using @kbd{F1}. It
also honors @file{~/.xsession} files.
@end defvr
@deftp {Data Type} slim-configuration @deftp {Data Type} slim-configuration
Data type representing the configuration of @code{slim-service-type}. Data type representing the configuration of @code{slim-service-type}.

View File

@ -791,9 +791,6 @@ makes the good ol' XlockMore usable."
"Run the GNOME Desktop Manager (GDM), a program that allows "Run the GNOME Desktop Manager (GDM), a program that allows
you to log in in a graphical session, whether or not you use GNOME."))) you to log in in a graphical session, whether or not you use GNOME.")))
;; This service isn't working yet; it gets as far as starting to run the
;; greeter from gnome-shell but doesn't get any further. It is here because
;; it doesn't hurt anyone and perhaps it inspires someone to fix it :)
(define-deprecated (gdm-service #:key (gdm gdm) (define-deprecated (gdm-service #:key (gdm gdm)
(allow-empty-passwords? #t) (allow-empty-passwords? #t)
(x-server (xorg-wrapper))) (x-server (xorg-wrapper)))