Vladimír Čunát 4c5a71f777 Merge master into x-updates ... Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix		2013-12-18 23:21:29 +01:00
..
desktop-managers	xfce4notifyd: minor update, add to the default installation	2013-11-18 21:08:25 +01:00
display-managers	Only run systemd-inhibit for local X11 sessions	2013-11-08 16:39:22 +01:00
hardware	Make touchpad button mapping configurable	2013-11-03 13:00:49 +04:00
window-managers	add herbstluftwm enable option	2013-12-14 14:45:33 +01:00
redshift.nix	services.redshift: New service	2013-10-22 09:03:06 +01:00
terminal-server.nix	Update the X11 terminal server module for systemd	2013-11-08 16:39:22 +01:00
xfs.conf	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
xfs.nix	Add lots of missing option types	2013-10-30 18:47:43 +01:00
xserver.nix	Merge pull request #1167 from grwlf/serverflags	2013-11-07 03:00:37 -08:00