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 e75fb319980..e75fb319980 100644
--- a/.gitignore
+++ b/nixos/.gitignore
diff --git a/.version b/nixos/.version
index eb28f45ff24..eb28f45ff24 100644
--- a/.version
+++ b/nixos/.version
diff --git a/COPYING b/nixos/COPYING
index c9b44cb8aae..c9b44cb8aae 100644
--- a/COPYING
+++ b/nixos/COPYING
diff --git a/README b/nixos/README
index 4ecf648a930..4ecf648a930 100644
--- a/README
+++ b/nixos/README
diff --git a/default.nix b/nixos/default.nix
index d38e70d21f9..d38e70d21f9 100644
--- a/default.nix
+++ b/nixos/default.nix
diff --git a/doc/config-examples/basic.nix b/nixos/doc/config-examples/basic.nix
index da37cfb8c28..da37cfb8c28 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 0cebacdb0cc..0cebacdb0cc 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 2ea1e547921..2ea1e547921 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 e727007117b..e727007117b 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 374d3ba3bc7..374d3ba3bc7 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 965ba73105a..965ba73105a 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 e6edb30985c..e6edb30985c 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 d8b5f6f571c..d8b5f6f571c 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 3068fa5cb94..3068fa5cb94 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 d49369d2c58..d49369d2c58 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 f37677629d0..f37677629d0 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 f7a8ce403dc..f7a8ce403dc 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 e43dafd3cfe..e43dafd3cfe 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 7840e1b897b..7840e1b897b 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 7d6634bf093..7d6634bf093 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 adc6c93c722..adc6c93c722 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 e50099707cc..e50099707cc 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 e2204c159e2..e2204c159e2 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 c6e0a3a7888..c6e0a3a7888 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 7c6540caf3a..7c6540caf3a 100644
--- a/doc/manual/userconfiguration.xml
+++ b/nixos/doc/manual/userconfiguration.xml
diff --git a/gui/README b/nixos/gui/README
index c038314a0dc..c038314a0dc 100644
--- a/gui/README
+++ b/nixos/gui/README
diff --git a/gui/application.ini b/nixos/gui/application.ini
index d2494a1a5cd..d2494a1a5cd 100644
--- a/gui/application.ini
+++ b/nixos/gui/application.ini
diff --git a/gui/chrome.manifest b/nixos/gui/chrome.manifest
index 865d6a88fb4..865d6a88fb4 100644
--- a/gui/chrome.manifest
+++ b/nixos/gui/chrome.manifest
diff --git a/gui/chrome/chrome.manifest b/nixos/gui/chrome/chrome.manifest
index 775445ee17b..775445ee17b 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 8d9c8c17365..8d9c8c17365 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 ecfc5a8c5c9..ecfc5a8c5c9 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 2aeb9391d07..2aeb9391d07 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 63a3c16a573..63a3c16a573 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 0d093740fe2..0d093740fe2 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 fd85422d6c8..fd85422d6c8 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 e10fa18c0d8..e10fa18c0d8 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 59f05bfd104..59f05bfd104 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 453bdd506b8..453bdd506b8 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 47e7d1a0eaf..47e7d1a0eaf 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 6bd71e40e9a..6bd71e40e9a 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 5ad546e9534..5ad546e9534 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 89b681ed2cd..89b681ed2cd 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 3b640334e17..3b640334e17 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 8fed9a34882..8fed9a34882 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 aadd0f6428c..aadd0f6428c 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 de355b08918..de355b08918 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 6e62fdfd770..6e62fdfd770 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 a28214ea934..a28214ea934 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 8e907d85ffa..8e907d85ffa 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 a54d8504a86..a54d8504a86 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 c6a707cdf6b..c6a707cdf6b 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 9754093dfd0..9754093dfd0 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 7be0903ed3a..7be0903ed3a 100644
--- a/lib/testing.nix
+++ b/nixos/lib/testing.nix
diff --git a/lib/utils.nix b/nixos/lib/utils.nix
index 35c56e8c32b..35c56e8c32b 100644
--- a/lib/utils.nix
+++ b/nixos/lib/utils.nix
diff --git a/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 7413b9e18ce..7413b9e18ce 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 93971ac9504..93971ac9504 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 1aaac283239..1aaac283239 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 43dbd86f675..43dbd86f675 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 7de95200cfa..7de95200cfa 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 6e0fdaf4b74..6e0fdaf4b74 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 a4f69809b2a..a4f69809b2a 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 f43784f6d03..f43784f6d03 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 9ef00396808..9ef00396808 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 1a69083a206..1a69083a206 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 c3e39717258..c3e39717258 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 3323046ac5b..3323046ac5b 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 113f5d8bcbd..113f5d8bcbd 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 f1bdfd01b24..f1bdfd01b24 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 77890b49c67..77890b49c67 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 ad62b5597be..ad62b5597be 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 fec2c886818..fec2c886818 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 26060f5b2d1..26060f5b2d1 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 4f7447f435b..4f7447f435b 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 7d4654ae287..7d4654ae287 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 6b52fd38fde..6b52fd38fde 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 e65be03afac..e65be03afac 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 e185584846a..e185584846a 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 0f608469058..0f608469058 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 5f32dc350df..5f32dc350df 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 16b6a862593..16b6a862593 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 5720a63834f..5720a63834f 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 9046ddf83bb..9046ddf83bb 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 8f45bd4d3f1..8f45bd4d3f1 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 8fecdae36bf..8fecdae36bf 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 8fecdae36bf..8fecdae36bf 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 1e0033eb414..1e0033eb414 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 ae5b69b7981..ae5b69b7981 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 80baf260ab9..80baf260ab9 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 8fecdae36bf..8fecdae36bf 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 8fecdae36bf..8fecdae36bf 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 8fecdae36bf..8fecdae36bf 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 8fecdae36bf..8fecdae36bf 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 8fecdae36bf..8fecdae36bf 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 8fecdae36bf..8fecdae36bf 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 92f34d8643b..92f34d8643b 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 3aefb7bdd60..3aefb7bdd60 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 318131be749..318131be749 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 5f13088c373..5f13088c373 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 c8428a7241b..c8428a7241b 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 0dba59734ca..0dba59734ca 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 c0eb2b814b3..c0eb2b814b3 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 8fecdae36bf..8fecdae36bf 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 8126ce46dd9..8126ce46dd9 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 999871ab074..999871ab074 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 4aa788feeae..4aa788feeae 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 debf3e7db90..debf3e7db90 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 38d02ffd162..38d02ffd162 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 a7498906a86..a7498906a86 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 93bcbf00b25..93bcbf00b25 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 de9728d677c..de9728d677c 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 e57be6d442e..e57be6d442e 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 85356118ce6..85356118ce6 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 8f0a8d355c6..8f0a8d355c6 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 7619f074b74..7619f074b74 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 20fe4de2cd8..20fe4de2cd8 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 6bf8eebdac5..6bf8eebdac5 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 09d04608e68..09d04608e68 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 814858fdffd..814858fdffd 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 76cec8d5dae..76cec8d5dae 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 5e77b701ff5..5e77b701ff5 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 0a6e8b920a1..0a6e8b920a1 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 1a734ca5eeb..1a734ca5eeb 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 a97eef672f7..a97eef672f7 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 3204f3d4051..3204f3d4051 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 a4ac5b68dd7..a4ac5b68dd7 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 7f008d62c24..7f008d62c24 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 8734cb273d4..8734cb273d4 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 5dbf277fe4c..5dbf277fe4c 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 c761d74a890..c761d74a890 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 76cc29a1fac..76cc29a1fac 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 9cd58550adc..9cd58550adc 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 28f36ad9ae5..28f36ad9ae5 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 6e6bc9dec0f..6e6bc9dec0f 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 adaa2b0d9ae..adaa2b0d9ae 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 18fc68a6988..18fc68a6988 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 02b1ed7b63d..02b1ed7b63d 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 0df0e57c98e..0df0e57c98e 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 f68adc5e843..f68adc5e843 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 20a03b44a2a..20a03b44a2a 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 c186968f059..c186968f059 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 511c118e2bf..511c118e2bf 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 20b808c29e0..20b808c29e0 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 d7190020e7e..d7190020e7e 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 396dcf6c5d3..396dcf6c5d3 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 75ac5e41f83..75ac5e41f83 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 541c46ca50c..541c46ca50c 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 3b058c6e971..3b058c6e971 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 821b9f93465..821b9f93465 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 c8e6fd4aa76..c8e6fd4aa76 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 7fdaab9d67d..7fdaab9d67d 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 8cfe3f990ad..8cfe3f990ad 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 502320446a3..502320446a3 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 916649059d3..916649059d3 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 e4eabc052c5..e4eabc052c5 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 e1e31b4a56a..e1e31b4a56a 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 f42df351422..f42df351422 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 30c25cf3420..30c25cf3420 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 695c0b6620f..695c0b6620f 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 679c4979dfa..679c4979dfa 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 5ec32376b60..5ec32376b60 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 904989d57a0..904989d57a0 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 2b3bfbc6c18..2b3bfbc6c18 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 340fec0496a..340fec0496a 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 da3f7dce98a..da3f7dce98a 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 6121f3e21f1..6121f3e21f1 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 cff751934d7..cff751934d7 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 631283ce219..631283ce219 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 bc661164fdc..bc661164fdc 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 d4aa0598dd3..d4aa0598dd3 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 2e93fb36b45..2e93fb36b45 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 3ef01ea2c17..3ef01ea2c17 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 1c2a6a05f26..1c2a6a05f26 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 b9b32496a36..b9b32496a36 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 dd251fe69d3..dd251fe69d3 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 e47e7baa2b8..e47e7baa2b8 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 007ffbc34fe..007ffbc34fe 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 e75679e5ff6..e75679e5ff6 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 cd548f4a4fe..cd548f4a4fe 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 c0f5d16ea11..c0f5d16ea11 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 915d179e699..915d179e699 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 696b5ad4379..696b5ad4379 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 6c53ef46ab9..6c53ef46ab9 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 df73e62fc94..df73e62fc94 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 35ec3bffeb0..35ec3bffeb0 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 a9880dee20c..a9880dee20c 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 d5bc932c6b9..d5bc932c6b9 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 272903c99e3..272903c99e3 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 3ff9978fbb9..3ff9978fbb9 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 e68ad794a96..e68ad794a96 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 178ba3ec720..178ba3ec720 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 5c7f7ffae5b..5c7f7ffae5b 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 7b03b4d8f1d..7b03b4d8f1d 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 14990e92ea3..14990e92ea3 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 aca0d58900b..aca0d58900b 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 a0e264f2299..a0e264f2299 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 d6299415893..d6299415893 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 663c2cc4505..663c2cc4505 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 46148d68f4c..46148d68f4c 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 a4dd30be1fb..a4dd30be1fb 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 fc6b5b167b8..fc6b5b167b8 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 5bc58c73bd6..5bc58c73bd6 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 6a29fc13211..6a29fc13211 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 815118be1c6..815118be1c6 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 6a595f8306b..6a595f8306b 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 6bc0ad0bf77..6bc0ad0bf77 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 4c0ce794d4f..4c0ce794d4f 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 9f389efc06d..9f389efc06d 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 32599554fc1..32599554fc1 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 905445f22c1..905445f22c1 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 b39c9cb1d9b..b39c9cb1d9b 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 37dba8ce71d..37dba8ce71d 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 1ba17c589d2..1ba17c589d2 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 eae4172ccb3..eae4172ccb3 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 5d1658adb75..5d1658adb75 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 d7d0bbf89a5..d7d0bbf89a5 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 23f21b6a754..23f21b6a754 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 c6c0d2ea238..c6c0d2ea238 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 2f0eea50526..2f0eea50526 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 680c7a912c1..680c7a912c1 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 24cd5c1567e..24cd5c1567e 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 5f8e8e1ade3..5f8e8e1ade3 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 8f6e9382607..8f6e9382607 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 bad0b22625d..bad0b22625d 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 2732fd60200..2732fd60200 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 2633289b46d..2633289b46d 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 aaf1dfcc210..aaf1dfcc210 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 50491c556e8..50491c556e8 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 890d7a4020b..890d7a4020b 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 6419e6f8fc7..6419e6f8fc7 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 2da50fc8595..2da50fc8595 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 9f4c4645279..9f4c4645279 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 bc1d1f4575a..bc1d1f4575a 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 adf4f145f25..adf4f145f25 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 dfdc4db65d5..dfdc4db65d5 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 38f1917a46a..38f1917a46a 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 94fa8850750..94fa8850750 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 b0806d14738..b0806d14738 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 91c0acb0bc2..91c0acb0bc2 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 114bad5c947..114bad5c947 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 ef658523c1f..ef658523c1f 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 ec36db7b21c..ec36db7b21c 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 2acc51c64a6..2acc51c64a6 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 6efdefcd37d..6efdefcd37d 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 c809a3b8457..c809a3b8457 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 3a4c269e257..3a4c269e257 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 e729ea77675..e729ea77675 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 2669be54d3d..2669be54d3d 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 de07dc0dbaa..de07dc0dbaa 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 a3266605671..a3266605671 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 0a3e666ad4e..0a3e666ad4e 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 a7b72e53f0a..a7b72e53f0a 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 fa3de7d90bc..fa3de7d90bc 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 229236c1bbd..229236c1bbd 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 6735b4ca327..6735b4ca327 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 1a00ccab0a6..1a00ccab0a6 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 4daa5e9d063..4daa5e9d063 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 4a888b64bd3..4a888b64bd3 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 70a14487ea5..70a14487ea5 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 8652d0daf4c..8652d0daf4c 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 3603d677837..3603d677837 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 765dc014dcb..765dc014dcb 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 82e875f5aae..82e875f5aae 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 5e9818858e0..5e9818858e0 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 bfe7209b991..bfe7209b991 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 62709a040a1..62709a040a1 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 1e343443899..1e343443899 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 48803511a5e..48803511a5e 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 43e0843cb97..43e0843cb97 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 b726493d421..b726493d421 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 6d233e543e2..6d233e543e2 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 b24ac2d7032..b24ac2d7032 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 f5bc550ab5f..f5bc550ab5f 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 a4bd2098986..a4bd2098986 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 a7c7c206198..a7c7c206198 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 421c0d9bb69..421c0d9bb69 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 07c35e3cb3d..07c35e3cb3d 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 594a2e80f34..594a2e80f34 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 4edea12b6be..4edea12b6be 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 df50e9807a9..df50e9807a9 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 1b3473ee0ee..1b3473ee0ee 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 b8cb836db95..b8cb836db95 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 312dfaada32..312dfaada32 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 cd82a41ef7a..cd82a41ef7a 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 bb22832dbdb..bb22832dbdb 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 ea5bc8514f1..ea5bc8514f1 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 9d62a764f06..9d62a764f06 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 1d5682f5f3f..1d5682f5f3f 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 e5e164021d3..e5e164021d3 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 a2a555a8ad1..a2a555a8ad1 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 d5c18c0675c..d5c18c0675c 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 1e862591406..1e862591406 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 fb541bf101a..fb541bf101a 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 89c40c53157..89c40c53157 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 f3a4e457ec8..f3a4e457ec8 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 8d586ce6e46..8d586ce6e46 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 f797206ad5c..f797206ad5c 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 00c958c5a4a..00c958c5a4a 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 8816ac0d2f8..8816ac0d2f8 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 d32fabbde24..d32fabbde24 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 d57eef860d2..d57eef860d2 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 fa8b7556de5..fa8b7556de5 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 48cb884f246..48cb884f246 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 37935496c59..37935496c59 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 fb75b4ed069..fb75b4ed069 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 1b2432401de..1b2432401de 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 1fc54986b16..1fc54986b16 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 12042bbad6c..12042bbad6c 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 8e012273216..8e012273216 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 dca398dd8be..dca398dd8be 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 626183b810f..626183b810f 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 c9a4a9087e5..c9a4a9087e5 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 88bec2cb2f3..88bec2cb2f3 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 e14f03fb1e8..e14f03fb1e8 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 95ff918eb6d..95ff918eb6d 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 6dfabc7e305..6dfabc7e305 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 5ccb4927fcb..5ccb4927fcb 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 2b2a54ef409..2b2a54ef409 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 9f1fc4ed6d8..9f1fc4ed6d8 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 9aae7b33a43..9aae7b33a43 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 2dafb4595c6..2dafb4595c6 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 1c158906a91..1c158906a91 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 d6974282a6b..d6974282a6b 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 eab876be76d..eab876be76d 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 8fb5debd20e..8fb5debd20e 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 6d0dcacf977..6d0dcacf977 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 e8534b12043..e8534b12043 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 61eecd5c9ba..61eecd5c9ba 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 e0c212e5661..e0c212e5661 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 063332d4862..063332d4862 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 850f558e4cb..850f558e4cb 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 6a425cf327f..6a425cf327f 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 e2cfc5cdb26..e2cfc5cdb26 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 dcc05b03891..dcc05b03891 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 755b595c783..755b595c783 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 a5227bae2d4..a5227bae2d4 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 f12ae842b58..f12ae842b58 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 dc82fd34f2f..dc82fd34f2f 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 a6e6042fdf6..a6e6042fdf6 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 2eb89a90f67..2eb89a90f67 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 e1bcede6563..e1bcede6563 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 62264f1db45..62264f1db45 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 f9e40fc4b54..f9e40fc4b54 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 d759d8144b6..d759d8144b6 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 b26af1aa744..b26af1aa744 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 a68828de5d8..a68828de5d8 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 7e327120c3d..7e327120c3d 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 19afa55d7fe..19afa55d7fe 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 0fea74d5ba7..0fea74d5ba7 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 3d91617c62a..3d91617c62a 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 b0212446ad3..b0212446ad3 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 c76acfbcd4e..c76acfbcd4e 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 af7a376ae02..af7a376ae02 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 f5d544ad046..f5d544ad046 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 edc61c103ea..edc61c103ea 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 33d97e0e07a..33d97e0e07a 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 c7599e245b0..c7599e245b0 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 229ab12c6e1..229ab12c6e1 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 c2b90d239ea..c2b90d239ea 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 9e8b9391f45..9e8b9391f45 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 4f9048bfd91..4f9048bfd91 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 d16142a5fdf..d16142a5fdf 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 dfc588cd213..dfc588cd213 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 ab05639aeca..ab05639aeca 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 880ebf1eca6..880ebf1eca6 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 209401f2646..209401f2646 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 c201b789ae4..c201b789ae4 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 6777a95ddc8..6777a95ddc8 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 9da4a415fad..9da4a415fad 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 712e2038594..712e2038594 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 84cf1d77077..84cf1d77077 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 ae34a938c4a..ae34a938c4a 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 c1a99b97566..c1a99b97566 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 b61521274fb..b61521274fb 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 46494202b40..46494202b40 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 2cbb5002d6c..2cbb5002d6c 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 13dcf803db2..13dcf803db2 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 f4a40dbb08f..f4a40dbb08f 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 d42d7caaa06..d42d7caaa06 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 dc017563217..dc017563217 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 f15809e4d8b..f15809e4d8b 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 33ae3aef9fc..33ae3aef9fc 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 32157e41985..32157e41985 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 4ceabb20df5..4ceabb20df5 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 b7821f9509f..b7821f9509f 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 2f550c98428..2f550c98428 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 735784327bc..735784327bc 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 827b3e39122..827b3e39122 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 e723b9eb7cb..e723b9eb7cb 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 9855c8c19dd..9855c8c19dd 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 8e9f3253f87..8e9f3253f87 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 a83733db63b..a83733db63b 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 a0726c01e20..a0726c01e20 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 35bbb57b51e..35bbb57b51e 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 9616362dce2..9616362dce2 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 9ea224b51f6..9ea224b51f6 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 9193cd3bc53..9193cd3bc53 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 502b3b63af2..502b3b63af2 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 4b0fcd85b4b..4b0fcd85b4b 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 f6ccfe493d8..f6ccfe493d8 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 5bc856c3df0..5bc856c3df0 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 29f5eb4fd77..29f5eb4fd77 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 8b2762e2526..8b2762e2526 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 27b66687382..27b66687382 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 ad71a2e816e..ad71a2e816e 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 e3e07c08580..e3e07c08580 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 3836d639513..3836d639513 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 2fadd3de1f0..2fadd3de1f0 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 ff17535e418..ff17535e418 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 dfb9036ab4d..dfb9036ab4d 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 a5e1165574c..a5e1165574c 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 91fcdcf2435..91fcdcf2435 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 7cf68db9ddc..7cf68db9ddc 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 7cb6d2a6a45..7cb6d2a6a45 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 5d5139b7a57..5d5139b7a57 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 3b21d831087..3b21d831087 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 4ca309f5a10..4ca309f5a10 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 d95a32e2e3f..d95a32e2e3f 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 24592e9d588..24592e9d588 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 2b720a93b89..2b720a93b89 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 f8c6a700004..f8c6a700004 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 177c97f85c7..177c97f85c7 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 5ca72f142b7..5ca72f142b7 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 5f9eb741c2a..5f9eb741c2a 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 c1955b14691..c1955b14691 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 9f294a5f93e..9f294a5f93e 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 0e0272388c7..0e0272388c7 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 0177d6396df..0177d6396df 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 4ab67aee395..4ab67aee395 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 3b4aa9875f2..3b4aa9875f2 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 1e0d8758a6e..1e0d8758a6e 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 0418de800c8..0418de800c8 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 28494e1c7b2..28494e1c7b2 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 e816ed2d183..e816ed2d183 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 7e04f0d2911..7e04f0d2911 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 fccf45e0e19..fccf45e0e19 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 52dab153094..52dab153094 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 f8239cdec51..f8239cdec51 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 ab625dba11d..ab625dba11d 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 05c68e2bbff..05c68e2bbff 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 f06a5136608..f06a5136608 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 5b521a45547..5b521a45547 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 e1a83cdecc2..e1a83cdecc2 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 e1b6def8edb..e1b6def8edb 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 4c24c6a7826..4c24c6a7826 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 48358966934..48358966934 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 9b914506215..9b914506215 100644
--- a/release-combined.nix
+++ b/nixos/release-combined.nix
diff --git a/release.nix b/nixos/release.nix
index 06fb43bf6d6..06fb43bf6d6 100644
--- a/release.nix
+++ b/nixos/release.nix
diff --git a/tests/avahi.nix b/nixos/tests/avahi.nix
index d95361dcd83..d95361dcd83 100644
--- a/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
diff --git a/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 180da8267e0..180da8267e0 100644
--- a/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
diff --git a/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix
index 39e8883ee59..39e8883ee59 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 8157cf8d263..8157cf8d263 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 c5a7c165d12..c5a7c165d12 100644
--- a/tests/common/x11.nix
+++ b/nixos/tests/common/x11.nix
diff --git a/tests/default.nix b/nixos/tests/default.nix
index 17fe6a6d045..17fe6a6d045 100644
--- a/tests/default.nix
+++ b/nixos/tests/default.nix
diff --git a/tests/efi-installer.nix b/nixos/tests/efi-installer.nix
index a9c5d719030..a9c5d719030 100644
--- a/tests/efi-installer.nix
+++ b/nixos/tests/efi-installer.nix
diff --git a/tests/firefox.nix b/nixos/tests/firefox.nix
index d6599be13c9..d6599be13c9 100644
--- a/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
diff --git a/tests/firewall.nix b/nixos/tests/firewall.nix
index de32b98e5d2..de32b98e5d2 100644
--- a/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
diff --git a/tests/installer.nix b/nixos/tests/installer.nix
index 0ce78053171..0ce78053171 100644
--- a/tests/installer.nix
+++ b/nixos/tests/installer.nix
diff --git a/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 29d675e180a..29d675e180a 100644
--- a/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
diff --git a/tests/kde4.nix b/nixos/tests/kde4.nix
index 3fb35bbab09..3fb35bbab09 100644
--- a/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
diff --git a/tests/kexec.nix b/nixos/tests/kexec.nix
index b8da332b919..b8da332b919 100644
--- a/tests/kexec.nix
+++ b/nixos/tests/kexec.nix
diff --git a/tests/login.nix b/nixos/tests/login.nix
index ed7d9786717..ed7d9786717 100644
--- a/tests/login.nix
+++ b/nixos/tests/login.nix
diff --git a/tests/misc.nix b/nixos/tests/misc.nix
index e18a208fe43..e18a208fe43 100644
--- a/tests/misc.nix
+++ b/nixos/tests/misc.nix
diff --git a/tests/mpich-example.c b/nixos/tests/mpich-example.c
index c48e3c45b72..c48e3c45b72 100644
--- a/tests/mpich-example.c
+++ b/nixos/tests/mpich-example.c
diff --git a/tests/mpich.nix b/nixos/tests/mpich.nix
index d57512ebdfe..d57512ebdfe 100644
--- a/tests/mpich.nix
+++ b/nixos/tests/mpich.nix
diff --git a/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 28a1187dd18..28a1187dd18 100644
--- a/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
diff --git a/tests/mysql.nix b/nixos/tests/mysql.nix
index b48850738b7..b48850738b7 100644
--- a/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
diff --git a/tests/nat.nix b/nixos/tests/nat.nix
index 55d87ed4fa1..55d87ed4fa1 100644
--- a/tests/nat.nix
+++ b/nixos/tests/nat.nix
diff --git a/tests/nfs.nix b/nixos/tests/nfs.nix
index ee65c298dd0..ee65c298dd0 100644
--- a/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
diff --git a/tests/openssh.nix b/nixos/tests/openssh.nix
index 16757cf9098..16757cf9098 100644
--- a/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
diff --git a/tests/partition.nix b/nixos/tests/partition.nix
index 7126e7255ef..7126e7255ef 100644
--- a/tests/partition.nix
+++ b/nixos/tests/partition.nix
diff --git a/tests/printing.nix b/nixos/tests/printing.nix
index 13cc3115d50..13cc3115d50 100644
--- a/tests/printing.nix
+++ b/nixos/tests/printing.nix
diff --git a/tests/proxy.nix b/nixos/tests/proxy.nix
index 3b79c16ea2c..3b79c16ea2c 100644
--- a/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
diff --git a/tests/quake3.nix b/nixos/tests/quake3.nix
index 92501107780..92501107780 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 75bd161ec9e..75bd161ec9e 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 eee13a10133..eee13a10133 100644
--- a/tests/simple.nix
+++ b/nixos/tests/simple.nix
diff --git a/tests/subversion.nix b/nixos/tests/subversion.nix
index 309da90c5df..309da90c5df 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 1ba2f841c41..1ba2f841c41 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 4fb28fea3df..4fb28fea3df 100644
--- a/tests/testdb.sql
+++ b/nixos/tests/testdb.sql
diff --git a/tests/tomcat.nix b/nixos/tests/tomcat.nix
index c25276aa424..c25276aa424 100644
--- a/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
diff --git a/tests/trac.nix b/nixos/tests/trac.nix
index 72442c885ac..72442c885ac 100644
--- a/tests/trac.nix
+++ b/nixos/tests/trac.nix
diff --git a/tests/xfce.nix b/nixos/tests/xfce.nix
index 9f9692f8a01..9f9692f8a01 100644
--- a/tests/xfce.nix
+++ b/nixos/tests/xfce.nix