Merge remote-tracking branch 'upstream/master' into x-updates
Merge remote-tracking branch 'upstream/master' into x-updates
Merge remote-tracking branch 'upstream/master' into x-updates
Merge remote-tracking branch 'upstream/x-updates' into x-updates
Describe where /etc/nix/nix.conf settings come from
Document that extraUsers options apply to root
Merge pull request #212 from ivan/nix-conf-header

Describe where /etc/nix/nix.conf settings come from
Merge pull request #213 from ivan/extraUsers-root

Document that extraUsers options apply to root
Subversion repos stopped updating last year
Explain how to use /my/sources with nix-env, not just nixos-rebuild
Merge pull request #216 from ivan/hacking-on-nixos

"Hacking on NixOS": Explain how to use /my/sources with nix-env
Unbreak iso_efi by feeding it a kernel that exists.
Use the Debian firmware package instead of the Intel-specific ones

The intel-*.nix modules are obsolete (since you can just say
‘hardware.enableAllFirmware = true’, or equivalently,
‘hardware.firmware = [ pkgs.firmwareLinuxNonfree ]’).  But we'll keep
them around for compatibility.
Update the locate database using a systemd service

This makes it easier to update the database manually ("systemctl start
update-locatedb").

Also, use modern module syntax.
Add /media and /run to the filesystems ignored by updatedb
Use the Debian firmware package in more places
Enable the Debian firmware package on the installation CD

It's unfree but we already had such firmware on the CD so we're not
worse off.

Issue #87.
not-detected.nix: Enable all firmware

Note that since the configuration produced by nixos-hardware-scan
includes not-detected.nix, you get all firmware when following the
regular installation procedure.

Issue #87.
Typo
i3: Allow to pass a configuration file.

With this it's now possible to directly embed a configuration file
using `services.xserver.windowManager.i3.configFile = path`, which then
will be used instead of the one in the users home directory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>