me
/
guix
Archived
1
0
Fork 0
Code

services: xorg: Add auto-suspend? field to <gdm-configuration>. 

* gnu/services/xorg.scm (<gdm-configuration>)
<auto-suspend?>: New field.
(gdm-dconf-profiles): New variable.
* gnu/services/xorg.scm (gdm-shepherd-service)
<environment-variables> [!auto-suspend?]: Specify DCONF_PROFILE.
(gdm-service-type): Extend DCONF-SERVICE-TYPE.
* doc/guix.texi (X Window): Document the new field.
master
Maxim Cournoyer 2022-09-22 15:48:16 -04:00
parent 7b896a26b8
commit aad4e4fc6b
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/guix.texi
View File

@ -21107,6 +21107,12 @@ 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{auto-suspend?} (default @code{#t})
When true, GDM will automatically suspend to RAM when nobody is
physically connected. When a machine is used via remote desktop or SSH,
this should be set to false to avoid GDM interrupting remote sessions or
rendering the machine unavailable.
@item @code{debug?} (default: @code{#f})
When true, GDM writes debug messages to its log.

32
gnu/services/xorg.scm
View File

@ -986,6 +986,7 @@ argument.")))
(gdm gdm-configuration-gdm (default gdm))
(allow-empty-passwords? gdm-configuration-allow-empty-passwords? (default #t))
(auto-login? gdm-configuration-auto-login? (default #f))
(auto-suspend? gdm-configuration-auto-suspend? (default #t))
(dbus-daemon gdm-configuration-dbus-daemon (default dbus-daemon-wrapper))
(debug? gdm-configuration-debug? (default #f))
(default-user gdm-configuration-default-user (default #f))
@ -1001,6 +1002,30 @@ argument.")))
(wayland-session gdm-configuration-wayland-session
(default gdm-wayland-session-wrapper)))
(define (gdm-dconf-profiles config)
(if (gdm-configuration-auto-suspend? config)
'()
;; This custom gconf profile works around a lack of configuration option
;; to disable auto-suspend when no users are physically logged in (see:
;; https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/22).
(list (dconf-profile
(name "gdm")
(content (list #~(begin
(use-modules (ice-9 textual-ports))
(string-trim
(call-with-input-file
#$(file-append gdm "/share/dconf/profile/gdm")
get-string-all)))
"system-db:gdm"))
(keyfile (dconf-keyfile
(name "00-disable-suspend")
(content
(list "[org/gnome/settings-daemon/plugins/power]"
"sleep-inactive-ac-type='nothing'"
"sleep-inactive-battery-type='nothing'"
"sleep-inactive-ac-timeout=0"
"sleep-inactive-battery-timeout=0"))))))))
(define (gdm-configuration-file config)
(mixed-text-file "gdm-custom.conf"
"[daemon]\n"
@ -1073,7 +1098,10 @@ argument.")))
(list #$(file-append (gdm-configuration-gdm config)
"/bin/gdm"))
#:environment-variables
(list (string-append
(list #$@(if (gdm-configuration-auto-suspend? config)
#~()
#~("DCONF_PROFILE=/etc/dconf/profile/gdm"))
(string-append
"GDM_CUSTOM_CONF="
#$(gdm-configuration-file config))
(string-append
@ -1152,6 +1180,8 @@ polkit.addRule(function(action, subject) {
gdm-shepherd-service)
(service-extension account-service-type
(const %gdm-accounts))
(service-extension dconf-service-type
gdm-dconf-profiles)
(service-extension pam-root-service-type
gdm-pam-service)
(service-extension polkit-service-type