nixpkgs/nixos/modules/services/x11
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
..
desktop-managers Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
display-managers Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
hardware xf86-input-synaptics: make use of 50-synaptics.conf 2015-09-18 07:16:52 -07:00
window-managers Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
redshift.nix Add missing 'type', 'defaultText' and 'literalExample' in module definitions 2016-01-17 19:41:23 +01:00
terminal-server.nix Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
unclutter.nix "types.uniq types.string" -> "types.str" 2015-06-15 18:08:49 +02: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 jobs -> systemd.services 2016-01-07 06:39:06 +00:00
xserver.nix Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00