01/04: doc: Document 'gdm-service-type'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 631a6e63777dd2e08fe5bdc75908e6c030abcd1f
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 31 23:13:51 2019 +0200

    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.
---
 doc/guix.texi         | 52 +++++++++++++++++++++++++++++++++++++++++++--------
 gnu/services/xorg.scm |  3 ---
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 527f9bc..616970b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -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
 definition (@pxref{operating-system Reference, system-wide packages}).
 
address@hidden {Scheme Variable} slim-service-type
-This is the type for the SLiM graphical login manager for X11.
address@hidden {Scheme Variable} gdm-service-type
+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 X11 session types
-SLiM looks for @dfn{session types} described by the @file{.desktop} files in
address@hidden/run/current-system/profile/share/xsessions} and allows users to
-choose a session from the log-in screen using @kbd{F1}.  Packages such
-as @code{xfce}, @code{sawfish}, and @code{ratpoison} provide
address@hidden files; adding them to the system-wide set of packages
-automatically makes them available at the log-in screen.
+GDM looks for @dfn{session types} described by the @file{.desktop} files in
address@hidden/run/current-system/profile/share/xsessions} and allows users to 
choose
+a session from the log-in screen.  Packages such as @code{gnome}, @code{xfce},
+and @code{i3} 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.
 @end defvr
 
address@hidden {Data Type} gdm-configuration
address@hidden @asis
address@hidden @code{auto-login?} (default: @code{#f})
address@hidden @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
address@hidden
+
address@hidden @code{gnome-shell-assets} (default: ...)
+List of GNOME Shell assets needed by GDM: icon theme, fonts, etc.
+
address@hidden @code{xorg-configuration} (default: @code{(xorg-configuration)})
+Configuration of the Xorg graphical server.
+
address@hidden @code{xsession} (default: @code{(xinitrc)})
+Script to run before starting a X session.
+
address@hidden @code{dbus-daemon} (default: @code{dbus-daemon-wrapper})
+File name of the @code{dbus-daemon} executable.
+
address@hidden @code{gdm} (default: @code{gdm})
+The GDM package to use.
address@hidden table
address@hidden deftp
+
address@hidden {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.
address@hidden defvr
+
 @deftp {Data Type} slim-configuration
 Data type representing the configuration of @code{slim-service-type}.
 
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index f047b8a..6cbd1fd 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -791,9 +791,6 @@ makes the good ol' XlockMore usable."
                  "Run the GNOME Desktop Manager (GDM), a program that allows
 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)
                                 (allow-empty-passwords? #t)
                                 (x-server (xorg-wrapper)))