2014-02-19 20:58:24 +01:00
|
|
|
;;; 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'
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-27 00:25:17 +02:00
|
|
|
#:use-module ((gnu packages base) #:select (canonical-package))
|
|
|
|
#:use-module (gnu packages guile)
|
2014-02-19 20:58:24 +01:00
|
|
|
#:use-module (gnu packages xorg)
|
|
|
|
#:use-module (gnu packages gl)
|
|
|
|
#:use-module (gnu packages slim)
|
|
|
|
#:use-module (gnu packages ratpoison)
|
2014-04-06 23:31:58 +02:00
|
|
|
#:use-module (gnu packages gnustep)
|
2014-02-19 20:58:24 +01:00
|
|
|
#:use-module (gnu packages admin)
|
|
|
|
#:use-module (gnu packages bash)
|
2014-04-28 23:07:08 +02:00
|
|
|
#:use-module (guix gexp)
|
2014-02-19 20:58:24 +01:00
|
|
|
#: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
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-27 00:25:17 +02:00
|
|
|
(guile (canonical-package guile-2.0))
|
2014-02-19 20:58:24 +01:00
|
|
|
(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\"
|
2014-07-09 23:51:19 +02:00
|
|
|
FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\"
|
2014-02-19 20:58:24 +01:00
|
|
|
ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
|
2014-07-09 23:52:49 +02:00
|
|
|
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\"
|
2014-02-19 20:58:24 +01:00
|
|
|
ModulePath \"" xf86-input-keyboard "/lib/xorg/modules/input\"
|
2014-07-09 23:52:49 +02:00
|
|
|
ModulePath \"" xf86-input-mouse "/lib/xorg/modules/input\"
|
|
|
|
ModulePath \"" xf86-input-synaptics "/lib/xorg/modules/input\"
|
2014-02-19 20:58:24 +01:00
|
|
|
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
|
2014-07-09 23:55:33 +02:00
|
|
|
"))
|
2014-02-19 20:58:24 +01:00
|
|
|
|
2014-04-27 19:28:47 +02:00
|
|
|
(mlet %store-monad ((config (xserver.conf)))
|
|
|
|
(define script
|
2014-02-19 20:58:24 +01:00
|
|
|
;; Write a small wrapper around the X server.
|
2014-04-27 19:28:47 +02:00
|
|
|
#~(begin
|
|
|
|
(setenv "XORG_DRI_DRIVER_PATH" (string-append #$mesa "/lib/dri"))
|
|
|
|
(setenv "XKB_BINDIR" (string-append #$xkbcomp "/bin"))
|
|
|
|
|
|
|
|
(apply execl (string-append #$xorg-server "/bin/X")
|
|
|
|
"-ac" "-logverbose" "-verbose"
|
|
|
|
"-xkbdir" (string-append #$xkeyboard-config "/share/X11/xkb")
|
|
|
|
"-config" #$config
|
|
|
|
"-nolisten" "tcp" "-terminate"
|
|
|
|
|
|
|
|
;; Note: SLiM and other display managers add the
|
|
|
|
;; '-auth' flag by themselves.
|
|
|
|
(cdr (command-line)))))
|
|
|
|
|
|
|
|
(gexp->script "start-xorg" script)))
|
2014-02-19 20:58:24 +01:00
|
|
|
|
2014-04-06 23:31:58 +02:00
|
|
|
(define* (xinitrc #:key
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-27 00:25:17 +02:00
|
|
|
(guile (canonical-package guile-2.0))
|
2014-04-06 23:31:58 +02:00
|
|
|
(ratpoison ratpoison)
|
|
|
|
(windowmaker windowmaker))
|
|
|
|
"Return a system-wide xinitrc script that starts the specified X session."
|
2014-04-27 19:28:47 +02:00
|
|
|
(define builder
|
|
|
|
#~(begin
|
|
|
|
(use-modules (ice-9 match))
|
|
|
|
|
2014-07-24 23:01:55 +02:00
|
|
|
;; First, try to run ~/.xsession.
|
|
|
|
(let* ((home (getenv "HOME"))
|
|
|
|
(file (string-append home "/.xsession")))
|
|
|
|
(false-if-exception (execl file file)))
|
|
|
|
|
|
|
|
;; Then try a pre-configured session type.
|
2014-04-27 19:28:47 +02:00
|
|
|
(match (command-line)
|
|
|
|
((_ "ratpoison")
|
|
|
|
(execl (string-append #$ratpoison "/bin/ratpoison")))
|
|
|
|
(_
|
|
|
|
(execl (string-append #$windowmaker "/bin/wmaker"))))))
|
|
|
|
|
|
|
|
(gexp->script "xinitrc" builder))
|
2014-04-06 23:31:58 +02:00
|
|
|
|
2014-02-19 20:58:24 +01:00
|
|
|
(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
|
2014-07-11 22:57:02 +02:00
|
|
|
turn starts the X display server with @var{startx}, a command as returned by
|
|
|
|
@code{xorg-start-command}.
|
2014-02-19 20:58:24 +01:00
|
|
|
|
2014-07-11 22:57:02 +02:00
|
|
|
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}."
|
2014-02-19 20:58:24 +01:00
|
|
|
(define (slim.cfg)
|
2014-04-06 23:31:58 +02:00
|
|
|
(mlet %store-monad ((startx (or startx (xorg-start-command)))
|
|
|
|
(xinitrc (xinitrc)))
|
2014-02-19 20:58:24 +01:00
|
|
|
(text-file* "slim.cfg" "
|
2014-05-17 17:39:30 +02:00
|
|
|
default_path /run/current-system/profile/bin
|
2014-02-19 20:58:24 +01:00
|
|
|
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.
|
2014-05-11 13:41:08 +02:00
|
|
|
login_cmd exec " xinitrc " %session
|
2014-04-06 23:31:58 +02:00
|
|
|
sessions wmaker,ratpoison
|
2014-02-19 20:58:24 +01:00
|
|
|
|
|
|
|
halt_cmd " dmd "/sbin/halt
|
|
|
|
reboot_cmd " dmd "/sbin/reboot
|
|
|
|
" (if auto-login?
|
|
|
|
(string-append "auto_login yes\ndefault_user " default-user)
|
|
|
|
""))))
|
|
|
|
|
2014-04-28 23:07:08 +02:00
|
|
|
(mlet %store-monad ((slim.cfg (slim.cfg)))
|
2014-02-19 20:58:24 +01:00
|
|
|
(return
|
|
|
|
(service
|
|
|
|
(documentation "Xorg display server")
|
|
|
|
(provision '(xorg-server))
|
2014-07-09 23:53:35 +02:00
|
|
|
(requirement '(user-processes host-name udev))
|
2014-02-19 20:58:24 +01:00
|
|
|
(start
|
2014-07-24 19:38:50 +02:00
|
|
|
#~(lambda ()
|
|
|
|
;; A stale lock file can prevent SLiM from starting, so remove it
|
|
|
|
;; to be on the safe side.
|
|
|
|
(false-if-exception (delete-file "/var/run/slim.lock"))
|
|
|
|
|
|
|
|
(fork+exec-command
|
|
|
|
(list (string-append #$slim "/bin/slim") "-nodaemon")
|
|
|
|
#:environment-variables
|
|
|
|
(list (string-append "SLIM_CFGFILE=" #$slim.cfg)))))
|
2014-04-28 23:07:08 +02:00
|
|
|
(stop #~(make-kill-destructor))
|
2014-02-19 20:58:24 +01:00
|
|
|
(respawn? #t)
|
|
|
|
(pam-services
|
|
|
|
;; Tell PAM about 'slim'.
|
|
|
|
(list (unix-pam-service
|
|
|
|
"slim"
|
|
|
|
#:allow-empty-passwords? allow-empty-passwords?)))))))
|
|
|
|
|
|
|
|
;;; xorg.scm ends here
|