2014-02-19 20:58:24 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
|
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
2014-02-19 20:58:24 +01:00
|
|
|
|
;;;
|
|
|
|
|
;;; 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)
|
2014-11-12 14:28:36 +01:00
|
|
|
|
#:use-module (gnu artwork)
|
2014-02-19 20:58:24 +01:00
|
|
|
|
#: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)
|
2015-02-03 15:08:04 +01:00
|
|
|
|
#:use-module (gnu packages sawfish)
|
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)
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
|
#:use-module (guix store)
|
2014-02-19 20:58:24 +01:00
|
|
|
|
#:use-module (guix monads)
|
|
|
|
|
#:use-module (guix derivations)
|
2015-01-26 23:33:24 +01:00
|
|
|
|
#:use-module (guix records)
|
2014-11-06 23:54:27 +01:00
|
|
|
|
#:use-module (srfi srfi-1)
|
|
|
|
|
#:use-module (srfi srfi-26)
|
|
|
|
|
#:use-module (ice-9 match)
|
2014-02-19 20:58:24 +01:00
|
|
|
|
#:export (xorg-start-command
|
2014-12-15 17:21:46 +01:00
|
|
|
|
%default-xsessions
|
2015-01-26 23:33:24 +01:00
|
|
|
|
%ratpoison-session-type
|
|
|
|
|
%windowmaker-session-type
|
2015-02-03 15:08:04 +01:00
|
|
|
|
%sawfish-session-type
|
2015-01-26 23:33:24 +01:00
|
|
|
|
|
|
|
|
|
session-type?
|
|
|
|
|
session-type-name
|
|
|
|
|
|
2014-11-12 14:20:38 +01:00
|
|
|
|
%default-slim-theme
|
|
|
|
|
%default-slim-theme-name
|
2014-02-19 20:58:24 +01:00
|
|
|
|
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-11-06 23:20:53 +01:00
|
|
|
|
(xorg-server xorg-server)
|
2014-11-06 23:54:27 +01:00
|
|
|
|
(drivers '()) (resolutions '()))
|
2014-11-06 23:20:53 +01:00
|
|
|
|
"Return a derivation that builds a @var{guile} script to start the X server
|
|
|
|
|
from @var{xorg-server}. Usually the X server is started by a login manager.
|
|
|
|
|
|
|
|
|
|
@var{drivers} must be either the empty list, in which case Xorg chooses a
|
|
|
|
|
graphics driver automatically, or a list of driver names that will be tried in
|
2014-11-06 23:54:27 +01:00
|
|
|
|
this order---e.g., @code{(\"modesetting\" \"vesa\")}.
|
|
|
|
|
|
|
|
|
|
Likewise, when @var{resolutions} is the empty list, Xorg chooses an
|
|
|
|
|
appropriate screen resolution; otherwise, it must be a list of
|
|
|
|
|
resolutions---e.g., @code{((1024 768) (640 480))}."
|
2014-11-06 23:20:53 +01:00
|
|
|
|
|
|
|
|
|
(define (device-section driver)
|
|
|
|
|
(string-append "
|
|
|
|
|
Section \"Device\"
|
|
|
|
|
Identifier \"device-" driver "\"
|
|
|
|
|
Driver \"" driver "\"
|
|
|
|
|
EndSection"))
|
2014-02-19 20:58:24 +01:00
|
|
|
|
|
2014-11-06 23:54:27 +01:00
|
|
|
|
(define (screen-section driver resolutions)
|
|
|
|
|
(string-append "
|
|
|
|
|
Section \"Screen\"
|
|
|
|
|
Identifier \"screen-" driver "\"
|
|
|
|
|
Device \"device-" driver "\"
|
|
|
|
|
SubSection \"Display\"
|
|
|
|
|
Modes "
|
|
|
|
|
(string-join (map (match-lambda
|
|
|
|
|
((x y)
|
|
|
|
|
(string-append "\"" (number->string x)
|
|
|
|
|
"x" (number->string y) "\"")))
|
|
|
|
|
resolutions)) "
|
|
|
|
|
EndSubSection
|
|
|
|
|
EndSection"))
|
|
|
|
|
|
2014-02-19 20:58:24 +01:00
|
|
|
|
(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\"
|
2014-12-20 02:55:59 +01:00
|
|
|
|
ModulePath \"" xf86-video-modesetting "/lib/xorg/modules/drivers\"
|
2014-07-09 23:52:49 +02:00
|
|
|
|
ModulePath \"" xf86-video-cirrus "/lib/xorg/modules/drivers\"
|
|
|
|
|
ModulePath \"" xf86-video-intel "/lib/xorg/modules/drivers\"
|
|
|
|
|
ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\"
|
2015-02-06 13:52:48 +01:00
|
|
|
|
ModulePath \"" xf86-video-nouveau "/lib/xorg/modules/drivers\"
|
2014-07-09 23:52:49 +02:00
|
|
|
|
ModulePath \"" xf86-video-nv "/lib/xorg/modules/drivers\"
|
2014-11-28 21:49:58 +01:00
|
|
|
|
ModulePath \"" xf86-video-sis "/lib/xorg/modules/drivers\"
|
gnu: xorg-server: Update to 1.16.2.901, with many security fixes.
Includes fixes for CVE-2014-8091, CVE-2014-8092, CVE-2014-8093, CVE-2014-8094,
CVE-2014-8095, CVE-2014-8096, CVE-2014-8097, CVE-2014-8098, CVE-2014-8099,
CVE-2014-8100, CVE-2014-8101, CVE-2014-8102, and CVE-2014-8103.
See <http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/>
* gnu/packages/xorg.scm (xorg-server): Update to 1.16.2.901. Move mesa,
resourceproto, scrnsaverproto, and xf86driproto from inputs to
propagated-inputs. Add dri3proto and presentproto to propagated-inputs.
Add eudev and libxshmfence to inputs. Add a 'pre-configure' phase instead
of modifying the 'configure' phase. Adapt substitution that avoids trying
to 'mkdir /var' to build system changes.
* gnu/services/xorg.scm (xserver.conf): Add xf86-input-evdev ModulePath line.
2014-12-20 03:30:37 +01:00
|
|
|
|
ModulePath \"" xf86-input-evdev "/lib/xorg/modules/input\"
|
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\"
|
2014-11-06 23:54:39 +01:00
|
|
|
|
Option \"AllowMouseOpenFail\" \"on\"
|
2014-02-19 20:58:24 +01:00
|
|
|
|
EndSection
|
2014-11-06 23:20:53 +01:00
|
|
|
|
"
|
2014-11-06 23:54:27 +01:00
|
|
|
|
(string-join (map device-section drivers) "\n")
|
|
|
|
|
(string-join (map (cut screen-section <> resolutions)
|
|
|
|
|
drivers)
|
|
|
|
|
"\n")))
|
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")
|
2014-11-07 21:30:36 +01:00
|
|
|
|
(string-append #$xorg-server "/bin/X") ;argv[0]
|
2014-11-11 21:41:42 +01:00
|
|
|
|
"-logverbose" "-verbose"
|
2014-04-27 19:28:47 +02:00
|
|
|
|
"-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-12-15 17:21:46 +01:00
|
|
|
|
fallback-session)
|
|
|
|
|
"Return a system-wide xinitrc script that starts the specified X session,
|
|
|
|
|
which should be passed to this script as the first argument. If not, the
|
|
|
|
|
@var{fallback-session} will be used."
|
2014-04-27 19:28:47 +02:00
|
|
|
|
(define builder
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (ice-9 match))
|
|
|
|
|
|
2015-03-02 20:34:37 +01:00
|
|
|
|
(define (close-all-fdes)
|
|
|
|
|
;; Close all the open file descriptors except 0 to 2.
|
|
|
|
|
(let loop ((fd 3))
|
|
|
|
|
(when (< fd 4096) ;FIXME: use sysconf + _SC_OPEN_MAX
|
|
|
|
|
(false-if-exception (close-fdes fd))
|
|
|
|
|
(loop (+ 1 fd)))))
|
|
|
|
|
|
2014-12-13 16:17:23 +01:00
|
|
|
|
(define (exec-from-login-shell command . args)
|
|
|
|
|
;; Run COMMAND from a login shell so that it gets to see the same
|
|
|
|
|
;; environment variables that one gets when logging in on a tty, for
|
|
|
|
|
;; instance.
|
|
|
|
|
(let* ((pw (getpw (getuid)))
|
|
|
|
|
(shell (passwd:shell pw))
|
|
|
|
|
(st (stat command #f)))
|
|
|
|
|
(when (and st (not (zero? (logand (stat:mode st) #o100))))
|
2015-03-02 20:34:37 +01:00
|
|
|
|
;; Close any open file descriptors. This is all the more
|
|
|
|
|
;; important that SLiM itself exec's us directly without closing
|
|
|
|
|
;; its own file descriptors!
|
|
|
|
|
(close-all-fdes)
|
|
|
|
|
|
2014-12-13 16:17:23 +01:00
|
|
|
|
;; The '--login' option is supported at least by Bash and zsh.
|
|
|
|
|
(execl shell shell "--login" "-c"
|
|
|
|
|
(string-join (cons command args))))))
|
|
|
|
|
|
2014-12-15 17:21:46 +01:00
|
|
|
|
(let ((home (getenv "HOME"))
|
|
|
|
|
(session (match (command-line)
|
|
|
|
|
((_ x) x)
|
|
|
|
|
(_ #$fallback-session))))
|
|
|
|
|
;; First, try to run ~/.xsession.
|
|
|
|
|
(exec-from-login-shell (string-append home "/.xsession"))
|
|
|
|
|
;; Then try to start the specified session.
|
|
|
|
|
(exec-from-login-shell session))))
|
2014-04-27 19:28:47 +02:00
|
|
|
|
(gexp->script "xinitrc" builder))
|
2014-04-06 23:31:58 +02:00
|
|
|
|
|
2014-11-12 14:20:38 +01:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; SLiM log-in manager.
|
|
|
|
|
;;;
|
|
|
|
|
|
2015-01-26 23:33:24 +01:00
|
|
|
|
(define-record-type* <session-type> session-type make-session-type
|
|
|
|
|
session-type?
|
|
|
|
|
(name session-type-name) ;string
|
|
|
|
|
(executable session-type-executable)) ;string-valued gexp
|
|
|
|
|
|
|
|
|
|
(define %windowmaker-session-type
|
|
|
|
|
(session-type
|
|
|
|
|
(name "WindowMaker")
|
|
|
|
|
(executable #~(string-append #$windowmaker "/bin/wmaker"))))
|
|
|
|
|
|
|
|
|
|
(define %ratpoison-session-type
|
|
|
|
|
(session-type
|
|
|
|
|
(name "Ratpoison")
|
|
|
|
|
(executable #~(string-append #$ratpoison "/bin/ratpoison"))))
|
|
|
|
|
|
2015-02-03 15:08:04 +01:00
|
|
|
|
(define %sawfish-session-type
|
|
|
|
|
(session-type
|
|
|
|
|
(name "Sawfish")
|
|
|
|
|
(executable #~(string-append #$sawfish "/bin/sawfish"))))
|
|
|
|
|
|
2014-12-15 17:21:46 +01:00
|
|
|
|
(define %default-xsessions
|
2015-01-26 23:33:24 +01:00
|
|
|
|
;; Default session types available to the log-in manager.
|
|
|
|
|
(list %windowmaker-session-type %ratpoison-session-type))
|
2014-12-15 17:21:46 +01:00
|
|
|
|
|
|
|
|
|
(define (xsessions-directory sessions)
|
2015-02-26 22:17:21 +01:00
|
|
|
|
"Return a directory containing SESSIONS, a list of <session-type> objects.
|
|
|
|
|
The alphabetical order of the files in that directory match the order of the
|
|
|
|
|
elements in SESSIONS."
|
2015-01-26 23:33:24 +01:00
|
|
|
|
(define builder
|
|
|
|
|
#~(begin
|
2015-02-26 22:17:21 +01:00
|
|
|
|
(use-modules (srfi srfi-1)
|
|
|
|
|
(ice-9 format))
|
|
|
|
|
|
2015-01-26 23:33:24 +01:00
|
|
|
|
(mkdir #$output)
|
|
|
|
|
(chdir #$output)
|
2015-02-26 22:17:21 +01:00
|
|
|
|
(fold (lambda (name executable number)
|
|
|
|
|
;; Create file names such that the order of the items in
|
|
|
|
|
;; SESSION is respected. SLiM gets them in lexicographic
|
|
|
|
|
;; order and uses the first one as the default session.
|
|
|
|
|
(let ((file (format #f "~2,'0d-~a.desktop"
|
|
|
|
|
number (string-downcase name))))
|
|
|
|
|
(call-with-output-file file
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(format port "[Desktop Entry]
|
2015-01-26 23:33:24 +01:00
|
|
|
|
Name=~a
|
|
|
|
|
Exec=~a
|
|
|
|
|
Type=Application~%"
|
2015-02-26 22:17:21 +01:00
|
|
|
|
name executable)))
|
|
|
|
|
(+ 1 number)))
|
|
|
|
|
1
|
|
|
|
|
'#$(map session-type-name sessions)
|
|
|
|
|
(list #$@(map session-type-executable sessions)))))
|
2015-01-26 23:33:24 +01:00
|
|
|
|
|
|
|
|
|
(gexp->derivation "xsessions-dir" builder))
|
2014-12-15 17:21:46 +01:00
|
|
|
|
|
2014-11-12 14:20:38 +01:00
|
|
|
|
(define %default-slim-theme
|
|
|
|
|
;; Theme based on work by Felipe López.
|
|
|
|
|
#~(string-append #$%artwork-repository "/slim"))
|
|
|
|
|
|
|
|
|
|
(define %default-slim-theme-name
|
|
|
|
|
;; This must be the name of the sub-directory in %DEFAULT-SLIM-THEME that
|
|
|
|
|
;; contains the actual theme files.
|
|
|
|
|
"0.8")
|
|
|
|
|
|
2014-02-19 20:58:24 +01:00
|
|
|
|
(define* (slim-service #:key (slim slim)
|
|
|
|
|
(allow-empty-passwords? #t) auto-login?
|
|
|
|
|
(default-user "")
|
2014-11-12 14:20:38 +01:00
|
|
|
|
(theme %default-slim-theme)
|
|
|
|
|
(theme-name %default-slim-theme-name)
|
2014-02-19 20:58:24 +01:00
|
|
|
|
(xauth xauth) (dmd dmd) (bash bash)
|
2014-12-15 17:21:46 +01:00
|
|
|
|
(sessions %default-xsessions)
|
|
|
|
|
(auto-login-session #~(string-append #$windowmaker
|
|
|
|
|
"/bin/wmaker"))
|
2014-02-19 20:58:24 +01:00
|
|
|
|
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
|
2014-12-15 17:21:46 +01:00
|
|
|
|
@var{default-user} with @var{auto-login-session}.
|
2014-11-12 14:20:38 +01:00
|
|
|
|
|
|
|
|
|
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
|
2015-01-26 23:33:24 +01:00
|
|
|
|
theme.
|
|
|
|
|
|
|
|
|
|
Last, @var{session} is a list of @code{<session-type>} objects denoting the
|
2015-02-26 22:17:21 +01:00
|
|
|
|
available session types that can be chosen from the log-in screen. The first
|
|
|
|
|
one is chosen by default."
|
2014-11-12 14:20:38 +01:00
|
|
|
|
|
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)))
|
2014-12-15 17:21:46 +01:00
|
|
|
|
(xinitrc (xinitrc #:fallback-session
|
|
|
|
|
auto-login-session))
|
|
|
|
|
(sessiondir (xsessions-directory sessions)))
|
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-12-15 17:21:46 +01:00
|
|
|
|
sessiondir " sessiondir "
|
2015-02-26 22:24:15 +01:00
|
|
|
|
session_msg session (F1 to change):
|
2014-02-19 20:58:24 +01:00
|
|
|
|
|
|
|
|
|
halt_cmd " dmd "/sbin/halt
|
|
|
|
|
reboot_cmd " dmd "/sbin/reboot
|
2014-11-12 14:20:38 +01:00
|
|
|
|
"
|
|
|
|
|
(if auto-login?
|
|
|
|
|
(string-append "auto_login yes\ndefault_user " default-user "\n")
|
|
|
|
|
"")
|
|
|
|
|
(if theme-name
|
|
|
|
|
(string-append "current_theme " theme-name "\n")
|
|
|
|
|
""))))
|
2014-02-19 20:58:24 +01:00
|
|
|
|
|
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
|
2014-11-12 14:20:38 +01:00
|
|
|
|
(list (string-append "SLIM_CFGFILE=" #$slim.cfg)
|
|
|
|
|
#$@(if theme
|
|
|
|
|
(list #~(string-append "SLIM_THEMESDIR=" #$theme))
|
|
|
|
|
#~())))))
|
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
|