Move all of NixOS to nixos/ in preparation of the repository merge

481 files changed, 0 insertions, 0 deletions

diff --git a/.gitignore b/nixos/.gitignore
index e75fb319980e..e75fb319980e 100644
--- a/.gitignore
+++ b/nixos/.gitignore
diff --git a/.version b/nixos/.version
index eb28f45ff242..eb28f45ff242 100644
--- a/.version
+++ b/nixos/.version
diff --git a/COPYING b/nixos/COPYING
index c9b44cb8aaeb..c9b44cb8aaeb 100644
--- a/COPYING
+++ b/nixos/COPYING
diff --git a/README b/nixos/README
index 4ecf648a9302..4ecf648a9302 100644
--- a/README
+++ b/nixos/README
diff --git a/default.nix b/nixos/default.nix
index d38e70d21f94..d38e70d21f94 100644
--- a/default.nix
+++ b/nixos/default.nix
diff --git a/doc/config-examples/basic.nix b/nixos/doc/config-examples/basic.nix
index da37cfb8c286..da37cfb8c286 100644
--- a/doc/config-examples/basic.nix
+++ b/nixos/doc/config-examples/basic.nix
diff --git a/doc/config-examples/closed-install-configuration.nix b/nixos/doc/config-examples/closed-install-configuration.nix
index 0cebacdb0ccd..0cebacdb0ccd 100644
--- a/doc/config-examples/closed-install-configuration.nix
+++ b/nixos/doc/config-examples/closed-install-configuration.nix
diff --git a/doc/config-examples/root-on-lvm.nix b/nixos/doc/config-examples/root-on-lvm.nix
index 2ea1e547921f..2ea1e547921f 100644
--- a/doc/config-examples/root-on-lvm.nix
+++ b/nixos/doc/config-examples/root-on-lvm.nix
diff --git a/doc/config-examples/svn-server.nix b/nixos/doc/config-examples/svn-server.nix
index e727007117b1..e727007117b1 100644
--- a/doc/config-examples/svn-server.nix
+++ b/nixos/doc/config-examples/svn-server.nix
diff --git a/doc/config-examples/x86_64-usbstick.nix b/nixos/doc/config-examples/x86_64-usbstick.nix
index 374d3ba3bc74..374d3ba3bc74 100644
--- a/doc/config-examples/x86_64-usbstick.nix
+++ b/nixos/doc/config-examples/x86_64-usbstick.nix
diff --git a/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index 965ba73105ad..965ba73105ad 100644
--- a/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
diff --git a/doc/manual/default.nix b/nixos/doc/manual/default.nix
index e6edb30985c1..e6edb30985c1 100644
--- a/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
diff --git a/doc/manual/development.xml b/nixos/doc/manual/development.xml
index d8b5f6f571cc..d8b5f6f571cc 100644
--- a/doc/manual/development.xml
+++ b/nixos/doc/manual/development.xml
diff --git a/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 3068fa5cb944..3068fa5cb944 100644
--- a/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
diff --git a/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml
index d49369d2c584..d49369d2c584 100644
--- a/doc/manual/man-configuration.xml
+++ b/nixos/doc/manual/man-configuration.xml
diff --git a/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
index f37677629d0c..f37677629d0c 100644
--- a/doc/manual/man-nixos-build-vms.xml
+++ b/nixos/doc/manual/man-nixos-build-vms.xml
diff --git a/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index f7a8ce403dc1..f7a8ce403dc1 100644
--- a/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
diff --git a/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index e43dafd3cfec..e43dafd3cfec 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
diff --git a/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml
index 7840e1b897b0..7840e1b897b0 100644
--- a/doc/manual/man-pages.xml
+++ b/nixos/doc/manual/man-pages.xml
diff --git a/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 7d6634bf0931..7d6634bf0931 100644
--- a/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
diff --git a/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index adc6c93c7223..adc6c93c7223 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
diff --git a/doc/manual/running.xml b/nixos/doc/manual/running.xml
index e50099707cc5..e50099707cc5 100644
--- a/doc/manual/running.xml
+++ b/nixos/doc/manual/running.xml
diff --git a/doc/manual/style.css b/nixos/doc/manual/style.css
index e2204c159e22..e2204c159e22 100644
--- a/doc/manual/style.css
+++ b/nixos/doc/manual/style.css
diff --git a/doc/manual/troubleshooting.xml b/nixos/doc/manual/troubleshooting.xml
index c6e0a3a7888c..c6e0a3a7888c 100644
--- a/doc/manual/troubleshooting.xml
+++ b/nixos/doc/manual/troubleshooting.xml
diff --git a/doc/manual/userconfiguration.xml b/nixos/doc/manual/userconfiguration.xml
index 7c6540caf3a7..7c6540caf3a7 100644
--- a/doc/manual/userconfiguration.xml
+++ b/nixos/doc/manual/userconfiguration.xml
diff --git a/gui/README b/nixos/gui/README
index c038314a0dc7..c038314a0dc7 100644
--- a/gui/README
+++ b/nixos/gui/README
diff --git a/gui/application.ini b/nixos/gui/application.ini
index d2494a1a5cd5..d2494a1a5cd5 100644
--- a/gui/application.ini
+++ b/nixos/gui/application.ini
diff --git a/gui/chrome.manifest b/nixos/gui/chrome.manifest
index 865d6a88fb48..865d6a88fb48 100644
--- a/gui/chrome.manifest
+++ b/nixos/gui/chrome.manifest
diff --git a/gui/chrome/chrome.manifest b/nixos/gui/chrome/chrome.manifest
index 775445ee17bf..775445ee17bf 100644
--- a/gui/chrome/chrome.manifest
+++ b/nixos/gui/chrome/chrome.manifest
diff --git a/gui/chrome/content/io.js b/nixos/gui/chrome/content/io.js
index 8d9c8c173656..8d9c8c173656 100644
--- a/gui/chrome/content/io.js
+++ b/nixos/gui/chrome/content/io.js
diff --git a/gui/chrome/content/main.js b/nixos/gui/chrome/content/main.js
index ecfc5a8c5c99..ecfc5a8c5c99 100644
--- a/gui/chrome/content/main.js
+++ b/nixos/gui/chrome/content/main.js
diff --git a/gui/chrome/content/myviewer.xul b/nixos/gui/chrome/content/myviewer.xul
index 2aeb9391d076..2aeb9391d076 100644
--- a/gui/chrome/content/myviewer.xul
+++ b/nixos/gui/chrome/content/myviewer.xul
diff --git a/gui/chrome/content/nixos.js b/nixos/gui/chrome/content/nixos.js
index 63a3c16a573f..63a3c16a573f 100644
--- a/gui/chrome/content/nixos.js
+++ b/nixos/gui/chrome/content/nixos.js
diff --git a/gui/chrome/content/optionView.js b/nixos/gui/chrome/content/optionView.js
index 0d093740fe25..0d093740fe25 100644
--- a/gui/chrome/content/optionView.js
+++ b/nixos/gui/chrome/content/optionView.js
diff --git a/gui/components/clh.js b/nixos/gui/components/clh.js
index fd85422d6c85..fd85422d6c85 100644
--- a/gui/components/clh.js
+++ b/nixos/gui/components/clh.js
diff --git a/gui/defaults/preferences/myviewer-prefs.js b/nixos/gui/defaults/preferences/myviewer-prefs.js
index e10fa18c0d8e..e10fa18c0d8e 100644
--- a/gui/defaults/preferences/myviewer-prefs.js
+++ b/nixos/gui/defaults/preferences/myviewer-prefs.js
diff --git a/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 59f05bfd1043..59f05bfd1043 100644
--- a/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
diff --git a/lib/channel-expr.nix b/nixos/lib/channel-expr.nix
index 453bdd506b88..453bdd506b88 100644
--- a/lib/channel-expr.nix
+++ b/nixos/lib/channel-expr.nix
diff --git a/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 47e7d1a0eafa..47e7d1a0eafa 100644
--- a/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
diff --git a/lib/from-env.nix b/nixos/lib/from-env.nix
index 6bd71e40e9a1..6bd71e40e9a1 100644
--- a/lib/from-env.nix
+++ b/nixos/lib/from-env.nix
diff --git a/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index 5ad546e9534d..5ad546e9534d 100644
--- a/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
diff --git a/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh
index 89b681ed2cd5..89b681ed2cd5 100644
--- a/lib/make-iso9660-image.sh
+++ b/nixos/lib/make-iso9660-image.sh
diff --git a/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 3b640334e17a..3b640334e17a 100644
--- a/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
diff --git a/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index 8fed9a348827..8fed9a348827 100644
--- a/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
diff --git a/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index aadd0f6428c8..aadd0f6428c8 100644
--- a/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
diff --git a/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index de355b08918c..de355b08918c 100644
--- a/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
diff --git a/lib/test-driver/Logger.pm b/nixos/lib/test-driver/Logger.pm
index 6e62fdfd7708..6e62fdfd7708 100644
--- a/lib/test-driver/Logger.pm
+++ b/nixos/lib/test-driver/Logger.pm
diff --git a/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index a28214ea934f..a28214ea934f 100644
--- a/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
diff --git a/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl
index 8e907d85ffac..8e907d85ffac 100644
--- a/lib/test-driver/log2html.xsl
+++ b/nixos/lib/test-driver/log2html.xsl
diff --git a/lib/test-driver/logfile.css b/nixos/lib/test-driver/logfile.css
index a54d8504a867..a54d8504a867 100644
--- a/lib/test-driver/logfile.css
+++ b/nixos/lib/test-driver/logfile.css
diff --git a/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
index c6a707cdf6b9..c6a707cdf6b9 100644
--- a/lib/test-driver/test-driver.pl
+++ b/nixos/lib/test-driver/test-driver.pl
diff --git a/lib/test-driver/treebits.js b/nixos/lib/test-driver/treebits.js
index 9754093dfd07..9754093dfd07 100644
--- a/lib/test-driver/treebits.js
+++ b/nixos/lib/test-driver/treebits.js
diff --git a/lib/testing.nix b/nixos/lib/testing.nix
index 7be0903ed3a8..7be0903ed3a8 100644
--- a/lib/testing.nix
+++ b/nixos/lib/testing.nix
diff --git a/lib/utils.nix b/nixos/lib/utils.nix
index 35c56e8c32bb..35c56e8c32bb 100644
--- a/lib/utils.nix
+++ b/nixos/lib/utils.nix
diff --git a/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 7413b9e18cec..7413b9e18cec 100644
--- a/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
index 93971ac9504d..93971ac9504d 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
diff --git a/maintainers/scripts/ec2/create-s3-amis.sh b/nixos/maintainers/scripts/ec2/create-s3-amis.sh
index 1aaac2832394..1aaac2832394 100755
--- a/maintainers/scripts/ec2/create-s3-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-s3-amis.sh
diff --git a/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix
index 43dbd86f6754..43dbd86f6754 100644
--- a/maintainers/scripts/ec2/ebs-creator.nix
+++ b/nixos/maintainers/scripts/ec2/ebs-creator.nix
diff --git a/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix
index 7de95200cfa9..7de95200cfa9 100644
--- a/modules/config/fonts/corefonts.nix
+++ b/nixos/modules/config/fonts/corefonts.nix
diff --git a/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 6e0fdaf4b748..6e0fdaf4b748 100644
--- a/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
diff --git a/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index a4f69809b2a4..a4f69809b2a4 100644
--- a/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
diff --git a/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index f43784f6d03e..f43784f6d03e 100644
--- a/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
diff --git a/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix
index 9ef00396808c..9ef00396808c 100644
--- a/modules/config/fonts/ghostscript.nix
+++ b/nixos/modules/config/fonts/ghostscript.nix
diff --git a/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index 1a69083a2069..1a69083a2069 100644
--- a/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
diff --git a/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index c3e39717258b..c3e39717258b 100644
--- a/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
diff --git a/modules/config/krb5.nix b/nixos/modules/config/krb5.nix
index 3323046ac5b4..3323046ac5b4 100644
--- a/modules/config/krb5.nix
+++ b/nixos/modules/config/krb5.nix
diff --git a/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index 113f5d8bcbde..113f5d8bcbde 100644
--- a/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
diff --git a/modules/config/networking.nix b/nixos/modules/config/networking.nix
index f1bdfd01b24e..f1bdfd01b24e 100644
--- a/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
diff --git a/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 77890b49c679..77890b49c679 100644
--- a/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
diff --git a/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index ad62b5597be8..ad62b5597be8 100644
--- a/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
diff --git a/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index fec2c886818a..fec2c886818a 100644
--- a/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
diff --git a/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 26060f5b2d10..26060f5b2d10 100644
--- a/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
diff --git a/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 4f7447f435bc..4f7447f435bc 100644
--- a/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
diff --git a/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 7d4654ae2877..7d4654ae2877 100644
--- a/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
diff --git a/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 6b52fd38fdec..6b52fd38fdec 100644
--- a/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
diff --git a/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index e65be03afaca..e65be03afaca 100644
--- a/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
diff --git a/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index e185584846a7..e185584846a7 100644
--- a/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
diff --git a/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix
index 0f6084690589..0f6084690589 100644
--- a/modules/config/unix-odbc-drivers.nix
+++ b/nixos/modules/config/unix-odbc-drivers.nix
diff --git a/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 5f32dc350dfc..5f32dc350dfc 100644
--- a/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
diff --git a/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 16b6a862593a..16b6a862593a 100644
--- a/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
diff --git a/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix
index 5720a63834f5..5720a63834f5 100644
--- a/modules/hardware/cpu/amd-microcode.nix
+++ b/nixos/modules/hardware/cpu/amd-microcode.nix
diff --git a/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix
index 9046ddf83bbf..9046ddf83bbf 100644
--- a/modules/hardware/cpu/intel-microcode.nix
+++ b/nixos/modules/hardware/cpu/intel-microcode.nix
diff --git a/modules/hardware/network/b43.nix b/nixos/modules/hardware/network/b43.nix
index 8f45bd4d3f1a..8f45bd4d3f1a 100644
--- a/modules/hardware/network/b43.nix
+++ b/nixos/modules/hardware/network/b43.nix
diff --git a/modules/hardware/network/broadcom-43xx.nix b/nixos/modules/hardware/network/broadcom-43xx.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/network/broadcom-43xx.nix
+++ b/nixos/modules/hardware/network/broadcom-43xx.nix
diff --git a/modules/hardware/network/intel-2030.nix b/nixos/modules/hardware/network/intel-2030.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-2030.nix
+++ b/nixos/modules/hardware/network/intel-2030.nix
diff --git a/modules/hardware/network/intel-2100bg.nix b/nixos/modules/hardware/network/intel-2100bg.nix
index 1e0033eb414a..1e0033eb414a 100644
--- a/modules/hardware/network/intel-2100bg.nix
+++ b/nixos/modules/hardware/network/intel-2100bg.nix
diff --git a/modules/hardware/network/intel-2200bg.nix b/nixos/modules/hardware/network/intel-2200bg.nix
index ae5b69b7981d..ae5b69b7981d 100644
--- a/modules/hardware/network/intel-2200bg.nix
+++ b/nixos/modules/hardware/network/intel-2200bg.nix
diff --git a/modules/hardware/network/intel-3945abg.nix b/nixos/modules/hardware/network/intel-3945abg.nix
index 80baf260ab9a..80baf260ab9a 100644
--- a/modules/hardware/network/intel-3945abg.nix
+++ b/nixos/modules/hardware/network/intel-3945abg.nix
diff --git a/modules/hardware/network/intel-4965agn.nix b/nixos/modules/hardware/network/intel-4965agn.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-4965agn.nix
+++ b/nixos/modules/hardware/network/intel-4965agn.nix
diff --git a/modules/hardware/network/intel-5000.nix b/nixos/modules/hardware/network/intel-5000.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-5000.nix
+++ b/nixos/modules/hardware/network/intel-5000.nix
diff --git a/modules/hardware/network/intel-5150.nix b/nixos/modules/hardware/network/intel-5150.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-5150.nix
+++ b/nixos/modules/hardware/network/intel-5150.nix
diff --git a/modules/hardware/network/intel-6000.nix b/nixos/modules/hardware/network/intel-6000.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-6000.nix
+++ b/nixos/modules/hardware/network/intel-6000.nix
diff --git a/modules/hardware/network/intel-6000g2a.nix b/nixos/modules/hardware/network/intel-6000g2a.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-6000g2a.nix
+++ b/nixos/modules/hardware/network/intel-6000g2a.nix
diff --git a/modules/hardware/network/intel-6000g2b.nix b/nixos/modules/hardware/network/intel-6000g2b.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-6000g2b.nix
+++ b/nixos/modules/hardware/network/intel-6000g2b.nix
diff --git a/modules/hardware/network/ralink.nix b/nixos/modules/hardware/network/ralink.nix
index 92f34d8643bc..92f34d8643bc 100644
--- a/modules/hardware/network/ralink.nix
+++ b/nixos/modules/hardware/network/ralink.nix
diff --git a/modules/hardware/network/rtl8192c.nix b/nixos/modules/hardware/network/rtl8192c.nix
index 3aefb7bdd608..3aefb7bdd608 100644
--- a/modules/hardware/network/rtl8192c.nix
+++ b/nixos/modules/hardware/network/rtl8192c.nix
diff --git a/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix
index 318131be7493..318131be7493 100644
--- a/modules/hardware/network/smc-2632w/default.nix
+++ b/nixos/modules/hardware/network/smc-2632w/default.nix
diff --git a/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis b/nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
index 5f13088c3735..5f13088c3735 100644
--- a/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
+++ b/nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
diff --git a/modules/hardware/network/zydas-zd1211.nix b/nixos/modules/hardware/network/zydas-zd1211.nix
index c8428a7241b1..c8428a7241b1 100644
--- a/modules/hardware/network/zydas-zd1211.nix
+++ b/nixos/modules/hardware/network/zydas-zd1211.nix
diff --git a/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix
index 0dba59734ca7..0dba59734ca7 100644
--- a/modules/hardware/pcmcia.nix
+++ b/nixos/modules/hardware/pcmcia.nix
diff --git a/modules/hardware/video/encoder/wis-go7007.nix b/nixos/modules/hardware/video/encoder/wis-go7007.nix
index c0eb2b814b33..c0eb2b814b33 100644
--- a/modules/hardware/video/encoder/wis-go7007.nix
+++ b/nixos/modules/hardware/video/encoder/wis-go7007.nix
diff --git a/modules/hardware/video/radeon.nix b/nixos/modules/hardware/video/radeon.nix
index 8fecdae36bf2..8fecdae36bf2 100644
--- a/modules/hardware/video/radeon.nix
+++ b/nixos/modules/hardware/video/radeon.nix
diff --git a/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 8126ce46dd92..8126ce46dd92 100644
--- a/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 999871ab074f..999871ab074f 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/nixos/modules/installer/cd-dvd/installation-cd-efi.nix
index 4aa788feeae5..4aa788feeae5 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-efi.nix
diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
index debf3e7db906..debf3e7db906 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
index 38d02ffd1625..38d02ffd1625 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index a7498906a86b..a7498906a86b 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix
index 93bcbf00b258..93bcbf00b258 100644
--- a/modules/installer/cd-dvd/installation-cd-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix
diff --git a/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index de9728d677c5..de9728d677c5 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/nixos/modules/installer/cd-dvd/live-dvd.nix
index e57be6d442e5..e57be6d442e5 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/nixos/modules/installer/cd-dvd/live-dvd.nix
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 85356118ce67..85356118ce67 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
diff --git a/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
index 8f0a8d355c6e..8f0a8d355c6e 100644
--- a/modules/installer/cd-dvd/system-tarball-pc-readme.txt
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index 7619f074b746..7619f074b746 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 20fe4de2cd84..20fe4de2cd84 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index 6bf8eebdac59..6bf8eebdac59 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
diff --git a/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix
index 09d04608e685..09d04608e685 100644
--- a/modules/installer/scan/detected.nix
+++ b/nixos/modules/installer/scan/detected.nix
diff --git a/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix
index 814858fdffda..814858fdffda 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/nixos/modules/installer/scan/not-detected.nix
diff --git a/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-version-suffix
index 76cec8d5dae3..76cec8d5dae3 100644
--- a/modules/installer/tools/get-version-suffix
+++ b/nixos/modules/installer/tools/get-version-suffix
diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
index 5e77b701ff5a..5e77b701ff5a 100644
--- a/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 0a6e8b920a11..0a6e8b920a11 100644
--- a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
diff --git a/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix
index 1a734ca5eeb7..1a734ca5eeb7 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/nixos/modules/installer/tools/nixos-checkout.nix
diff --git a/modules/installer/tools/nixos-gen-seccure-keys.sh b/nixos/modules/installer/tools/nixos-gen-seccure-keys.sh
index a97eef672f7e..a97eef672f7e 100644
--- a/modules/installer/tools/nixos-gen-seccure-keys.sh
+++ b/nixos/modules/installer/tools/nixos-gen-seccure-keys.sh
diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/nixos/modules/installer/tools/nixos-hardware-scan.pl
index 3204f3d40512..3204f3d40512 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/nixos/modules/installer/tools/nixos-hardware-scan.pl
diff --git a/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index a4ac5b68dd7f..a4ac5b68dd7f 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
diff --git a/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 7f008d62c249..7f008d62c249 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
diff --git a/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 8734cb273d49..8734cb273d49 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
diff --git a/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh
index 5dbf277fe4c4..5dbf277fe4c4 100644
--- a/modules/installer/tools/nixos-version.sh
+++ b/nixos/modules/installer/tools/nixos-version.sh
diff --git a/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index c761d74a8902..c761d74a8902 100644
--- a/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
diff --git a/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 76cc29a1facd..76cc29a1facd 100644
--- a/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
diff --git a/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
index 9cd58550adc9..9cd58550adc9 100644
--- a/modules/misc/assertions.nix
+++ b/nixos/modules/misc/assertions.nix
diff --git a/modules/misc/check-config.nix b/nixos/modules/misc/check-config.nix
index 28f36ad9ae55..28f36ad9ae55 100644
--- a/modules/misc/check-config.nix
+++ b/nixos/modules/misc/check-config.nix
diff --git a/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index 6e6bc9dec0f3..6e6bc9dec0f3 100644
--- a/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
diff --git a/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index adaa2b0d9aee..adaa2b0d9aee 100644
--- a/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
diff --git a/modules/misc/lib.nix b/nixos/modules/misc/lib.nix
index 18fc68a69883..18fc68a69883 100644
--- a/modules/misc/lib.nix
+++ b/nixos/modules/misc/lib.nix
diff --git a/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 02b1ed7b63d6..02b1ed7b63d6 100644
--- a/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
diff --git a/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 0df0e57c98e9..0df0e57c98e9 100644
--- a/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
diff --git a/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix
index f68adc5e8430..f68adc5e8430 100644
--- a/modules/misc/passthru.nix
+++ b/nixos/modules/misc/passthru.nix
diff --git a/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 20a03b44a2ad..20a03b44a2ad 100644
--- a/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
diff --git a/modules/module-list.nix b/nixos/modules/module-list.nix
index c186968f0590..c186968f0590 100644
--- a/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
diff --git a/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 511c118e2bf5..511c118e2bf5 100644
--- a/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
diff --git a/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 20b808c29e08..20b808c29e08 100644
--- a/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
diff --git a/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index d7190020e7e2..d7190020e7e2 100644
--- a/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
diff --git a/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index 396dcf6c5d3b..396dcf6c5d3b 100644
--- a/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
diff --git a/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 75ac5e41f83e..75ac5e41f83e 100644
--- a/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
diff --git a/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix
index 541c46ca50c2..541c46ca50c2 100644
--- a/modules/profiles/headless.nix
+++ b/nixos/modules/profiles/headless.nix
diff --git a/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 3b058c6e9715..3b058c6e9715 100644
--- a/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
diff --git a/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 821b9f93465a..821b9f93465a 100644
--- a/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
diff --git a/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index c8e6fd4aa768..c8e6fd4aa768 100644
--- a/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
diff --git a/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index 7fdaab9d67df..7fdaab9d67df 100644
--- a/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
diff --git a/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 8cfe3f990adc..8cfe3f990adc 100644
--- a/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
diff --git a/modules/programs/bash/command-not-found.nix b/nixos/modules/programs/bash/command-not-found.nix
index 502320446a37..502320446a37 100644
--- a/modules/programs/bash/command-not-found.nix
+++ b/nixos/modules/programs/bash/command-not-found.nix
diff --git a/modules/programs/bash/command-not-found.pl b/nixos/modules/programs/bash/command-not-found.pl
index 916649059d37..916649059d37 100644
--- a/modules/programs/bash/command-not-found.pl
+++ b/nixos/modules/programs/bash/command-not-found.pl
diff --git a/modules/programs/bash/inputrc b/nixos/modules/programs/bash/inputrc
index e4eabc052c5f..e4eabc052c5f 100644
--- a/modules/programs/bash/inputrc
+++ b/nixos/modules/programs/bash/inputrc
diff --git a/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix
index e1e31b4a56aa..e1e31b4a56aa 100644
--- a/modules/programs/blcr.nix
+++ b/nixos/modules/programs/blcr.nix
diff --git a/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index f42df3514221..f42df3514221 100644
--- a/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
diff --git a/modules/programs/info.nix b/nixos/modules/programs/info.nix
index 30c25cf34206..30c25cf34206 100644
--- a/modules/programs/info.nix
+++ b/nixos/modules/programs/info.nix
diff --git a/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 695c0b6620f7..695c0b6620f7 100644
--- a/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
diff --git a/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 679c4979dfa9..679c4979dfa9 100644
--- a/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
diff --git a/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 5ec32376b60e..5ec32376b60e 100644
--- a/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
diff --git a/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index 904989d57a09..904989d57a09 100644
--- a/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
diff --git a/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 2b3bfbc6c188..2b3bfbc6c188 100644
--- a/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
diff --git a/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
index 340fec0496ae..340fec0496ae 100644
--- a/modules/programs/virtualbox.nix
+++ b/nixos/modules/programs/virtualbox.nix
diff --git a/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix
index da3f7dce98a1..da3f7dce98a1 100644
--- a/modules/programs/wvdial.nix
+++ b/nixos/modules/programs/wvdial.nix
diff --git a/modules/programs/zsh/zinputrc b/nixos/modules/programs/zsh/zinputrc
index 6121f3e21f16..6121f3e21f16 100644
--- a/modules/programs/zsh/zinputrc
+++ b/nixos/modules/programs/zsh/zinputrc
diff --git a/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index cff751934d7d..cff751934d7d 100644
--- a/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
diff --git a/modules/rename.nix b/nixos/modules/rename.nix
index 631283ce219c..631283ce219c 100644
--- a/modules/rename.nix
+++ b/nixos/modules/rename.nix
diff --git a/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index bc661164fdc2..bc661164fdc2 100644
--- a/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
diff --git a/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index d4aa0598dd3d..d4aa0598dd3d 100644
--- a/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
diff --git a/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 2e93fb36b450..2e93fb36b450 100644
--- a/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
diff --git a/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 3ef01ea2c179..3ef01ea2c179 100644
--- a/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
diff --git a/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 1c2a6a05f261..1c2a6a05f261 100644
--- a/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
diff --git a/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index b9b32496a368..b9b32496a368 100644
--- a/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
diff --git a/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index dd251fe69d31..dd251fe69d31 100644
--- a/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
diff --git a/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
index e47e7baa2b84..e47e7baa2b84 100644
--- a/modules/security/rtkit.nix
+++ b/nixos/modules/security/rtkit.nix
diff --git a/modules/security/setuid-wrapper.c b/nixos/modules/security/setuid-wrapper.c
index 007ffbc34fe9..007ffbc34fe9 100644
--- a/modules/security/setuid-wrapper.c
+++ b/nixos/modules/security/setuid-wrapper.c
diff --git a/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index e75679e5ff69..e75679e5ff69 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
diff --git a/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index cd548f4a4fe0..cd548f4a4fe0 100644
--- a/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
diff --git a/modules/services/amqp/activemq/ActiveMQBroker.java b/nixos/modules/services/amqp/activemq/ActiveMQBroker.java
index c0f5d16ea11a..c0f5d16ea11a 100644
--- a/modules/services/amqp/activemq/ActiveMQBroker.java
+++ b/nixos/modules/services/amqp/activemq/ActiveMQBroker.java
diff --git a/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 915d179e6999..915d179e6999 100644
--- a/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
diff --git a/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 696b5ad43797..696b5ad43797 100644
--- a/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
diff --git a/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 6c53ef46ab91..6c53ef46ab91 100644
--- a/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
diff --git a/modules/services/audio/fuppes.nix b/nixos/modules/services/audio/fuppes.nix
index df73e62fc942..df73e62fc942 100644
--- a/modules/services/audio/fuppes.nix
+++ b/nixos/modules/services/audio/fuppes.nix
diff --git a/modules/services/audio/fuppes/vfolder.cfg b/nixos/modules/services/audio/fuppes/vfolder.cfg
index 35ec3bffeb0a..35ec3bffeb0a 100644
--- a/modules/services/audio/fuppes/vfolder.cfg
+++ b/nixos/modules/services/audio/fuppes/vfolder.cfg
diff --git a/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index a9880dee20c4..a9880dee20c4 100644
--- a/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
diff --git a/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix
index d5bc932c6b96..d5bc932c6b96 100644
--- a/modules/services/backup/almir.nix
+++ b/nixos/modules/services/backup/almir.nix
diff --git a/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 272903c99e33..272903c99e33 100644
--- a/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
diff --git a/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index 3ff9978fbb96..3ff9978fbb96 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
diff --git a/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index e68ad794a96b..e68ad794a96b 100644
--- a/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
diff --git a/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index 178ba3ec7207..178ba3ec7207 100644
--- a/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
diff --git a/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
index 5c7f7ffae5b3..5c7f7ffae5b3 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/nixos/modules/services/backup/sitecopy-backup.nix
diff --git a/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index 7b03b4d8f1dc..7b03b4d8f1dc 100644
--- a/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
diff --git a/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index 14990e92ea30..14990e92ea30 100644
--- a/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
diff --git a/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
index aca0d58900b1..aca0d58900b1 100644
--- a/modules/services/databases/firebird.nix
+++ b/nixos/modules/services/databases/firebird.nix
diff --git a/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index a0e264f22990..a0e264f22990 100644
--- a/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
diff --git a/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index d62994158939..d62994158939 100644
--- a/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
diff --git a/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 663c2cc4505a..663c2cc4505a 100644
--- a/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
diff --git a/modules/services/databases/mysql55.nix b/nixos/modules/services/databases/mysql55.nix
index 46148d68f4c6..46148d68f4c6 100644
--- a/modules/services/databases/mysql55.nix
+++ b/nixos/modules/services/databases/mysql55.nix
diff --git a/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index a4dd30be1fb7..a4dd30be1fb7 100644
--- a/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
diff --git a/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index fc6b5b167b88..fc6b5b167b88 100644
--- a/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
diff --git a/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 5bc58c73bd61..5bc58c73bd61 100644
--- a/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
diff --git a/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix
index 6a29fc132114..6a29fc132114 100644
--- a/modules/services/databases/virtuoso.nix
+++ b/nixos/modules/services/databases/virtuoso.nix
diff --git a/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix
index 815118be1c63..815118be1c63 100644
--- a/modules/services/games/ghost-one.nix
+++ b/nixos/modules/services/games/ghost-one.nix
diff --git a/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index 6a595f8306bc..6a595f8306bc 100644
--- a/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
diff --git a/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index 6bc0ad0bf774..6bc0ad0bf774 100644
--- a/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
diff --git a/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix
index 4c0ce794d4f7..4c0ce794d4f7 100644
--- a/modules/services/hardware/nvidia-optimus.nix
+++ b/nixos/modules/services/hardware/nvidia-optimus.nix
diff --git a/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix
index 9f389efc06d4..9f389efc06d4 100644
--- a/modules/services/hardware/pcscd.nix
+++ b/nixos/modules/services/hardware/pcscd.nix
diff --git a/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix
index 32599554fc12..32599554fc12 100644
--- a/modules/services/hardware/pommed.nix
+++ b/nixos/modules/services/hardware/pommed.nix
diff --git a/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 905445f22c1b..905445f22c1b 100644
--- a/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
diff --git a/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index b39c9cb1d9bb..b39c9cb1d9bb 100644
--- a/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
diff --git a/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 37dba8ce71dc..37dba8ce71dc 100644
--- a/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
diff --git a/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix
index 1ba17c589d23..1ba17c589d23 100644
--- a/modules/services/hardware/udisks.nix
+++ b/nixos/modules/services/hardware/udisks.nix
diff --git a/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index eae4172ccb3e..eae4172ccb3e 100644
--- a/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
diff --git a/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 5d1658adb75f..5d1658adb75f 100644
--- a/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
diff --git a/modules/services/logging/klogd.nix b/nixos/modules/services/logging/klogd.nix
index d7d0bbf89a54..d7d0bbf89a54 100644
--- a/modules/services/logging/klogd.nix
+++ b/nixos/modules/services/logging/klogd.nix
diff --git a/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 23f21b6a754d..23f21b6a754d 100644
--- a/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
diff --git a/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix
index c6c0d2ea2382..c6c0d2ea2382 100644
--- a/modules/services/logging/logrotate.nix
+++ b/nixos/modules/services/logging/logrotate.nix
diff --git a/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 2f0eea505267..2f0eea505267 100644
--- a/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
diff --git a/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix
index 680c7a912c1f..680c7a912c1f 100644
--- a/modules/services/logging/rsyslogd.nix
+++ b/nixos/modules/services/logging/rsyslogd.nix
diff --git a/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix
index 24cd5c1567e7..24cd5c1567e7 100644
--- a/modules/services/logging/syslogd.nix
+++ b/nixos/modules/services/logging/syslogd.nix
diff --git a/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 5f8e8e1ade3b..5f8e8e1ade3b 100644
--- a/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
diff --git a/modules/services/mail/freepops.nix b/nixos/modules/services/mail/freepops.nix
index 8f6e93826076..8f6e93826076 100644
--- a/modules/services/mail/freepops.nix
+++ b/nixos/modules/services/mail/freepops.nix
diff --git a/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix
index bad0b22625dc..bad0b22625dc 100644
--- a/modules/services/mail/mail.nix
+++ b/nixos/modules/services/mail/mail.nix
diff --git a/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 2732fd602004..2732fd602004 100644
--- a/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
diff --git a/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 2633289b46d5..2633289b46d5 100644
--- a/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
diff --git a/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index aaf1dfcc210c..aaf1dfcc210c 100644
--- a/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
diff --git a/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index 50491c556e8a..50491c556e8a 100644
--- a/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
diff --git a/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index 890d7a4020bc..890d7a4020bc 100644
--- a/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
diff --git a/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 6419e6f8fc7b..6419e6f8fc7b 100644
--- a/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
diff --git a/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix
index 2da50fc85957..2da50fc85957 100644
--- a/modules/services/misc/felix.nix
+++ b/nixos/modules/services/misc/felix.nix
diff --git a/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
index 9f4c4645279f..9f4c4645279f 100644
--- a/modules/services/misc/folding-at-home.nix
+++ b/nixos/modules/services/misc/folding-at-home.nix
diff --git a/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix
index bc1d1f4575a8..bc1d1f4575a8 100644
--- a/modules/services/misc/gpsd.nix
+++ b/nixos/modules/services/misc/gpsd.nix
diff --git a/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index adf4f145f25d..adf4f145f25d 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
diff --git a/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index dfdc4db65d54..dfdc4db65d54 100644
--- a/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
diff --git a/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 38f1917a46ad..38f1917a46ad 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
diff --git a/modules/services/misc/rogue.nix b/nixos/modules/services/misc/rogue.nix
index 94fa88507504..94fa88507504 100644
--- a/modules/services/misc/rogue.nix
+++ b/nixos/modules/services/misc/rogue.nix
diff --git a/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
index b0806d14738b..b0806d14738b 100644
--- a/modules/services/misc/svnserve.nix
+++ b/nixos/modules/services/misc/svnserve.nix
diff --git a/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix
index 91c0acb0bc2c..91c0acb0bc2c 100644
--- a/modules/services/misc/synergy.nix
+++ b/nixos/modules/services/misc/synergy.nix
diff --git a/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 114bad5c947e..114bad5c947e 100644
--- a/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
diff --git a/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index ef658523c1f3..ef658523c1f3 100644
--- a/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
diff --git a/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index ec36db7b21c3..ec36db7b21c3 100644
--- a/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
diff --git a/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index 2acc51c64a6a..2acc51c64a6a 100644
--- a/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
diff --git a/modules/services/monitoring/nagios/commands.cfg b/nixos/modules/services/monitoring/nagios/commands.cfg
index 6efdefcd37dc..6efdefcd37dc 100644
--- a/modules/services/monitoring/nagios/commands.cfg
+++ b/nixos/modules/services/monitoring/nagios/commands.cfg
diff --git a/modules/services/monitoring/nagios/default.nix b/nixos/modules/services/monitoring/nagios/default.nix
index c809a3b84573..c809a3b84573 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/nixos/modules/services/monitoring/nagios/default.nix
diff --git a/modules/services/monitoring/nagios/host-templates.cfg b/nixos/modules/services/monitoring/nagios/host-templates.cfg
index 3a4c269e2572..3a4c269e2572 100644
--- a/modules/services/monitoring/nagios/host-templates.cfg
+++ b/nixos/modules/services/monitoring/nagios/host-templates.cfg
diff --git a/modules/services/monitoring/nagios/service-templates.cfg b/nixos/modules/services/monitoring/nagios/service-templates.cfg
index e729ea77675d..e729ea77675d 100644
--- a/modules/services/monitoring/nagios/service-templates.cfg
+++ b/nixos/modules/services/monitoring/nagios/service-templates.cfg
diff --git a/modules/services/monitoring/nagios/timeperiods.cfg b/nixos/modules/services/monitoring/nagios/timeperiods.cfg
index 2669be54d3db..2669be54d3db 100644
--- a/modules/services/monitoring/nagios/timeperiods.cfg
+++ b/nixos/modules/services/monitoring/nagios/timeperiods.cfg
diff --git a/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index de07dc0dbaa6..de07dc0dbaa6 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
diff --git a/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index a32666056714..a32666056714 100644
--- a/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
diff --git a/modules/services/monitoring/systemhealth.nix b/nixos/modules/services/monitoring/systemhealth.nix
index 0a3e666ad4e7..0a3e666ad4e7 100644
--- a/modules/services/monitoring/systemhealth.nix
+++ b/nixos/modules/services/monitoring/systemhealth.nix
diff --git a/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index a7b72e53f0a4..a7b72e53f0a4 100644
--- a/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
diff --git a/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index fa3de7d90bc6..fa3de7d90bc6 100644
--- a/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
diff --git a/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
index 229236c1bbd4..229236c1bbd4 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
diff --git a/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index 6735b4ca3279..6735b4ca3279 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
diff --git a/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix
index 1a00ccab0a61..1a00ccab0a61 100644
--- a/modules/services/network-filesystems/drbd.nix
+++ b/nixos/modules/services/network-filesystems/drbd.nix
diff --git a/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 4daa5e9d0639..4daa5e9d0639 100644
--- a/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index 4a888b64bd34..4a888b64bd34 100644
--- a/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
diff --git a/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 70a14487ea59..70a14487ea59 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
diff --git a/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
index 8652d0daf4c8..8652d0daf4c8 100644
--- a/modules/services/networking/amuled.nix
+++ b/nixos/modules/services/networking/amuled.nix
diff --git a/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 3603d677837f..3603d677837f 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
diff --git a/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 765dc014dcb7..765dc014dcb7 100644
--- a/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
diff --git a/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 82e875f5aae0..82e875f5aae0 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
diff --git a/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index 5e9818858e0c..5e9818858e0c 100644
--- a/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
diff --git a/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix
index bfe7209b991f..bfe7209b991f 100644
--- a/modules/services/networking/cntlm.nix
+++ b/nixos/modules/services/networking/cntlm.nix
diff --git a/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 62709a040a1f..62709a040a1f 100644
--- a/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
diff --git a/modules/services/networking/dhclient.nix b/nixos/modules/services/networking/dhclient.nix
index 1e3434438997..1e3434438997 100644
--- a/modules/services/networking/dhclient.nix
+++ b/nixos/modules/services/networking/dhclient.nix
diff --git a/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 48803511a5ea..48803511a5ea 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
diff --git a/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 43e0843cb971..43e0843cb971 100644
--- a/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
diff --git a/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index b726493d421f..b726493d421f 100644
--- a/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
diff --git a/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 6d233e543e23..6d233e543e23 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
diff --git a/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index b24ac2d70325..b24ac2d70325 100644
--- a/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
diff --git a/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix
index f5bc550ab5f8..f5bc550ab5f8 100644
--- a/modules/services/networking/flashpolicyd.nix
+++ b/nixos/modules/services/networking/flashpolicyd.nix
diff --git a/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix
index a4bd2098986d..a4bd2098986d 100644
--- a/modules/services/networking/freenet.nix
+++ b/nixos/modules/services/networking/freenet.nix
diff --git a/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
index a7c7c206198f..a7c7c206198f 100644
--- a/modules/services/networking/git-daemon.nix
+++ b/nixos/modules/services/networking/git-daemon.nix
diff --git a/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix
index 421c0d9bb697..421c0d9bb697 100644
--- a/modules/services/networking/gnunet.nix
+++ b/nixos/modules/services/networking/gnunet.nix
diff --git a/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix
index 07c35e3cb3d6..07c35e3cb3d6 100644
--- a/modules/services/networking/gogoclient.nix
+++ b/nixos/modules/services/networking/gogoclient.nix
diff --git a/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix
index 594a2e80f345..594a2e80f345 100644
--- a/modules/services/networking/gvpe.nix
+++ b/nixos/modules/services/networking/gvpe.nix
diff --git a/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 4edea12b6be8..4edea12b6be8 100644
--- a/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
diff --git a/modules/services/networking/ifplugd.nix b/nixos/modules/services/networking/ifplugd.nix
index df50e9807a90..df50e9807a90 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/nixos/modules/services/networking/ifplugd.nix
diff --git a/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix
index 1b3473ee0ee1..1b3473ee0ee1 100644
--- a/modules/services/networking/iodined.nix
+++ b/nixos/modules/services/networking/iodined.nix
diff --git a/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh
index b8cb836db95e..b8cb836db95e 100644
--- a/modules/services/networking/ircd-hybrid/builder.sh
+++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh
diff --git a/modules/services/networking/ircd-hybrid/control.in b/nixos/modules/services/networking/ircd-hybrid/control.in
index 312dfaada329..312dfaada329 100644
--- a/modules/services/networking/ircd-hybrid/control.in
+++ b/nixos/modules/services/networking/ircd-hybrid/control.in
diff --git a/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index cd82a41ef7af..cd82a41ef7af 100644
--- a/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
diff --git a/modules/services/networking/ircd-hybrid/ircd.conf b/nixos/modules/services/networking/ircd-hybrid/ircd.conf
index bb22832dbdb2..bb22832dbdb2 100644
--- a/modules/services/networking/ircd-hybrid/ircd.conf
+++ b/nixos/modules/services/networking/ircd-hybrid/ircd.conf
diff --git a/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index ea5bc8514f1c..ea5bc8514f1c 100644
--- a/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
diff --git a/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 9d62a764f060..9d62a764f060 100644
--- a/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
diff --git a/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 1d5682f5f3fb..1d5682f5f3fb 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
diff --git a/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index e5e164021d3a..e5e164021d3a 100644
--- a/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
diff --git a/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix
index a2a555a8ad1b..a2a555a8ad1b 100644
--- a/modules/services/networking/oidentd.nix
+++ b/nixos/modules/services/networking/oidentd.nix
diff --git a/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix
index d5c18c0675cf..d5c18c0675cf 100644
--- a/modules/services/networking/openfire.nix
+++ b/nixos/modules/services/networking/openfire.nix
diff --git a/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 1e862591406d..1e862591406d 100644
--- a/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
diff --git a/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index fb541bf101ae..fb541bf101ae 100644
--- a/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
diff --git a/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index 89c40c531579..89c40c531579 100644
--- a/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
diff --git a/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index f3a4e457ec84..f3a4e457ec84 100644
--- a/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
diff --git a/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix
index 8d586ce6e46b..8d586ce6e46b 100644
--- a/modules/services/networking/radvd.nix
+++ b/nixos/modules/services/networking/radvd.nix
diff --git a/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix
index f797206ad5c7..f797206ad5c7 100644
--- a/modules/services/networking/rdnssd.nix
+++ b/nixos/modules/services/networking/rdnssd.nix
diff --git a/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix
index 00c958c5a4a2..00c958c5a4a2 100644
--- a/modules/services/networking/rpcbind.nix
+++ b/nixos/modules/services/networking/rpcbind.nix
diff --git a/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix
index 8816ac0d2f83..8816ac0d2f83 100644
--- a/modules/services/networking/sabnzbd.nix
+++ b/nixos/modules/services/networking/sabnzbd.nix
diff --git a/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix
index d32fabbde24b..d32fabbde24b 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/nixos/modules/services/networking/ssh/lshd.nix
diff --git a/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index d57eef860d28..d57eef860d28 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
diff --git a/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index fa8b7556de5d..fa8b7556de5d 100644
--- a/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
diff --git a/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix
index 48cb884f2466..48cb884f2466 100644
--- a/modules/services/networking/tcpcrypt.nix
+++ b/nixos/modules/services/networking/tcpcrypt.nix
diff --git a/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix
index 37935496c597..37935496c597 100644
--- a/modules/services/networking/tftpd.nix
+++ b/nixos/modules/services/networking/tftpd.nix
diff --git a/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index fb75b4ed069a..fb75b4ed069a 100644
--- a/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
diff --git a/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 1b2432401def..1b2432401def 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
diff --git a/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix
index 1fc54986b16f..1fc54986b16f 100644
--- a/modules/services/networking/wakeonlan.nix
+++ b/nixos/modules/services/networking/wakeonlan.nix
diff --git a/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix
index 12042bbad6c9..12042bbad6c9 100644
--- a/modules/services/networking/websockify.nix
+++ b/nixos/modules/services/networking/websockify.nix
diff --git a/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix
index 8e0122732164..8e0122732164 100644
--- a/modules/services/networking/wicd.nix
+++ b/nixos/modules/services/networking/wicd.nix
diff --git a/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index dca398dd8be2..dca398dd8be2 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
diff --git a/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 626183b810f1..626183b810f1 100644
--- a/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
diff --git a/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index c9a4a9087e56..c9a4a9087e56 100644
--- a/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
diff --git a/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 88bec2cb2f3e..88bec2cb2f3e 100644
--- a/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
diff --git a/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index e14f03fb1e83..e14f03fb1e83 100644
--- a/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
diff --git a/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index 95ff918eb6d7..95ff918eb6d7 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
diff --git a/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 6dfabc7e3053..6dfabc7e3053 100644
--- a/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
diff --git a/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 5ccb4927fcb7..5ccb4927fcb7 100644
--- a/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
diff --git a/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 2b2a54ef4097..2b2a54ef4097 100644
--- a/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
diff --git a/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index 9f1fc4ed6d8b..9f1fc4ed6d8b 100644
--- a/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
diff --git a/modules/services/security/frandom.nix b/nixos/modules/services/security/frandom.nix
index 9aae7b33a430..9aae7b33a430 100644
--- a/modules/services/security/frandom.nix
+++ b/nixos/modules/services/security/frandom.nix
diff --git a/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 2dafb4595c63..2dafb4595c63 100644
--- a/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
diff --git a/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix
index 1c158906a911..1c158906a911 100644
--- a/modules/services/security/torify.nix
+++ b/nixos/modules/services/security/torify.nix
diff --git a/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix
index d6974282a6b5..d6974282a6b5 100644
--- a/modules/services/security/torsocks.nix
+++ b/nixos/modules/services/security/torsocks.nix
diff --git a/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index eab876be76d3..eab876be76d3 100644
--- a/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
diff --git a/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index 8fb5debd20e4..8fb5debd20e4 100644
--- a/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
diff --git a/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf
index 6d0dcacf9778..6d0dcacf9778 100644
--- a/modules/services/system/nscd.conf
+++ b/nixos/modules/services/system/nscd.conf
diff --git a/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index e8534b120435..e8534b120435 100644
--- a/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
diff --git a/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix
index 61eecd5c9ba8..61eecd5c9ba8 100644
--- a/modules/services/system/uptimed.nix
+++ b/nixos/modules/services/system/uptimed.nix
diff --git a/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index e0c212e5661f..e0c212e5661f 100644
--- a/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
diff --git a/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 063332d48628..063332d48628 100644
--- a/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
diff --git a/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 850f558e4cb7..850f558e4cb7 100644
--- a/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
diff --git a/modules/services/ttys/gpm.nix b/nixos/modules/services/ttys/gpm.nix
index 6a425cf327f4..6a425cf327f4 100644
--- a/modules/services/ttys/gpm.nix
+++ b/nixos/modules/services/ttys/gpm.nix
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index e2cfc5cdb265..e2cfc5cdb265 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index dcc05b03891b..dcc05b03891b 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
index 755b595c783d..755b595c783d 100644
--- a/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index a5227bae2d40..a5227bae2d40 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
diff --git a/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
index f12ae842b587..f12ae842b587 100644
--- a/modules/services/web-servers/apache-httpd/tomcat-connector.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index dc82fd34f2fa..dc82fd34f2fa 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
index a6e6042fdf6d..a6e6042fdf6d 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
diff --git a/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh
index 2eb89a90f67d..2eb89a90f67d 100644
--- a/modules/services/web-servers/jboss/builder.sh
+++ b/nixos/modules/services/web-servers/jboss/builder.sh
diff --git a/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index e1bcede6563c..e1bcede6563c 100644
--- a/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
diff --git a/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix
index 62264f1db452..62264f1db452 100644
--- a/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix
diff --git a/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index f9e40fc4b541..f9e40fc4b541 100644
--- a/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
diff --git a/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
index d759d8144b64..d759d8144b64 100644
--- a/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
diff --git a/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index b26af1aa7445..b26af1aa7445 100644
--- a/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
diff --git a/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index a68828de5d8e..a68828de5d8e 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
diff --git a/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 7e327120c3d1..7e327120c3d1 100644
--- a/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
diff --git a/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index 19afa55d7fef..19afa55d7fef 100644
--- a/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
diff --git a/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 0fea74d5ba73..0fea74d5ba73 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
diff --git a/modules/services/x11/desktop-managers/e17.nix b/nixos/modules/services/x11/desktop-managers/e17.nix
index 3d91617c62aa..3d91617c62aa 100644
--- a/modules/services/x11/desktop-managers/e17.nix
+++ b/nixos/modules/services/x11/desktop-managers/e17.nix
diff --git a/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index b0212446ad36..b0212446ad36 100644
--- a/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index c76acfbcd4e2..c76acfbcd4e2 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
diff --git a/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix
index af7a376ae029..af7a376ae029 100644
--- a/modules/services/x11/desktop-managers/none.nix
+++ b/nixos/modules/services/x11/desktop-managers/none.nix
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index f5d544ad0462..f5d544ad0462 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
diff --git a/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index edc61c103ea9..edc61c103ea9 100644
--- a/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
diff --git a/modules/services/x11/display-managers/auto.nix b/nixos/modules/services/x11/display-managers/auto.nix
index 33d97e0e07a9..33d97e0e07a9 100644
--- a/modules/services/x11/display-managers/auto.nix
+++ b/nixos/modules/services/x11/display-managers/auto.nix
diff --git a/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index c7599e245b05..c7599e245b05 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
diff --git a/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index 229ab12c6e1b..229ab12c6e1b 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
diff --git a/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index c2b90d239eaa..c2b90d239eaa 100644
--- a/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
diff --git a/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 9e8b9391f45f..9e8b9391f45f 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
diff --git a/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix
index 4f9048bfd910..4f9048bfd910 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/nixos/modules/services/x11/hardware/multitouch.nix
diff --git a/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index d16142a5fdf3..d16142a5fdf3 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
diff --git a/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix
index dfc588cd2132..dfc588cd2132 100644
--- a/modules/services/x11/hardware/wacom.nix
+++ b/nixos/modules/services/x11/hardware/wacom.nix
diff --git a/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index ab05639aeca6..ab05639aeca6 100644
--- a/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
diff --git a/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix
index 880ebf1eca6a..880ebf1eca6a 100644
--- a/modules/services/x11/window-managers/awesome.nix
+++ b/nixos/modules/services/x11/window-managers/awesome.nix
diff --git a/modules/services/x11/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix
index 209401f26468..209401f26468 100644
--- a/modules/services/x11/window-managers/compiz.nix
+++ b/nixos/modules/services/x11/window-managers/compiz.nix
diff --git a/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index c201b789ae48..c201b789ae48 100644
--- a/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
diff --git a/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index 6777a95ddc8c..6777a95ddc8c 100644
--- a/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
diff --git a/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix
index 9da4a415fad1..9da4a415fad1 100644
--- a/modules/services/x11/window-managers/icewm.nix
+++ b/nixos/modules/services/x11/window-managers/icewm.nix
diff --git a/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix
index 712e2038594e..712e2038594e 100644
--- a/modules/services/x11/window-managers/metacity.nix
+++ b/nixos/modules/services/x11/window-managers/metacity.nix
diff --git a/modules/services/x11/window-managers/none.nix b/nixos/modules/services/x11/window-managers/none.nix
index 84cf1d770776..84cf1d770776 100644
--- a/modules/services/x11/window-managers/none.nix
+++ b/nixos/modules/services/x11/window-managers/none.nix
diff --git a/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix
index ae34a938c4a0..ae34a938c4a0 100644
--- a/modules/services/x11/window-managers/openbox.nix
+++ b/nixos/modules/services/x11/window-managers/openbox.nix
diff --git a/modules/services/x11/window-managers/twm.nix b/nixos/modules/services/x11/window-managers/twm.nix
index c1a99b97566f..c1a99b97566f 100644
--- a/modules/services/x11/window-managers/twm.nix
+++ b/nixos/modules/services/x11/window-managers/twm.nix
diff --git a/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix
index b61521274fba..b61521274fba 100644
--- a/modules/services/x11/window-managers/wmii.nix
+++ b/nixos/modules/services/x11/window-managers/wmii.nix
diff --git a/modules/services/x11/window-managers/xbmc.nix b/nixos/modules/services/x11/window-managers/xbmc.nix
index 46494202b404..46494202b404 100644
--- a/modules/services/x11/window-managers/xbmc.nix
+++ b/nixos/modules/services/x11/window-managers/xbmc.nix
diff --git a/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 2cbb5002d6cf..2cbb5002d6cf 100644
--- a/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
diff --git a/modules/services/x11/xfs.conf b/nixos/modules/services/x11/xfs.conf
index 13dcf803db29..13dcf803db29 100644
--- a/modules/services/x11/xfs.conf
+++ b/nixos/modules/services/x11/xfs.conf
diff --git a/modules/services/x11/xfs.nix b/nixos/modules/services/x11/xfs.nix
index f4a40dbb08fd..f4a40dbb08fd 100644
--- a/modules/services/x11/xfs.nix
+++ b/nixos/modules/services/x11/xfs.nix
diff --git a/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index d42d7caaa06b..d42d7caaa06b 100644
--- a/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
diff --git a/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index dc0175632174..dc0175632174 100644
--- a/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
diff --git a/modules/system/activation/no-clone.nix b/nixos/modules/system/activation/no-clone.nix
index f15809e4d8b0..f15809e4d8b0 100644
--- a/modules/system/activation/no-clone.nix
+++ b/nixos/modules/system/activation/no-clone.nix
diff --git a/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 33ae3aef9fca..33ae3aef9fca 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
diff --git a/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 32157e419856..32157e419856 100644
--- a/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
diff --git a/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 4ceabb20df50..4ceabb20df50 100644
--- a/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
diff --git a/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index b7821f9509f1..b7821f9509f1 100644
--- a/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
index 2f550c98428b..2f550c98428b 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
index 735784327bcc..735784327bcc 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
diff --git a/modules/system/boot/loader/efi.nix b/nixos/modules/system/boot/loader/efi.nix
index 827b3e391222..827b3e391222 100644
--- a/modules/system/boot/loader/efi.nix
+++ b/nixos/modules/system/boot/loader/efi.nix
diff --git a/modules/system/boot/loader/generations-dir/generations-dir-builder.sh b/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
index e723b9eb7cb3..e723b9eb7cb3 100644
--- a/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
diff --git a/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index 9855c8c19dd0..9855c8c19dd0 100644
--- a/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
diff --git a/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 8e9f3253f877..8e9f3253f877 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
diff --git a/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index a83733db63b0..a83733db63b0 100644
--- a/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
diff --git a/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix
index a0726c01e204..a0726c01e204 100644
--- a/modules/system/boot/loader/grub/memtest.nix
+++ b/nixos/modules/system/boot/loader/grub/memtest.nix
diff --git a/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
index 35bbb57b51ee..35bbb57b51ee 100644
--- a/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
+++ b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
Binary files differdiff --git a/modules/system/boot/loader/grub/winkler-gnu-blue.README b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README
index 9616362dce2a..9616362dce2a 100644
--- a/modules/system/boot/loader/grub/winkler-gnu-blue.README
+++ b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README
diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index 9ea224b51f63..9ea224b51f63 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
diff --git a/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index 9193cd3bc533..9193cd3bc533 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
diff --git a/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
index 502b3b63af2f..502b3b63af2f 100644
--- a/modules/system/boot/loader/init-script/init-script-builder.sh
+++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
diff --git a/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix
index 4b0fcd85b4b5..4b0fcd85b4b5 100644
--- a/modules/system/boot/loader/init-script/init-script.nix
+++ b/nixos/modules/system/boot/loader/init-script/init-script.nix
diff --git a/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
index f6ccfe493d8a..f6ccfe493d8a 100644
--- a/modules/system/boot/loader/raspberrypi/builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
diff --git a/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 5bc856c3df0b..5bc856c3df0b 100644
--- a/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
diff --git a/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 29f5eb4fd771..29f5eb4fd771 100644
--- a/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
diff --git a/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index 8b2762e2526d..8b2762e2526d 100644
--- a/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
diff --git a/modules/system/boot/readonly-mountpoint.c b/nixos/modules/system/boot/readonly-mountpoint.c
index 27b666873821..27b666873821 100644
--- a/modules/system/boot/readonly-mountpoint.c
+++ b/nixos/modules/system/boot/readonly-mountpoint.c
diff --git a/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix
index ad71a2e816e3..ad71a2e816e3 100644
--- a/modules/system/boot/shutdown.nix
+++ b/nixos/modules/system/boot/shutdown.nix
diff --git a/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index e3e07c085808..e3e07c085808 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
diff --git a/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 3836d639513e..3836d639513e 100644
--- a/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
diff --git a/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 2fadd3de1f0f..2fadd3de1f0f 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
diff --git a/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index ff17535e418e..ff17535e418e 100644
--- a/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
diff --git a/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index dfb9036ab4df..dfb9036ab4df 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
diff --git a/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a5e1165574c5..a5e1165574c5 100644
--- a/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
diff --git a/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index 91fcdcf2435f..91fcdcf2435f 100644
--- a/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
diff --git a/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh
index 7cf68db9ddce..7cf68db9ddce 100644
--- a/modules/system/etc/make-etc.sh
+++ b/nixos/modules/system/etc/make-etc.sh
diff --git a/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl
index 7cb6d2a6a45e..7cb6d2a6a45e 100644
--- a/modules/system/etc/setup-etc.pl
+++ b/nixos/modules/system/etc/setup-etc.pl
diff --git a/modules/system/upstart/upstart.nix b/nixos/modules/system/upstart/upstart.nix
index 5d5139b7a57e..5d5139b7a57e 100644
--- a/modules/system/upstart/upstart.nix
+++ b/nixos/modules/system/upstart/upstart.nix
diff --git a/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index 3b21d8310871..3b21d8310871 100644
--- a/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
diff --git a/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 4ca309f5a108..4ca309f5a108 100644
--- a/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
diff --git a/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index d95a32e2e3f7..d95a32e2e3f7 100644
--- a/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
diff --git a/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix
index 24592e9d5882..24592e9d5882 100644
--- a/modules/tasks/filesystems/ext.nix
+++ b/nixos/modules/tasks/filesystems/ext.nix
diff --git a/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 2b720a93b893..2b720a93b893 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
diff --git a/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix
index f8c6a7000040..f8c6a7000040 100644
--- a/modules/tasks/filesystems/reiserfs.nix
+++ b/nixos/modules/tasks/filesystems/reiserfs.nix
diff --git a/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
index 177c97f85c78..177c97f85c78 100644
--- a/modules/tasks/filesystems/unionfs-fuse.nix
+++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
diff --git a/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix
index 5ca72f142b7d..5ca72f142b7d 100644
--- a/modules/tasks/filesystems/vfat.nix
+++ b/nixos/modules/tasks/filesystems/vfat.nix
diff --git a/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix
index 5f9eb741c2ab..5f9eb741c2ab 100644
--- a/modules/tasks/filesystems/xfs.nix
+++ b/nixos/modules/tasks/filesystems/xfs.nix
diff --git a/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index c1955b146918..c1955b146918 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
diff --git a/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 9f294a5f93e3..9f294a5f93e3 100644
--- a/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
diff --git a/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index 0e0272388c76..0e0272388c76 100644
--- a/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
diff --git a/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 0177d6396dfa..0177d6396dfa 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
diff --git a/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix
index 4ab67aee3956..4ab67aee3956 100644
--- a/modules/tasks/scsi-link-power-management.nix
+++ b/nixos/modules/tasks/scsi-link-power-management.nix
diff --git a/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix
index 3b4aa9875f26..3b4aa9875f26 100644
--- a/modules/tasks/swraid.nix
+++ b/nixos/modules/tasks/swraid.nix
diff --git a/modules/tasks/tty-backgrounds-combine.sh b/nixos/modules/tasks/tty-backgrounds-combine.sh
index 1e0d8758a6ee..1e0d8758a6ee 100644
--- a/modules/tasks/tty-backgrounds-combine.sh
+++ b/nixos/modules/tasks/tty-backgrounds-combine.sh
diff --git a/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix
index 0418de800c8d..0418de800c8d 100644
--- a/modules/testing/minimal-kernel.nix
+++ b/nixos/modules/testing/minimal-kernel.nix
diff --git a/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 28494e1c7b2a..28494e1c7b2a 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
diff --git a/modules/virtualisation/amazon-config.nix b/nixos/modules/virtualisation/amazon-config.nix
index e816ed2d183a..e816ed2d183a 100644
--- a/modules/virtualisation/amazon-config.nix
+++ b/nixos/modules/virtualisation/amazon-config.nix
diff --git a/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 7e04f0d29114..7e04f0d29114 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
diff --git a/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index fccf45e0e193..fccf45e0e193 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
diff --git a/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 52dab153094d..52dab153094d 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
diff --git a/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
index f8239cdec519..f8239cdec519 100644
--- a/modules/virtualisation/nova-config.nix
+++ b/nixos/modules/virtualisation/nova-config.nix
diff --git a/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix
index ab625dba11d3..ab625dba11d3 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/nixos/modules/virtualisation/nova-image.nix
diff --git a/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix
index 05c68e2bbff9..05c68e2bbff9 100644
--- a/modules/virtualisation/nova.nix
+++ b/nixos/modules/virtualisation/nova.nix
diff --git a/modules/virtualisation/qemu-opts b/nixos/modules/virtualisation/qemu-opts
index f06a5136608a..f06a5136608a 100644
--- a/modules/virtualisation/qemu-opts
+++ b/nixos/modules/virtualisation/qemu-opts
diff --git a/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 5b521a455470..5b521a455470 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
diff --git a/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index e1a83cdecc23..e1a83cdecc23 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
diff --git a/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index e1b6def8edb3..e1b6def8edb3 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
diff --git a/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 4c24c6a7826a..4c24c6a7826a 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
diff --git a/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix
index 483589669345..483589669345 100644
--- a/modules/virtualisation/xen-domU.nix
+++ b/nixos/modules/virtualisation/xen-domU.nix
diff --git a/release-combined.nix b/nixos/release-combined.nix
index 9b914506215d..9b914506215d 100644
--- a/release-combined.nix
+++ b/nixos/release-combined.nix
diff --git a/release.nix b/nixos/release.nix
index 06fb43bf6d62..06fb43bf6d62 100644
--- a/release.nix
+++ b/nixos/release.nix
diff --git a/tests/avahi.nix b/nixos/tests/avahi.nix
index d95361dcd83d..d95361dcd83d 100644
--- a/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
diff --git a/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 180da8267e0f..180da8267e0f 100644
--- a/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
diff --git a/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix
index 39e8883ee598..39e8883ee598 100644
--- a/tests/check-filesystems.nix
+++ b/nixos/tests/check-filesystems.nix
diff --git a/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index 8157cf8d263e..8157cf8d263e 100644
--- a/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
diff --git a/tests/common/x11.nix b/nixos/tests/common/x11.nix
index c5a7c165d126..c5a7c165d126 100644
--- a/tests/common/x11.nix
+++ b/nixos/tests/common/x11.nix
diff --git a/tests/default.nix b/nixos/tests/default.nix
index 17fe6a6d045f..17fe6a6d045f 100644
--- a/tests/default.nix
+++ b/nixos/tests/default.nix
diff --git a/tests/efi-installer.nix b/nixos/tests/efi-installer.nix
index a9c5d7190306..a9c5d7190306 100644
--- a/tests/efi-installer.nix
+++ b/nixos/tests/efi-installer.nix
diff --git a/tests/firefox.nix b/nixos/tests/firefox.nix
index d6599be13c9e..d6599be13c9e 100644
--- a/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
diff --git a/tests/firewall.nix b/nixos/tests/firewall.nix
index de32b98e5d2f..de32b98e5d2f 100644
--- a/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
diff --git a/tests/installer.nix b/nixos/tests/installer.nix
index 0ce780531712..0ce780531712 100644
--- a/tests/installer.nix
+++ b/nixos/tests/installer.nix
diff --git a/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 29d675e180a3..29d675e180a3 100644
--- a/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
diff --git a/tests/kde4.nix b/nixos/tests/kde4.nix
index 3fb35bbab098..3fb35bbab098 100644
--- a/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
diff --git a/tests/kexec.nix b/nixos/tests/kexec.nix
index b8da332b919b..b8da332b919b 100644
--- a/tests/kexec.nix
+++ b/nixos/tests/kexec.nix
diff --git a/tests/login.nix b/nixos/tests/login.nix
index ed7d97867179..ed7d97867179 100644
--- a/tests/login.nix
+++ b/nixos/tests/login.nix
diff --git a/tests/misc.nix b/nixos/tests/misc.nix
index e18a208fe432..e18a208fe432 100644
--- a/tests/misc.nix
+++ b/nixos/tests/misc.nix
diff --git a/tests/mpich-example.c b/nixos/tests/mpich-example.c
index c48e3c45b72e..c48e3c45b72e 100644
--- a/tests/mpich-example.c
+++ b/nixos/tests/mpich-example.c
diff --git a/tests/mpich.nix b/nixos/tests/mpich.nix
index d57512ebdfed..d57512ebdfed 100644
--- a/tests/mpich.nix
+++ b/nixos/tests/mpich.nix
diff --git a/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 28a1187dd184..28a1187dd184 100644
--- a/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
diff --git a/tests/mysql.nix b/nixos/tests/mysql.nix
index b48850738b72..b48850738b72 100644
--- a/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
diff --git a/tests/nat.nix b/nixos/tests/nat.nix
index 55d87ed4fa14..55d87ed4fa14 100644
--- a/tests/nat.nix
+++ b/nixos/tests/nat.nix
diff --git a/tests/nfs.nix b/nixos/tests/nfs.nix
index ee65c298dd00..ee65c298dd00 100644
--- a/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
diff --git a/tests/openssh.nix b/nixos/tests/openssh.nix
index 16757cf9098e..16757cf9098e 100644
--- a/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
diff --git a/tests/partition.nix b/nixos/tests/partition.nix
index 7126e7255ef4..7126e7255ef4 100644
--- a/tests/partition.nix
+++ b/nixos/tests/partition.nix
diff --git a/tests/printing.nix b/nixos/tests/printing.nix
index 13cc3115d50e..13cc3115d50e 100644
--- a/tests/printing.nix
+++ b/nixos/tests/printing.nix
diff --git a/tests/proxy.nix b/nixos/tests/proxy.nix
index 3b79c16ea2c4..3b79c16ea2c4 100644
--- a/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
diff --git a/tests/quake3.nix b/nixos/tests/quake3.nix
index 925011077805..925011077805 100644
--- a/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
diff --git a/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index 75bd161ec9ef..75bd161ec9ef 100644
--- a/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
diff --git a/tests/simple.nix b/nixos/tests/simple.nix
index eee13a101334..eee13a101334 100644
--- a/tests/simple.nix
+++ b/nixos/tests/simple.nix
diff --git a/tests/subversion.nix b/nixos/tests/subversion.nix
index 309da90c5df1..309da90c5df1 100644
--- a/tests/subversion.nix
+++ b/nixos/tests/subversion.nix
diff --git a/tests/test-config-examples.sh b/nixos/tests/test-config-examples.sh
index 1ba2f841c41d..1ba2f841c41d 100755
--- a/tests/test-config-examples.sh
+++ b/nixos/tests/test-config-examples.sh
diff --git a/tests/testdb.sql b/nixos/tests/testdb.sql
index 4fb28fea3df9..4fb28fea3df9 100644
--- a/tests/testdb.sql
+++ b/nixos/tests/testdb.sql
diff --git a/tests/tomcat.nix b/nixos/tests/tomcat.nix
index c25276aa424e..c25276aa424e 100644
--- a/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
diff --git a/tests/trac.nix b/nixos/tests/trac.nix
index 72442c885ace..72442c885ace 100644
--- a/tests/trac.nix
+++ b/nixos/tests/trac.nix
diff --git a/tests/xfce.nix b/nixos/tests/xfce.nix
index 9f9692f8a014..9f9692f8a014 100644
--- a/tests/xfce.nix
+++ b/nixos/tests/xfce.nix