Eelco Dolstra d5047faede Remove uses of the "merge" option attribute ... It's redundant because you can (and should) specify an option type, or an apply function.		2013-10-28 22:45:56 +01:00
..
desktop-managers	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
display-managers	Remove uses of mkFixStrictness	2013-10-28 22:45:55 +01:00
hardware	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
window-managers	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
redshift.nix	services.redshift: New service	2013-10-22 09:03:06 +01:00
terminal-server.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +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	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
xserver.nix	xserver.s3tcSupport: fix typo, improve description.	2013-10-21 19:11:17 +03:00