db4fdc04cc
* gnu/system/dmd.scm: Remove file. Move contents to... * gnu/services.scm, gnu/services/base.scm, gnu/services/dmd.scm, gnu/services/networking.scm, gnu/services/xorg.scm: ... here. New files. * gnu/system.scm, gnu/system/vm.scm: Adjust accordingly. * guix/scripts/system.scm (%user-module): Likewise. * doc/guix.texi (Using the Configuration System): Likewise. (Defining Services): Likewise.
187 lines
6.7 KiB
Scheme
187 lines
6.7 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
|
;;;
|
|
;;; This file is part of GNU Guix.
|
|
;;;
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
;;; under the terms of the GNU General Public License as published by
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
;;; your option) any later version.
|
|
;;;
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;;; GNU General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU General Public License
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (gnu services xorg)
|
|
#:use-module (gnu services)
|
|
#:use-module (gnu system linux) ; 'pam-service'
|
|
#:use-module ((gnu packages base) #:select (guile-final))
|
|
#:use-module (gnu packages xorg)
|
|
#:use-module (gnu packages gl)
|
|
#:use-module (gnu packages slim)
|
|
#:use-module (gnu packages ratpoison)
|
|
#:use-module (gnu packages admin)
|
|
#:use-module (gnu packages bash)
|
|
#:use-module (guix monads)
|
|
#:use-module (guix derivations)
|
|
#:export (xorg-start-command
|
|
slim-service))
|
|
|
|
;;; Commentary:
|
|
;;;
|
|
;;; Services that relate to the X Window System.
|
|
;;;
|
|
;;; Code:
|
|
|
|
(define* (xorg-start-command #:key
|
|
(guile guile-final)
|
|
(xorg-server xorg-server))
|
|
"Return a derivation that builds a GUILE script to start the X server from
|
|
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\"
|
|
ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
|
|
ModulePath \"" xf86-input-mouse "/lib/xorg/modules/input\"
|
|
ModulePath \"" xf86-input-keyboard "/lib/xorg/modules/input\"
|
|
ModulePath \"" xorg-server "/lib/xorg/modules\"
|
|
ModulePath \"" xorg-server "/lib/xorg/modules/extensions\"
|
|
ModulePath \"" xorg-server "/lib/xorg/modules/multimedia\"
|
|
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 ((guile-bin (package-file guile "bin/guile"))
|
|
(xorg-bin (package-file xorg-server "bin/X"))
|
|
(dri (package-file mesa "lib/dri"))
|
|
(xkbcomp-bin (package-file xkbcomp "bin"))
|
|
(xkb-dir (package-file xkeyboard-config
|
|
"share/X11/xkb"))
|
|
(config (xserver.conf)))
|
|
(define builder
|
|
;; Write a small wrapper around the X server.
|
|
`(let ((out (assoc-ref %outputs "out")))
|
|
(call-with-output-file out
|
|
(lambda (port)
|
|
(format port "#!~a --no-auto-compile~%!#~%" ,guile-bin)
|
|
(write '(begin
|
|
(setenv "XORG_DRI_DRIVER_PATH" ,dri)
|
|
(setenv "XKB_BINDIR" ,xkbcomp-bin)
|
|
|
|
(apply execl
|
|
|
|
,xorg-bin "-ac" "-logverbose" "-verbose"
|
|
"-xkbdir" ,xkb-dir
|
|
"-config" ,(derivation->output-path config)
|
|
"-nolisten" "tcp" "-terminate"
|
|
|
|
;; Note: SLiM and other display managers add the
|
|
;; '-auth' flag by themselves.
|
|
(cdr (command-line))))
|
|
port)))
|
|
(chmod out #o555)
|
|
#t))
|
|
|
|
(mlet %store-monad ((inputs (lower-inputs
|
|
`(("xorg" ,xorg-server)
|
|
("xkbcomp" ,xkbcomp)
|
|
("xkeyboard-config" ,xkeyboard-config)
|
|
("mesa" ,mesa)
|
|
("guile" ,guile)
|
|
("xorg.conf" ,config)))))
|
|
(derivation-expression "start-xorg" builder
|
|
#:inputs inputs))))
|
|
|
|
(define* (slim-service #:key (slim slim)
|
|
(allow-empty-passwords? #t) auto-login?
|
|
(default-user "")
|
|
(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'.
|
|
|
|
When ALLOW-EMPTY-PASSWORDS? is true, allow logins with an empty password.
|
|
When AUTO-LOGIN? is true, log in automatically as DEFAULT-USER."
|
|
(define (slim.cfg)
|
|
;; TODO: Run "bash -login ~/.xinitrc %session".
|
|
(mlet %store-monad ((startx (or startx (xorg-start-command))))
|
|
(text-file* "slim.cfg" "
|
|
default_path /run/current-system/bin
|
|
default_xserver " startx "
|
|
xserver_arguments :0 vt7
|
|
xauth_path " xauth "/bin/xauth
|
|
authfile /var/run/slim.auth
|
|
|
|
# The login command. '%session' is replaced by the chosen session name, one
|
|
# of the names specified in the 'sessions' setting: 'wmaker', 'xfce', etc.
|
|
login_cmd exec " ratpoison "/bin/ratpoison
|
|
|
|
halt_cmd " dmd "/sbin/halt
|
|
reboot_cmd " dmd "/sbin/reboot
|
|
" (if auto-login?
|
|
(string-append "auto_login yes\ndefault_user " default-user)
|
|
""))))
|
|
|
|
(mlet %store-monad ((slim-bin (package-file slim "bin/slim"))
|
|
(bash-bin (package-file bash "bin/bash"))
|
|
(slim.cfg (slim.cfg)))
|
|
(return
|
|
(service
|
|
(documentation "Xorg display server")
|
|
(provision '(xorg-server))
|
|
(requirement '(host-name))
|
|
(start
|
|
;; XXX: Work around the inability to specify env. vars. directly.
|
|
`(make-forkexec-constructor
|
|
,bash-bin "-c"
|
|
,(string-append "SLIM_CFGFILE=" (derivation->output-path slim.cfg)
|
|
" " slim-bin
|
|
" -nodaemon")))
|
|
(stop `(make-kill-destructor))
|
|
(inputs `(("slim" ,slim)
|
|
("slim.cfg" ,slim.cfg)
|
|
("bash" ,bash)))
|
|
(respawn? #t)
|
|
(pam-services
|
|
;; Tell PAM about 'slim'.
|
|
(list (unix-pam-service
|
|
"slim"
|
|
#:allow-empty-passwords? allow-empty-passwords?)))))))
|
|
|
|
;;; xorg.scm ends here
|