diff options
Diffstat (limited to 'gnu/services/xorg.scm')
| -rw-r--r-- | gnu/services/xorg.scm | 85 |
1 files changed, 10 insertions, 75 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 17d983ff8d..d5c5316d3f 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -8,6 +8,8 @@ ;;; Copyright © 2020 shtwzrd <[email protected]> ;;; Copyright © 2020 Jakub Kądziołka <[email protected]> ;;; Copyright © 2020 Alex Griffin <[email protected]> +;;; Copyright © 2021 Brice Waegeneire <[email protected]> +;;; Copyright © 2021 Oleg Pykhalov <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +31,7 @@ #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu system pam) + #:use-module (gnu system setuid) #:use-module (gnu system keyboard) #:use-module (gnu services base) #:use-module (gnu services dbus) @@ -95,7 +98,6 @@ slim-configuration-sessreg slim-service-type - slim-service screen-locker screen-locker? @@ -108,7 +110,6 @@ gdm-configuration gdm-service-type - gdm-service handle-xorg-configuration set-xorg-configuration)) @@ -161,6 +162,7 @@ xorg-configuration make-xorg-configuration xorg-configuration? (modules xorg-configuration-modules ;list of packages + (thunked) ; filter out modules not supported on current system (default (filter (lambda (p) @@ -543,6 +545,8 @@ a `service-extension', as used by `set-xorg-configuration'." (default slim)) (allow-empty-passwords? slim-configuration-allow-empty-passwords? (default #t)) + (gnupg? slim-configuration-gnupg? + (default #f)) (auto-login? slim-configuration-auto-login? (default #f)) (default-user slim-configuration-default-user @@ -572,7 +576,9 @@ a `service-extension', as used by `set-xorg-configuration'." "slim" #:login-uid? #t #:allow-empty-passwords? - (slim-configuration-allow-empty-passwords? config)))) + (slim-configuration-allow-empty-passwords? config) + #:gnupg? + (slim-configuration-gnupg? config)))) (define (slim-shepherd-service config) (let* ((xinitrc (xinitrc #:fallback-session @@ -664,49 +670,6 @@ reboot_cmd " shepherd "/sbin/reboot\n" (description "Run the SLiM graphical login manager for X11.")))) -(define-deprecated (slim-service #:key (slim slim) - (allow-empty-passwords? #t) auto-login? - (default-user "") - (theme %default-slim-theme) - (theme-name %default-slim-theme-name) - (xauth xauth) (shepherd shepherd) - (auto-login-session #f) - (startx (xorg-start-command))) - slim-service-type - "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} with @var{auto-login-session}. - -If @var{theme} is @code{#f}, the use the default log-in theme; otherwise -@var{theme} must be a gexp denoting the name of a directory containing the -theme to use. In that case, @var{theme-name} specifies the name of the -theme." - (service slim-service-type - (slim-configuration - (slim slim) - (allow-empty-passwords? allow-empty-passwords?) - (auto-login? auto-login?) (default-user default-user) - (theme theme) (theme-name theme-name) - (xauth xauth) (shepherd shepherd) - (auto-login-session auto-login-session)))) - ;;; ;;; Screen lockers & co. @@ -726,7 +689,7 @@ theme." #:allow-empty-passwords? empty?))))) (define screen-locker-setuid-programs - (compose list screen-locker-program)) + (compose list file-like->setuid-program screen-locker-program)) (define screen-locker-service-type (service-type (name 'screen-locker) @@ -1043,34 +1006,6 @@ the GNOME desktop environment.") "Run the GNOME Desktop Manager (GDM), a program that allows you to log in in a graphical session, whether or not you use GNOME.")))) -(define-deprecated (gdm-service #:key (gdm gdm) - (allow-empty-passwords? #t) - (x-server (xorg-wrapper))) - gdm-service-type - "Return a service that spawns the GDM graphical login manager, which in turn -starts the X display server with @var{X}, a command as returned by -@code{xorg-wrapper}. - -@cindex X session - -GDM 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." - (service gdm-service-type - (gdm-configuration - (gdm gdm) - (allow-empty-passwords? allow-empty-passwords?)))) - (define* (set-xorg-configuration config #:optional (login-manager-service-type |