services: sddm, slim, gdm: Take an <xorg-configuration> record.
* gnu/services/sddm.scm (<sddm-configuration>)[xorg-server-path] [xserver-arguments]: Remove. [xorg-configuration]: New field. (sddm-configuration-file): Adjust accordingly. * gnu/services/xorg.scm (<slim-configuration>)[startx]: Remove. [xorg-configuration]: New field. (slim-shepherd-service, slim-service): Adjust accordingly. (<gdm-configuration>)[x-server]: Remove. [xorg-configuration]: New field. (gdm-shepherd-service, gdm-service): Adjust accordingly. * doc/guix.texi (X Window): Update accordingly.master
Ludovic Courtès
parent
b2e564515a
commit
554b860739
|
|
@ -13223,8 +13223,8 @@ your user profile. Failing to do that, if @code{auto-login-session} is
|
|||
false, you will be unable to log in.
|
||||
@end quotation
|
||||
|
||||
@item @code{startx} (default: @code{(xorg-start-command)})
|
||||
The command used to start the X11 graphical server.
|
||||
@item @code{xorg-configuration} (default @code{(xorg-configuration)})
|
||||
Configuration of the Xorg graphical server.
|
||||
|
||||
@item @code{xauth} (default: @code{xauth})
|
||||
The XAuth package to use.
|
||||
|
|
@ -13300,8 +13300,8 @@ Script to run before starting a wayland session.
|
|||
@item @code{sessions-directory} (default "/run/current-system/profile/share/wayland-sessions")
|
||||
Directory to look for desktop files starting wayland sessions.
|
||||
|
||||
@item @code{xorg-server-path} (default @code{xorg-start-command})
|
||||
Path to xorg-server.
|
||||
@item @code{xorg-configuration} (default @code{(xorg-configuration)})
|
||||
Configuration of the Xorg graphical server.
|
||||
|
||||
@item @code{xauth-path} (default @code{#~(string-append #$xauth "/bin/xauth")})
|
||||
Path to xauth.
|
||||
|
|
@ -13324,9 +13324,6 @@ Directory to look for desktop files starting X sessions.
|
|||
@item @code{minimum-vt} (default: 7)
|
||||
Minimum VT to use.
|
||||
|
||||
@item @code{xserver-arguments} (default "-nolisten tcp")
|
||||
Arguments to pass to xorg-server.
|
||||
|
||||
@item @code{auto-login-user} (default "")
|
||||
User to use for auto-login.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -83,8 +84,8 @@
|
|||
(sessions-directory sddm-configuration-sessions-directory
|
||||
(default "/run/current-system/profile/share/wayland-sessions"))
|
||||
;; [X11]
|
||||
(xorg-server-path sddm-configuration-xorg-server-path
|
||||
(default (xorg-start-command)))
|
||||
(xorg-configuration sddm-configuration-xorg
|
||||
(default (xorg-configuration)))
|
||||
(xauth-path sddm-configuration-xauth-path
|
||||
(default (file-append xauth "/bin/xauth")))
|
||||
(xephyr-path sddm-configuration-xephyr-path
|
||||
|
|
@ -99,8 +100,6 @@
|
|||
(default "/run/current-system/profile/share/xsessions"))
|
||||
(minimum-vt sddm-configuration-minimum-vt
|
||||
(default 7))
|
||||
(xserver-arguments sddm-configuration-xserver-arguments
|
||||
(default "-nolisten tcp"))
|
||||
|
||||
;; [Autologin]
|
||||
(auto-login-user sddm-configuration-auto-login-user
|
||||
|
|
@ -140,7 +139,8 @@ SessionCommand=" (sddm-configuration-session-command config) "
|
|||
SessionDir=" (sddm-configuration-sessions-directory config) "
|
||||
|
||||
[X11]
|
||||
ServerPath=" (sddm-configuration-xorg-server-path config) "
|
||||
ServerPath=" (xorg-configuration-server
|
||||
(sddm-configuration-xorg config)) "
|
||||
XauthPath=" (sddm-configuration-xauth-path config) "
|
||||
XephyrPath=" (sddm-configuration-xephyr-path config) "
|
||||
DisplayCommand=" (sddm-configuration-xdisplay-start config) "
|
||||
|
|
@ -148,7 +148,9 @@ DisplayStopCommand=" (sddm-configuration-xdisplay-stop config) "
|
|||
SessionCommand=" (sddm-configuration-xsession-command config) "
|
||||
SessionDir=" (sddm-configuration-xsessions-directory config) "
|
||||
MinimumVT=" (number->string (sddm-configuration-minimum-vt config)) "
|
||||
ServerArguments=" (sddm-configuration-xserver-arguments config) "
|
||||
ServerArguments=" (string-join
|
||||
(xorg-configuration-server-arguments
|
||||
(sddm-configuration-xorg config))) "
|
||||
|
||||
[Autologin]
|
||||
User=" (sddm-configuration-auto-login-user config) "
|
||||
|
|
|
|||
|
|
@ -436,8 +436,8 @@ desktop session from the system or user profile will be used."
|
|||
(default shepherd))
|
||||
(auto-login-session slim-configuration-auto-login-session
|
||||
(default #f))
|
||||
(startx slim-configuration-startx
|
||||
(default (xorg-start-command)))
|
||||
(xorg-configuration slim-configuration-xorg
|
||||
(default (xorg-configuration)))
|
||||
(sessreg slim-configuration-sessreg
|
||||
(default sessreg)))
|
||||
|
||||
|
|
@ -454,7 +454,7 @@ desktop session from the system or user profile will be used."
|
|||
(slim-configuration-auto-login-session config)))
|
||||
(slim (slim-configuration-slim config))
|
||||
(xauth (slim-configuration-xauth config))
|
||||
(startx (slim-configuration-startx config))
|
||||
(startx (xorg-start-command (slim-configuration-xorg config)))
|
||||
(shepherd (slim-configuration-shepherd config))
|
||||
(theme-name (slim-configuration-theme-name config))
|
||||
(sessreg (slim-configuration-sessreg config)))
|
||||
|
|
@ -561,8 +561,7 @@ theme."
|
|||
(auto-login? auto-login?) (default-user default-user)
|
||||
(theme theme) (theme-name theme-name)
|
||||
(xauth xauth) (shepherd shepherd)
|
||||
(auto-login-session auto-login-session)
|
||||
(startx startx))))
|
||||
(auto-login-session auto-login-session))))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
@ -641,8 +640,8 @@ makes the good ol' XlockMore usable."
|
|||
(default-user gdm-configuration-default-user (default #f))
|
||||
(gnome-shell-assets gdm-configuration-gnome-shell-assets
|
||||
(default (list adwaita-icon-theme font-cantarell)))
|
||||
(x-server gdm-configuration-x-server
|
||||
(default (xorg-wrapper)))
|
||||
(xorg-configuration gdm-configuration-xorg
|
||||
(default (xorg-configuration)))
|
||||
(x-session gdm-configuration-x-session
|
||||
(default (xinitrc))))
|
||||
|
||||
|
|
@ -714,7 +713,8 @@ makes the good ol' XlockMore usable."
|
|||
#$(gdm-configuration-dbus-daemon config))
|
||||
(string-append
|
||||
"GDM_X_SERVER="
|
||||
#$(gdm-configuration-x-server config))
|
||||
#$(xorg-wrapper
|
||||
(gdm-configuration-xorg config)))
|
||||
(string-append
|
||||
"GDM_X_SESSION="
|
||||
#$(gdm-configuration-x-session config))
|
||||
|
|
@ -779,7 +779,6 @@ password."
|
|||
(service gdm-service-type
|
||||
(gdm-configuration
|
||||
(gdm gdm)
|
||||
(allow-empty-passwords? allow-empty-passwords?)
|
||||
(x-server x-server))))
|
||||
(allow-empty-passwords? allow-empty-passwords?))))
|
||||
|
||||
;;; xorg.scm ends here
|
||||
|
|
|
|||
Loading…
Reference in New Issue