3 commits

Author	SHA1	Message	Date
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
Eelco Dolstra	a2c820c678	Turn security.pam.services into an attribute set ... That is, you can say security.pam.services.sshd = { options... }; instead of security.pam.services = [ { name = "sshd"; options... } ]; making it easier to override PAM settings from other modules.	2013-10-15 14:47:51 +02:00
Eelco Dolstra	5c1f8cbc70	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00