summaryrefslogtreecommitdiff
path: root/gnu/services/xorg.scm
Commit message (Collapse)AuthorAge
* services: xorg: Add xf86-input-libinput to the server's module path.Ludovic Courtès2015-05-21
| | | | * gnu/services/xorg.scm (xorg-configuration-file): Add XF86-INPUT-LIBINPUT.
* services: xorg: Assume STARTX is a regular value.Ludovic Courtès2015-05-21
| | | | | * gnu/services/xorg.scm (slim-service): Expect STARTX to be a regular value, not a monadic value.
* services: xorg: Allow extra config text to be added verbatim.Ludovic Courtès2015-05-21
| | | | | | * gnu/services/xorg.scm (xorg-configuration-file): Add #:extra-config and honor it. * doc/guix.texi (X Window): Adjust accordingly.
* services: xorg: Make 'xorg-configuration-file' public.Ludovic Courtès2015-05-21
| | | | | | | * gnu/services/xorg.scm (xorg-configuration-file): New procedure, with code formerly in 'xorg-start-command'. (xorg-start-command): Remove #:drivers and #:resolutions; add #:configuration-file; use it as well as 'xorg-configuration-file'.
* doc: Document sessions and ~/.xsession for SLiM.Ludovic Courtès2015-05-08
| | | | | | * gnu/services/xorg.scm (slim-service): Document session types and ~/.xsession. * doc/guix.texi (X Window): Adjust accordingly.
* artwork: Update to latest version.Ludovic Courtès2015-05-07
| | | | | | | * gnu/artwork.scm (%artwork-repository): Update. * gnu/services/xorg.scm (%default-slim-theme-name): Change to "0.x". * gnu/system/grub.scm (%background-image): Change to GuixSD-fully-black-4-3.svg.
* services: slim: Pass SESSION to ~/.xsession as "$1".宋文武2015-03-13
| | | | * gnu/services/xorg.scm (xinitrc)[builder]: Pass SESSION to ~/.xsession.
* services: slim: Allow non-absolute path to be used as session command.宋文武2015-03-13
| | | | | * gnu/services/xorg.scm (xinitrc)[builder]: Don't check the existence of COMMAND. Only run ~/.xsession when it exists.
* services: slim: Use /run/current-system/profile/share/xsessions as sessiondir.宋文武2015-03-13
| | | | | | | | | * gnu/services/xorg.scm (<session-type>, %windowmaker-session-type) (%ratposion-session-type, %sawfish-session-type, %default-xsessions) (xsessions-directory): Remove. (slim-service): Remove #:sessions parameter. [slim.cfg]: Use /run/current-system/profile/share/xsessions as sessiondir. * doc/guix.texi <X Window>: Adjust accordingly.
* services: xorg: Fix file descriptor leak from SLiM/xinitrc.Ludovic Courtès2015-03-02
| | | | | | | This reverts commit 9515b745547cff08ad5b958bc54323dab19f29b9. * gnu/services/xorg.scm (xinitrc)[builder](close-all-fdes): Start from file descriptor 3.
* Revert "services: xorg: Fix file descriptor leak from SLiM/xinitrc."Mark H Weaver2015-03-01
| | | | | This reverts commit ec4a4c46efaf2e7373f331654640f1321c0f2e62, because it broke XFCE.
* services: xorg: Fix file descriptor leak from SLiM/xinitrc.Ludovic Courtès2015-03-01
| | | | | | | | | Previously processes started from the window manager would have a couple of leaked file descriptors: writable /var/log/slim.log and readable /gnu/store/…-xinitrc. * gnu/services/xorg.scm (xinitrc)[builder]: Add 'close-all-fdes'. Use it in 'exec-from-login-shell'.
* services: slim: Add "F1 to change" in session message.Ludovic Courtès2015-02-26
| | | | * gnu/services/xorg.scm (slim-service)[slim.cfg]: Add 'session_msg'.
* services: slim: Preserve the order of session types.Ludovic Courtès2015-02-26
| | | | | | | | | That makes WindowMaker the default session, by default. * gnu/services/xorg.scm (xsessions-directory)[builder]: Prepend a number in the file name to preserve the order of SESSIONS. (slim-service): Augment docstring. * doc/guix.texi (X Window): Adjust accordingly.
* services: xorg: Add Nouveau driver.Ludovic Courtès2015-02-06
| | | | | * gnu/services/xorg.scm (xorg-start-command)[xserver.conf]: Add XF86-VIDEO-NOUVEAU.
* services: xorg: Add sawfish session.宋文武2015-02-03
| | | | | * gnu/services/xorg.scm (%sawfish-session-type): New variable. * doc/guix.texi (X Window): Mention it.
* services: xorg: Define the <session-type> record type.Ludovic Courtès2015-01-26
| | | | | | | | | | * gnu/services/xorg.scm (<session-type>): New record type. (%windowmaker-session-type, %ratpoison-session-type): New variables. (%default-xsessions): Use them. (xsessions-directory): Expect SESSIONS to be a list of <session-type> and rewrite accordingly. (slim-service): Adjust docstring. * doc/guix.texi (X Window): Update accordingly.
* monads: Move '%store-monad' and related procedures where they belong.Ludovic Courtès2015-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* gnu: xorg-server: Update to 1.16.2.901, with many security fixes.Mark H Weaver2014-12-19
| | | | | | | | | | | | | | | | | 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.
* gnu: xf86-video-modesetting: Now uses the same libdrm as mesa.Mark H Weaver2014-12-19
| | | | | | | | * gnu/packages/xorg.scm (xf86-video-modesetting): Remove a comment stating that the libdrm used in this driver is incompatible with the one in mesa, because it is no longer true. * gnu/services/xorg.scm (xserver.conf): Uncomment 'xf86-video-modesetting' ModulePath and remove associated comment.
* services: xorg: Make SLiM sessions configurable.宋文武2014-12-20
| | | | | | | | * gnu/services/xorg.scm (%default-xsessions): New variable. (xsessions-directory): New procedure. (slim-service): Add #:sessions and #:auto-login-session parameters. [slim.cfg]: Honor #:sessions. (xinitrc): Adjust accordingly.
* services: xorg: Run the window manager from a login shell.Ludovic Courtès2014-12-13
| | | | | | | | This is a followup to 1d18d87, which fixes <http://bugs.gnu.org/19119>. * gnu/services/xorg.scm (xinitrc)[builder]: Add 'exec-from-login-shell' procedure. Use it instead of 'execl' when launching XSESSION, WMAKER, or RATPOISON.
* services: xorg: Add 'xf86-video-sis'.Alex Kost2014-11-30
| | | | | * gnu/services/xorg.scm (xorg-start-command)[xserver.conf]: Add ModulePath for 'xf86-video-sis'.
* services: xorg: Include ~/.guix-profile/bin to the session's $PATH.Ludovic Courtès2014-11-20
| | | | | | | | Fixes <http://bugs.gnu.org/19119>. Reported by David Thompson <dthompson2@worcester.edu>. * gnu/services/xorg.scm (xinitrc): Augment $PATH to include ~/.guix-profile/bin.
* services: xorg: Set argv[0] for the window manager.Ludovic Courtès2014-11-12
| | | | | * gnu/services/xorg.scm (xinitrc): Set argv[0] when invoking ratpoison or wmaker.
* gnu: Introduce (gnu artwork) module.Ludovic Courtès2014-11-12
| | | | | | | | | * gnu/artwork.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. * gnu/services/xorg.scm: Use it. (%artwork-repository): Remove. * gnu/system/grub.scm: Use it. (%artwork-repository): Remove.
* gnu: xorg: Add SLiM theme based on work by Felipe López.Ludovic Courtès2014-11-12
| | | | | | | | | | | * gnu/services/xorg.scm (%artwork-repository, %default-slim-theme, %default-slim-theme-name): New variables. (slim-service): Add #:theme and #:theme-name parameters. [slim.cfg]: Honor #:theme-name. Honor #:theme by setting the "SLIM_THEMESDIR" environment variable. * doc/guix.texi (X Window): Adjust 'slim-service' documentation accordingly. Document '%default-slim-theme' and '%default-slim-theme-name'.
* services: xorg: Don't pass "-ac" to X.Ludovic Courtès2014-11-11
| | | | | | This had pretty much no effects given "-nolisten tcp". * gnu/services/xorg.scm (xorg-start-command): Remove "-ac" option.
* services: xorg: Add argv[0] in X invocation.Ludovic Courtès2014-11-08
| | | | | * gnu/services/xorg.scm (xorg-start-command): Add missing argv[0] in 'execl' call.
* services: xorg: Allow users to specify a list of resolutions.Ludovic Courtès2014-11-07
| | | | | | * gnu/services/xorg.scm (xorg-start-command): Add #:resolutions parameter and 'screen-section' procedure. Use it. * doc/guix.texi (X Window): Adjust accordingly.
* services: xorg: Allow users to specify the drivers to use.Ludovic Courtès2014-11-07
| | | | | | * gnu/services/xorg.scm (xorg-start-command): Add #:drivers parameter. Add 'device-section' procedure, and use it in 'xserver.conf'. * doc/guix.texi (X Window): Document it.
* services: xorg: Fix typo in xserver.conf.Ludovic Courtès2014-11-07
| | | | | * gnu/services/xorg.scm (xorg-start-command)[xserver.conf]: Add missing double-quote in AllowMouseOpenFail.
* gnu: Add xf86-video-modesetting.Ludovic Courtès2014-11-06
| | | | | | * gnu/packages/xorg.scm (xf86-video-modesetting): New variable. * gnu/services/xorg.scm (xorg-start-command)[xserver.conf]: Add ModulePath line for XF86-VIDEO-MODESETTING, commented out.
* gnu: xorg: Remove xf86-input-vmmouse.Ludovic Courtès2014-09-23
| | | | | | * gnu/packages/xorg.scm (xf86-input-vmmouse): Remove. This driver implement the mouse protocol of a proprietary emulator. * gnu/services/xorg.scm (xorg-start-command): Remove reference.
* gnu: Split (gnu packages base), adding (gnu packages commencement).Ludovic Courtès2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* services: xorg: Honor ~/.xsession.Ludovic Courtès2014-07-24
| | | | * gnu/services/xorg.scm (xinitrc): Attempt to execute ~/.xsession.
* services: xorg: Remove /var/run/slim.lock when starting.Ludovic Courtès2014-07-24
| | | | | | | Reported by Mark H. Weaver. * gnu/services/xorg.scm (slim-service)[start]: Remove /var/run/slim.lock before starting 'slim'.
* services: Use more Texinfo markup in docstrings.Ludovic Courtès2014-07-11
| | | | | | | | | * gnu/services/base.scm (host-name-service): Use Texinfo markup. (mingetty-service): Comment on #:allow-empty-passwords?. Improve markup. (syslog-service, guix-service): Use Texinfo markup. * gnu/services/networking.scm (static-networking-service): Likewise. * gnu/services/xorg.scm (slim-service): Likewise.
* services: xorg: Remove optional sections from xorg.conf.Ludovic Courtès2014-07-10
| | | | | | * gnu/services/xorg.scm (xorg-start-command)[xserver.conf]: Remove sections "Monitor", "InputClass", "ServerLayout", "Device", and "Screen".
* services: xorg: Require 'udev'.Ludovic Courtès2014-07-10
| | | | * gnu/services/xorg.scm: Add 'udev' to the 'requirement' field.
* services: xorg: Add drivers to the default search path.Ludovic Courtès2014-07-10
| | | | | | * gnu/services/xorg.scm (xorg-start-command)[xserver.conf]: Add 'ModulePath' entries for xf86-video-{fbdev,cirrus,intel,mach64,nv} and xf86-input-{synaptics,vmmouse}.
* services: xorg: Fix typo in font path.Ludovic Courtès2014-07-10
| | | | | * gnu/services/xorg.scm (xorg-start-command)[xserver.conf]: Fix typo in font path.
* services: Update to use the dmd 0.2 API.Ludovic Courtès2014-07-08
| | | | | | | | | | | | | | * gnu/services/avahi.scm (avahi-service)[start]: Wrap command in a list. * gnu/services/dbus.scm (dbus-service)[start]: Likewise. * gnu/services/ssh.scm (lsh-service): Likewise. * gnu/services/base.scm (mingetty-service)[start]: Likewise. (nscd-service)[start]: Likewise. (syslog-service)[start]: Likewise. (guix-service)[start]: Likewise. (udev-service)[start]: Use 'exec-command' instead of 'execl'. * gnu/services/xorg.scm (slim-service)[start]: Likewise, and use #:environment-variables.
* system: Make /run/current-system at activation time.Ludovic Courtès2014-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/system.scm (etc-directory): Change default value of #:profile. Change contents of SHELLS. Use /run/current-system/profile/{s,}bin in BASHRC. (operating-system-boot-script)[%modules]: Add (guix build linux-initrd). Add call to 'activate-current-system' in gexp. (operating-system-initrd-file, operating-system-grub.cfg): New procedures. (operating-system-derivation): Don't build grub.cfg here and remove it from the file union. * gnu/system/vm.scm (qemu-image): Remove #:populate. (operating-system-build-gid, operating-system-default-contents): Remove. (system-qemu-image): Remove call to 'operating-system-default-contents'. Use 'operating-system-grub.cfg' to get grub.cfg. Add GRUB.CFG to #:inputs. (system-qemu-image/shared-store): Likewise, but don't add GRUB.CFG to #:inputs. (system-qemu-image/shared-store-script): Pass --system kernel option. * guix/build/activation.scm (%booted-system, %current-system): New variables. (boot-time-system, activate-current-system): New procedures. * guix/build/install.scm (evaluate-populate-directive): Add case for ('directory name uid gid mode). (directives, populate-root-file-system): New procedures. * guix/build/vm.scm (initialize-hard-disk): Replace calls to 'evaluate-populate-directive' by a call to 'populate-root-file-system'. * gnu/services/dmd.scm (dmd-configuration-file): Use /run/current-system/profile/bin. * gnu/services/xorg.scm (slim-service): Likewise.
* services: xorg: Fix harmless typo in slim.cfg.Ludovic Courtès2014-05-11
| | | | | * gnu/services/xorg.scm (slim-service): Add missing whitespace in XINITRC invocation.
* services: Add service to cleanly unmount the root file system.Ludovic Courtès2014-05-08
| | | | | | | | | | | * gnu/services/base.scm (root-file-system-service, user-processes-service): New procedures. (mingetty-service, nscd-service, syslog-service, guix-service): Add requirement on 'user-processes'. (%base-services): Add (user-processes-service) and (root-file-system-service). * gnu/services/xorg.scm (slim-service): Add requirement on 'user-processes'.
* services: xorg: Rewrite using gexps.Ludovic Courtès2014-04-28
| | | | | | * gnu/services/xorg.scm (xorg-start-command): Rewrite in terms of 'gexp->script'. (xinitrc): Likewise.
* services: Rewrite using gexps.Ludovic Courtès2014-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/services.scm (<service>)[inputs]: Remove. * gnu/system.scm (links): Remove. (etc-directory): Add PASSWD and SHADOW to #:inputs. (operating-system-boot-script): Pass ETC to 'dmd-configuration-file'. (operating-system-derivation): Remove EXTRAS from the union. * gnu/system/linux.scm (pam-service->configuration): Rewrite in terms of 'gexp->derivation'. Compute the contents on the build side. Expect 'arguments' to contain a list of gexps. (pam-services->directory): Rewrite in terms of 'gexp->derivation'. (unix-pam-service): Change 'arguments' to a list of one gexp. * gnu/system/shadow.scm (<user-account>)[inputs]: Remove. [shell]: Change default value to a gexp. (passwd-file): Rewrite in terms of 'gexp->derivation'. Compute contents on the build side. * gnu/services/base.scm (host-name-service, mingetty-service, nscd-service, syslog-service, guix-service): Change 'start' and 'stop' to gexps; remove 'inputs' field. (guix-build-accounts): Change 'shell' field to a gexp. * gnu/services/networking.scm (static-networking-service): Change 'start' and 'stop' to gexps; remove 'inputs' field. * gnu/services/xorg.scm (slim-service): Likewise. * gnu/services/dmd.scm (dmd-configuration-file): Expect ETC to be a derivation. Change 'config' to a gexp. Use 'gexp->file' instead of 'text-file'. * doc/guix.texi (Defining Services): Update nscd example with gexps, and without 'inputs'. Add xref to "G-Expressions".
* services: slim: Use a system-wide xinitrc that defaults to wmaker.Ludovic Courtès2014-04-06
| | | | | * gnu/services/xorg.scm (xinitrc): New procedure. (slim-service)[slim.cfg]: Use it as the 'login_cmd'.
* gnu: Introduce the (gnu services ...) modules.Ludovic Courtès2014-02-19
* 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.