diff options
Diffstat (limited to 'gnu/services/xorg.scm')
| -rw-r--r-- | gnu/services/xorg.scm | 56 |
1 files changed, 19 insertions, 37 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 7215297f69..7ca0d3f7db 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -48,10 +48,17 @@ XORG-SERVER. Usually the X server is started by a login manager." (define (xserver.conf) (text-file* "xserver.conf" " Section \"Files\" - FontPath \"" font-adobe75dpi "/share/font/X11/75dpi\" + FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\" ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\" - ModulePath \"" xf86-input-mouse "/lib/xorg/modules/input\" + ModulePath \"" xf86-video-fbdev "/lib/xorg/modules/drivers\" + ModulePath \"" xf86-video-cirrus "/lib/xorg/modules/drivers\" + ModulePath \"" xf86-video-intel "/lib/xorg/modules/drivers\" + ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\" + ModulePath \"" xf86-video-nv "/lib/xorg/modules/drivers\" ModulePath \"" xf86-input-keyboard "/lib/xorg/modules/input\" + ModulePath \"" xf86-input-mouse "/lib/xorg/modules/input\" + ModulePath \"" xf86-input-synaptics "/lib/xorg/modules/input\" + ModulePath \"" xf86-input-vmmouse "/lib/xorg/modules/input\" ModulePath \"" xorg-server "/lib/xorg/modules\" ModulePath \"" xorg-server "/lib/xorg/modules/extensions\" ModulePath \"" xorg-server "/lib/xorg/modules/multimedia\" @@ -60,32 +67,7 @@ EndSection Section \"ServerFlags\" Option \"AllowMouseOpenFail\" \"on"" EndSection - -Section \"Monitor\" - Identifier \"Monitor[0]\" -EndSection - -Section \"InputClass\" - Identifier \"Generic keyboard\" - MatchIsKeyboard \"on\" - Option \"XkbRules\" \"base\" - Option \"XkbModel\" \"pc104\" -EndSection - -Section \"ServerLayout\" - Identifier \"Layout\" - Screen \"Screen-vesa\" -EndSection - -Section \"Device\" - Identifier \"Device-vesa\" - Driver \"vesa\" -EndSection - -Section \"Screen\" - Identifier \"Screen-vesa\" - Device \"Device-vesa\" -EndSection")) +")) (mlet %store-monad ((config (xserver.conf))) (define script @@ -130,11 +112,12 @@ EndSection")) (xauth xauth) (dmd dmd) (bash bash) startx) "Return a service that spawns the SLiM graphical login manager, which in -turn start the X display server with STARTX, a command as returned by -'xorg-start-command'. +turn starts the X display server with @var{startx}, a command as returned by +@code{xorg-start-command}. -When ALLOW-EMPTY-PASSWORDS? is true, allow logins with an empty password. -When AUTO-LOGIN? is true, log in automatically as DEFAULT-USER." +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}." (define (slim.cfg) (mlet %store-monad ((startx (or startx (xorg-start-command))) (xinitrc (xinitrc))) @@ -161,13 +144,12 @@ reboot_cmd " dmd "/sbin/reboot (service (documentation "Xorg display server") (provision '(xorg-server)) - (requirement '(user-processes host-name)) + (requirement '(user-processes host-name udev)) (start - ;; XXX: Work around the inability to specify env. vars. directly. #~(make-forkexec-constructor - (string-append #$bash "/bin/sh") "-c" - (string-append "SLIM_CFGFILE=" #$slim.cfg - " " #$slim "/bin/slim" " -nodaemon"))) + (list (string-append #$slim "/bin/slim") "-nodaemon") + #:environment-variables + (list (string-append "SLIM_CFGFILE=" #$slim.cfg)))) (stop #~(make-kill-destructor)) (respawn? #t) (pam-services |