282 files changed, 75 insertions, 51 deletions

diff --git a/.gitignore b/.gitignore
index d6944e3ddc1..b2be92b7db0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/result*
+result
diff --git a/README b/README
new file mode 100644
index 00000000000..0ffae5f5ec9
--- /dev/null
+++ b/README
@@ -0,0 +1,23 @@
+LIBKOOKIE
+=========
+
+This is my personal collection of nix expressions. It replaces my old
+`kookiepkgs` [0] and `nixcfg` [1] repositories. It contains a subtree
+of nixpkgs, overlays and modules.
+
+`overlays/patches`: patches to upstream packages
+`overlays/pkgs`: custom out-of-nixpkgs packages
+`nixpkgs`: subtree of nixpkgs (follows unstable)
+`modules`: system configuration modules
+`roots`: available entry-points (machines)
+`ext`: possible private extensions
+
+The `activate` script can be used to switch to a new system
+configuration
+
+
+
+---
+
+[0]: https://git.sr.ht/~spacekookie/kookiepkgs
+[1]: https://git.sr.ht/~spacekookie/nixcfg
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 1e3ff09e0bc..00000000000
--- a/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-rec {
-  home-manager = pkgs.callPackage ./home-manager {
-    path = toString ./.;
-  };
-
-  install = pkgs.callPackage ./home-manager/install.nix {
-    inherit home-manager;
-  };
-
-  nixos = import ./nixos;
-}
diff --git a/home-manager/.gitignore b/home-manager/.gitignore
new file mode 100644
index 00000000000..d6944e3ddc1
--- /dev/null
+++ b/home-manager/.gitignore
@@ -0,0 +1 @@
+/result*
diff --git a/.gitlab-ci.yml b/home-manager/.gitlab-ci.yml
index 73c00f30510..73c00f30510 100644
--- a/.gitlab-ci.yml
+++ b/home-manager/.gitlab-ci.yml
diff --git a/.travis.yml b/home-manager/.travis.yml
index df9c468be64..df9c468be64 100644
--- a/.travis.yml
+++ b/home-manager/.travis.yml
diff --git a/CONTRIBUTING.md b/home-manager/CONTRIBUTING.md
index 156d0c9daf6..156d0c9daf6 100644
--- a/CONTRIBUTING.md
+++ b/home-manager/CONTRIBUTING.md
diff --git a/FAQ.md b/home-manager/FAQ.md
index 141ecc6ea6b..141ecc6ea6b 100644
--- a/FAQ.md
+++ b/home-manager/FAQ.md
diff --git a/LICENSE b/home-manager/LICENSE
index a7566dbf194..a7566dbf194 100644
--- a/LICENSE
+++ b/home-manager/LICENSE
diff --git a/README.md b/home-manager/README.md
index 58593f7b374..58593f7b374 100644
--- a/README.md
+++ b/home-manager/README.md
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 8b5ae75e0fd..1e3ff09e0bc 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,40 +1,13 @@
-{ runCommand, lib, bash, coreutils, findutils, gnused, less
+{ pkgs ? import <nixpkgs> {} }:
 
-  # Extra path to Home Manager. If set then this path will be tried
-  # before `$HOME/.config/nixpkgs/home-manager` and
-  # `$HOME/.nixpkgs/home-manager`.
-, path ? null
-}:
+rec {
+  home-manager = pkgs.callPackage ./home-manager {
+    path = toString ./.;
+  };
 
-let
+  install = pkgs.callPackage ./home-manager/install.nix {
+    inherit home-manager;
+  };
 
-  pathStr = if path == null then "" else path;
-
-in
-
-runCommand
-  "home-manager"
-  {
-    preferLocalBuild = true;
-    allowSubstitutes = false;
-    meta = with lib; {
-      description = "A user environment configurator";
-      maintainers = [ maintainers.rycee ];
-      platforms = platforms.unix;
-      license = licenses.mit;
-    };
-  }
-  ''
-    install -v -D -m755  ${./home-manager} $out/bin/home-manager
-
-    substituteInPlace $out/bin/home-manager \
-      --subst-var-by bash "${bash}" \
-      --subst-var-by coreutils "${coreutils}" \
-      --subst-var-by findutils "${findutils}" \
-      --subst-var-by gnused "${gnused}" \
-      --subst-var-by less "${less}" \
-      --subst-var-by HOME_MANAGER_PATH '${pathStr}'
-
-    install -D -m755 ${./completion.bash} \
-      $out/share/bash-completion/completions/home-manager
-  ''
+  nixos = import ./nixos;
+}
diff --git a/doc/default.nix b/home-manager/doc/default.nix
index acfa1f1e49c..acfa1f1e49c 100644
--- a/doc/default.nix
+++ b/home-manager/doc/default.nix
diff --git a/doc/installation.xml b/home-manager/doc/installation.xml
index 0e4c904e570..0e4c904e570 100644
--- a/doc/installation.xml
+++ b/home-manager/doc/installation.xml
diff --git a/doc/man-configuration.xml b/home-manager/doc/man-configuration.xml
index 42962a75f3c..42962a75f3c 100644
--- a/doc/man-configuration.xml
+++ b/home-manager/doc/man-configuration.xml
diff --git a/doc/man-home-manager.xml b/home-manager/doc/man-home-manager.xml
index a0f55d1106a..a0f55d1106a 100644
--- a/doc/man-home-manager.xml
+++ b/home-manager/doc/man-home-manager.xml
diff --git a/doc/man-pages.xml b/home-manager/doc/man-pages.xml
index 616c2ef291b..616c2ef291b 100644
--- a/doc/man-pages.xml
+++ b/home-manager/doc/man-pages.xml
diff --git a/doc/manual.xml b/home-manager/doc/manual.xml
index 8ff81308b2c..8ff81308b2c 100644
--- a/doc/manual.xml
+++ b/home-manager/doc/manual.xml
diff --git a/doc/release-notes/release-notes.xml b/home-manager/doc/release-notes/release-notes.xml
index 4675f0bfa5c..4675f0bfa5c 100644
--- a/doc/release-notes/release-notes.xml
+++ b/home-manager/doc/release-notes/release-notes.xml
diff --git a/doc/release-notes/rl-1809.adoc b/home-manager/doc/release-notes/rl-1809.adoc
index b363704e241..b363704e241 100644
--- a/doc/release-notes/rl-1809.adoc
+++ b/home-manager/doc/release-notes/rl-1809.adoc
diff --git a/doc/release-notes/rl-1903.adoc b/home-manager/doc/release-notes/rl-1903.adoc
index 6dfdc67f5bf..6dfdc67f5bf 100644
--- a/doc/release-notes/rl-1903.adoc
+++ b/home-manager/doc/release-notes/rl-1903.adoc
diff --git a/doc/release-notes/rl-1909.adoc b/home-manager/doc/release-notes/rl-1909.adoc
index a33d629767e..a33d629767e 100644
--- a/doc/release-notes/rl-1909.adoc
+++ b/home-manager/doc/release-notes/rl-1909.adoc
diff --git a/home-manager/completion.bash b/home-manager/home-manager/completion.bash
index 501b87279fa..501b87279fa 100644
--- a/home-manager/completion.bash
+++ b/home-manager/home-manager/completion.bash
diff --git a/home-manager/home-manager/default.nix b/home-manager/home-manager/default.nix
new file mode 100644
index 00000000000..8b5ae75e0fd
--- /dev/null
+++ b/home-manager/home-manager/default.nix
@@ -0,0 +1,40 @@
+{ runCommand, lib, bash, coreutils, findutils, gnused, less
+
+  # Extra path to Home Manager. If set then this path will be tried
+  # before `$HOME/.config/nixpkgs/home-manager` and
+  # `$HOME/.nixpkgs/home-manager`.
+, path ? null
+}:
+
+let
+
+  pathStr = if path == null then "" else path;
+
+in
+
+runCommand
+  "home-manager"
+  {
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+    meta = with lib; {
+      description = "A user environment configurator";
+      maintainers = [ maintainers.rycee ];
+      platforms = platforms.unix;
+      license = licenses.mit;
+    };
+  }
+  ''
+    install -v -D -m755  ${./home-manager} $out/bin/home-manager
+
+    substituteInPlace $out/bin/home-manager \
+      --subst-var-by bash "${bash}" \
+      --subst-var-by coreutils "${coreutils}" \
+      --subst-var-by findutils "${findutils}" \
+      --subst-var-by gnused "${gnused}" \
+      --subst-var-by less "${less}" \
+      --subst-var-by HOME_MANAGER_PATH '${pathStr}'
+
+    install -D -m755 ${./completion.bash} \
+      $out/share/bash-completion/completions/home-manager
+  ''
diff --git a/home-manager/home-manager b/home-manager/home-manager/home-manager
index 6fe4f13c7f0..6fe4f13c7f0 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager/home-manager
diff --git a/home-manager/home-manager.nix b/home-manager/home-manager/home-manager.nix
index 7a6748942c8..7a6748942c8 100644
--- a/home-manager/home-manager.nix
+++ b/home-manager/home-manager/home-manager.nix
diff --git a/home-manager/install.nix b/home-manager/home-manager/install.nix
index c58c0ba7478..c58c0ba7478 100644
--- a/home-manager/install.nix
+++ b/home-manager/home-manager/install.nix
diff --git a/modules/accounts/email.nix b/home-manager/modules/accounts/email.nix
index cc9d0dc2813..cc9d0dc2813 100644
--- a/modules/accounts/email.nix
+++ b/home-manager/modules/accounts/email.nix
diff --git a/modules/default.nix b/home-manager/modules/default.nix
index 9f6404ff9cc..9f6404ff9cc 100644
--- a/modules/default.nix
+++ b/home-manager/modules/default.nix
diff --git a/modules/files.nix b/home-manager/modules/files.nix
index ac946976faf..ac946976faf 100644
--- a/modules/files.nix
+++ b/home-manager/modules/files.nix
diff --git a/modules/home-environment.nix b/home-manager/modules/home-environment.nix
index f12e86d4104..f12e86d4104 100644
--- a/modules/home-environment.nix
+++ b/home-manager/modules/home-environment.nix
diff --git a/modules/lib-bash/activation-init.sh b/home-manager/modules/lib-bash/activation-init.sh
index 5cdb66e5920..5cdb66e5920 100755
--- a/modules/lib-bash/activation-init.sh
+++ b/home-manager/modules/lib-bash/activation-init.sh
diff --git a/modules/lib-bash/color-echo.sh b/home-manager/modules/lib-bash/color-echo.sh
index ef708b29c4d..ef708b29c4d 100644
--- a/modules/lib-bash/color-echo.sh
+++ b/home-manager/modules/lib-bash/color-echo.sh
diff --git a/modules/lib/dag.nix b/home-manager/modules/lib/dag.nix
index 535dec35ad4..535dec35ad4 100644
--- a/modules/lib/dag.nix
+++ b/home-manager/modules/lib/dag.nix
diff --git a/modules/lib/default.nix b/home-manager/modules/lib/default.nix
index 754713cab5d..754713cab5d 100644
--- a/modules/lib/default.nix
+++ b/home-manager/modules/lib/default.nix
diff --git a/modules/lib/file-type.nix b/home-manager/modules/lib/file-type.nix
index efbb33b231d..efbb33b231d 100644
--- a/modules/lib/file-type.nix
+++ b/home-manager/modules/lib/file-type.nix
diff --git a/modules/lib/shell.nix b/home-manager/modules/lib/shell.nix
index f1443c5466a..f1443c5466a 100644
--- a/modules/lib/shell.nix
+++ b/home-manager/modules/lib/shell.nix
diff --git a/modules/lib/strings.nix b/home-manager/modules/lib/strings.nix
index 13d6bb03be6..13d6bb03be6 100644
--- a/modules/lib/strings.nix
+++ b/home-manager/modules/lib/strings.nix
diff --git a/modules/lib/types.nix b/home-manager/modules/lib/types.nix
index 1b514d20a82..1b514d20a82 100644
--- a/modules/lib/types.nix
+++ b/home-manager/modules/lib/types.nix
diff --git a/modules/lib/zsh.nix b/home-manager/modules/lib/zsh.nix
index 1d3e96b54bb..1d3e96b54bb 100644
--- a/modules/lib/zsh.nix
+++ b/home-manager/modules/lib/zsh.nix
diff --git a/modules/manual.nix b/home-manager/modules/manual.nix
index e4c127c0d47..e4c127c0d47 100644
--- a/modules/manual.nix
+++ b/home-manager/modules/manual.nix
diff --git a/modules/misc/dconf.nix b/home-manager/modules/misc/dconf.nix
index ef87f8972ff..ef87f8972ff 100644
--- a/modules/misc/dconf.nix
+++ b/home-manager/modules/misc/dconf.nix
diff --git a/modules/misc/fontconfig.nix b/home-manager/modules/misc/fontconfig.nix
index 8dbcce53c22..8dbcce53c22 100644
--- a/modules/misc/fontconfig.nix
+++ b/home-manager/modules/misc/fontconfig.nix
diff --git a/modules/misc/gtk.nix b/home-manager/modules/misc/gtk.nix
index 1222db4ecab..1222db4ecab 100644
--- a/modules/misc/gtk.nix
+++ b/home-manager/modules/misc/gtk.nix
diff --git a/modules/misc/lib.nix b/home-manager/modules/misc/lib.nix
index a0907545314..a0907545314 100644
--- a/modules/misc/lib.nix
+++ b/home-manager/modules/misc/lib.nix
diff --git a/modules/misc/news.nix b/home-manager/modules/misc/news.nix
index 4949b757fff..4949b757fff 100644
--- a/modules/misc/news.nix
+++ b/home-manager/modules/misc/news.nix
diff --git a/modules/misc/nixpkgs.nix b/home-manager/modules/misc/nixpkgs.nix
index e7c0d8f25ea..e7c0d8f25ea 100644
--- a/modules/misc/nixpkgs.nix
+++ b/home-manager/modules/misc/nixpkgs.nix
diff --git a/modules/misc/numlock.nix b/home-manager/modules/misc/numlock.nix
index 77149d123ec..77149d123ec 100644
--- a/modules/misc/numlock.nix
+++ b/home-manager/modules/misc/numlock.nix
diff --git a/modules/misc/pam.nix b/home-manager/modules/misc/pam.nix
index 6ace2bfdaac..6ace2bfdaac 100644
--- a/modules/misc/pam.nix
+++ b/home-manager/modules/misc/pam.nix
diff --git a/modules/misc/qt.nix b/home-manager/modules/misc/qt.nix
index 60de8774231..60de8774231 100644
--- a/modules/misc/qt.nix
+++ b/home-manager/modules/misc/qt.nix
diff --git a/modules/misc/submodule-support.nix b/home-manager/modules/misc/submodule-support.nix
index ff80291cadf..ff80291cadf 100644
--- a/modules/misc/submodule-support.nix
+++ b/home-manager/modules/misc/submodule-support.nix
diff --git a/modules/misc/version.nix b/home-manager/modules/misc/version.nix
index 18bb28f7603..18bb28f7603 100644
--- a/modules/misc/version.nix
+++ b/home-manager/modules/misc/version.nix
diff --git a/modules/misc/xdg-mime-apps.nix b/home-manager/modules/misc/xdg-mime-apps.nix
index 979c7ea48be..979c7ea48be 100644
--- a/modules/misc/xdg-mime-apps.nix
+++ b/home-manager/modules/misc/xdg-mime-apps.nix
diff --git a/modules/misc/xdg-user-dirs.nix b/home-manager/modules/misc/xdg-user-dirs.nix
index 4d034d7fe43..4d034d7fe43 100644
--- a/modules/misc/xdg-user-dirs.nix
+++ b/home-manager/modules/misc/xdg-user-dirs.nix
diff --git a/modules/misc/xdg.nix b/home-manager/modules/misc/xdg.nix
index 84ab4ada59a..84ab4ada59a 100644
--- a/modules/misc/xdg.nix
+++ b/home-manager/modules/misc/xdg.nix
diff --git a/modules/modules.nix b/home-manager/modules/modules.nix
index 2dc89ebc012..2dc89ebc012 100644
--- a/modules/modules.nix
+++ b/home-manager/modules/modules.nix
diff --git a/modules/programs/afew.nix b/home-manager/modules/programs/afew.nix
index 99bae88c0ee..99bae88c0ee 100644
--- a/modules/programs/afew.nix
+++ b/home-manager/modules/programs/afew.nix
diff --git a/modules/programs/alacritty.nix b/home-manager/modules/programs/alacritty.nix
index 84675cb1c8a..84675cb1c8a 100644
--- a/modules/programs/alacritty.nix
+++ b/home-manager/modules/programs/alacritty.nix
diff --git a/modules/programs/alot-accounts.nix b/home-manager/modules/programs/alot-accounts.nix
index 8f3ffdfb31e..8f3ffdfb31e 100644
--- a/modules/programs/alot-accounts.nix
+++ b/home-manager/modules/programs/alot-accounts.nix
diff --git a/modules/programs/alot.nix b/home-manager/modules/programs/alot.nix
index 2b28f34caa3..2b28f34caa3 100644
--- a/modules/programs/alot.nix
+++ b/home-manager/modules/programs/alot.nix
diff --git a/modules/programs/astroid-accounts.nix b/home-manager/modules/programs/astroid-accounts.nix
index bc94a301db0..bc94a301db0 100644
--- a/modules/programs/astroid-accounts.nix
+++ b/home-manager/modules/programs/astroid-accounts.nix
diff --git a/modules/programs/astroid-config-template.json b/home-manager/modules/programs/astroid-config-template.json
index 87e3f764f9c..87e3f764f9c 100644
--- a/modules/programs/astroid-config-template.json
+++ b/home-manager/modules/programs/astroid-config-template.json
diff --git a/modules/programs/astroid.nix b/home-manager/modules/programs/astroid.nix
index 0463cd15528..0463cd15528 100644
--- a/modules/programs/astroid.nix
+++ b/home-manager/modules/programs/astroid.nix
diff --git a/modules/programs/autorandr.nix b/home-manager/modules/programs/autorandr.nix
index 4514a5b5d58..4514a5b5d58 100644
--- a/modules/programs/autorandr.nix
+++ b/home-manager/modules/programs/autorandr.nix
diff --git a/modules/programs/bash.nix b/home-manager/modules/programs/bash.nix
index 82a9fbe8f8b..82a9fbe8f8b 100644
--- a/modules/programs/bash.nix
+++ b/home-manager/modules/programs/bash.nix
diff --git a/modules/programs/bat.nix b/home-manager/modules/programs/bat.nix
index 860c5e82f54..860c5e82f54 100644
--- a/modules/programs/bat.nix
+++ b/home-manager/modules/programs/bat.nix
diff --git a/modules/programs/beets.nix b/home-manager/modules/programs/beets.nix
index 152bfd304a4..152bfd304a4 100644
--- a/modules/programs/beets.nix
+++ b/home-manager/modules/programs/beets.nix
diff --git a/modules/programs/broot.nix b/home-manager/modules/programs/broot.nix
index f6d3cd7f920..f6d3cd7f920 100644
--- a/modules/programs/broot.nix
+++ b/home-manager/modules/programs/broot.nix
diff --git a/modules/programs/browserpass.nix b/home-manager/modules/programs/browserpass.nix
index 7af5e8f8756..7af5e8f8756 100644
--- a/modules/programs/browserpass.nix
+++ b/home-manager/modules/programs/browserpass.nix
diff --git a/modules/programs/chromium.nix b/home-manager/modules/programs/chromium.nix
index 83a827a0ed0..83a827a0ed0 100644
--- a/modules/programs/chromium.nix
+++ b/home-manager/modules/programs/chromium.nix
diff --git a/modules/programs/command-not-found/command-not-found.nix b/home-manager/modules/programs/command-not-found/command-not-found.nix
index 0053fe36ad7..0053fe36ad7 100644
--- a/modules/programs/command-not-found/command-not-found.nix
+++ b/home-manager/modules/programs/command-not-found/command-not-found.nix
diff --git a/modules/programs/command-not-found/command-not-found.pl b/home-manager/modules/programs/command-not-found/command-not-found.pl
index 997dfec649b..997dfec649b 100644
--- a/modules/programs/command-not-found/command-not-found.pl
+++ b/home-manager/modules/programs/command-not-found/command-not-found.pl
diff --git a/modules/programs/direnv.nix b/home-manager/modules/programs/direnv.nix
index e4c17239c58..e4c17239c58 100644
--- a/modules/programs/direnv.nix
+++ b/home-manager/modules/programs/direnv.nix
diff --git a/modules/programs/eclipse.nix b/home-manager/modules/programs/eclipse.nix
index 4a432c9fe1a..4a432c9fe1a 100644
--- a/modules/programs/eclipse.nix
+++ b/home-manager/modules/programs/eclipse.nix
diff --git a/modules/programs/emacs.nix b/home-manager/modules/programs/emacs.nix
index 78c136c9868..78c136c9868 100644
--- a/modules/programs/emacs.nix
+++ b/home-manager/modules/programs/emacs.nix
diff --git a/modules/programs/feh.nix b/home-manager/modules/programs/feh.nix
index 4342181fa4a..4342181fa4a 100644
--- a/modules/programs/feh.nix
+++ b/home-manager/modules/programs/feh.nix
diff --git a/modules/programs/firefox.nix b/home-manager/modules/programs/firefox.nix
index 708b05417d6..708b05417d6 100644
--- a/modules/programs/firefox.nix
+++ b/home-manager/modules/programs/firefox.nix
diff --git a/modules/programs/fish.nix b/home-manager/modules/programs/fish.nix
index 87a17b85507..87a17b85507 100644
--- a/modules/programs/fish.nix
+++ b/home-manager/modules/programs/fish.nix
diff --git a/modules/programs/fzf.nix b/home-manager/modules/programs/fzf.nix
index 832c0bfa3e4..832c0bfa3e4 100644
--- a/modules/programs/fzf.nix
+++ b/home-manager/modules/programs/fzf.nix
diff --git a/modules/programs/getmail-accounts.nix b/home-manager/modules/programs/getmail-accounts.nix
index 32e1312dc8f..32e1312dc8f 100644
--- a/modules/programs/getmail-accounts.nix
+++ b/home-manager/modules/programs/getmail-accounts.nix
diff --git a/modules/programs/getmail.nix b/home-manager/modules/programs/getmail.nix
index 8c1ac5e021e..8c1ac5e021e 100644
--- a/modules/programs/getmail.nix
+++ b/home-manager/modules/programs/getmail.nix
diff --git a/modules/programs/git.nix b/home-manager/modules/programs/git.nix
index 913f86f71ce..913f86f71ce 100644
--- a/modules/programs/git.nix
+++ b/home-manager/modules/programs/git.nix
diff --git a/modules/programs/gnome-terminal.nix b/home-manager/modules/programs/gnome-terminal.nix
index 9a44364491d..9a44364491d 100644
--- a/modules/programs/gnome-terminal.nix
+++ b/home-manager/modules/programs/gnome-terminal.nix
diff --git a/modules/programs/go.nix b/home-manager/modules/programs/go.nix
index 06c25c9b82a..06c25c9b82a 100644
--- a/modules/programs/go.nix
+++ b/home-manager/modules/programs/go.nix
diff --git a/modules/programs/gpg.nix b/home-manager/modules/programs/gpg.nix
index 4588c59c882..4588c59c882 100644
--- a/modules/programs/gpg.nix
+++ b/home-manager/modules/programs/gpg.nix
diff --git a/modules/programs/home-manager.nix b/home-manager/modules/programs/home-manager.nix
index 42e3c8a384f..42e3c8a384f 100644
--- a/modules/programs/home-manager.nix
+++ b/home-manager/modules/programs/home-manager.nix
diff --git a/modules/programs/htop.nix b/home-manager/modules/programs/htop.nix
index d700c4855fe..d700c4855fe 100644
--- a/modules/programs/htop.nix
+++ b/home-manager/modules/programs/htop.nix
diff --git a/modules/programs/info.nix b/home-manager/modules/programs/info.nix
index 93dcaf474af..93dcaf474af 100644
--- a/modules/programs/info.nix
+++ b/home-manager/modules/programs/info.nix
diff --git a/modules/programs/irssi.nix b/home-manager/modules/programs/irssi.nix
index fc8fa8e6132..fc8fa8e6132 100644
--- a/modules/programs/irssi.nix
+++ b/home-manager/modules/programs/irssi.nix
diff --git a/modules/programs/jq.nix b/home-manager/modules/programs/jq.nix
index 56c3adf0654..56c3adf0654 100644
--- a/modules/programs/jq.nix
+++ b/home-manager/modules/programs/jq.nix
diff --git a/modules/programs/kakoune.nix b/home-manager/modules/programs/kakoune.nix
index e48f0e295a8..e48f0e295a8 100644
--- a/modules/programs/kakoune.nix
+++ b/home-manager/modules/programs/kakoune.nix
diff --git a/modules/programs/keychain.nix b/home-manager/modules/programs/keychain.nix
index 6dbf83a872e..6dbf83a872e 100644
--- a/modules/programs/keychain.nix
+++ b/home-manager/modules/programs/keychain.nix
diff --git a/modules/programs/lesspipe.nix b/home-manager/modules/programs/lesspipe.nix
index a7a51ffe2a2..a7a51ffe2a2 100644
--- a/modules/programs/lesspipe.nix
+++ b/home-manager/modules/programs/lesspipe.nix
diff --git a/modules/programs/lsd.nix b/home-manager/modules/programs/lsd.nix
index 5e145e8c69b..5e145e8c69b 100644
--- a/modules/programs/lsd.nix
+++ b/home-manager/modules/programs/lsd.nix
diff --git a/modules/programs/man.nix b/home-manager/modules/programs/man.nix
index 0ed376780d4..0ed376780d4 100644
--- a/modules/programs/man.nix
+++ b/home-manager/modules/programs/man.nix
diff --git a/modules/programs/matplotlib.nix b/home-manager/modules/programs/matplotlib.nix
index 48ff6e60d68..48ff6e60d68 100644
--- a/modules/programs/matplotlib.nix
+++ b/home-manager/modules/programs/matplotlib.nix
diff --git a/modules/programs/mbsync-accounts.nix b/home-manager/modules/programs/mbsync-accounts.nix
index c586481df4d..c586481df4d 100644
--- a/modules/programs/mbsync-accounts.nix
+++ b/home-manager/modules/programs/mbsync-accounts.nix
diff --git a/modules/programs/mbsync.nix b/home-manager/modules/programs/mbsync.nix
index 908a1add715..908a1add715 100644
--- a/modules/programs/mbsync.nix
+++ b/home-manager/modules/programs/mbsync.nix
diff --git a/modules/programs/mercurial.nix b/home-manager/modules/programs/mercurial.nix
index fa6e7b3e5ba..fa6e7b3e5ba 100644
--- a/modules/programs/mercurial.nix
+++ b/home-manager/modules/programs/mercurial.nix
diff --git a/modules/programs/mpv.nix b/home-manager/modules/programs/mpv.nix
index 1051f71ccd6..1051f71ccd6 100644
--- a/modules/programs/mpv.nix
+++ b/home-manager/modules/programs/mpv.nix
diff --git a/modules/programs/msmtp-accounts.nix b/home-manager/modules/programs/msmtp-accounts.nix
index 277710f4cba..277710f4cba 100644
--- a/modules/programs/msmtp-accounts.nix
+++ b/home-manager/modules/programs/msmtp-accounts.nix
diff --git a/modules/programs/msmtp.nix b/home-manager/modules/programs/msmtp.nix
index 1ff3139ef36..1ff3139ef36 100644
--- a/modules/programs/msmtp.nix
+++ b/home-manager/modules/programs/msmtp.nix
diff --git a/modules/programs/neovim.nix b/home-manager/modules/programs/neovim.nix
index dadda2c7118..dadda2c7118 100644
--- a/modules/programs/neovim.nix
+++ b/home-manager/modules/programs/neovim.nix
diff --git a/modules/programs/newsboat.nix b/home-manager/modules/programs/newsboat.nix
index 84c64dfa607..84c64dfa607 100644
--- a/modules/programs/newsboat.nix
+++ b/home-manager/modules/programs/newsboat.nix
diff --git a/modules/programs/noti.nix b/home-manager/modules/programs/noti.nix
index 476c2eb1978..476c2eb1978 100644
--- a/modules/programs/noti.nix
+++ b/home-manager/modules/programs/noti.nix
diff --git a/modules/programs/notmuch-accounts.nix b/home-manager/modules/programs/notmuch-accounts.nix
index 7c9c93d3f95..7c9c93d3f95 100644
--- a/modules/programs/notmuch-accounts.nix
+++ b/home-manager/modules/programs/notmuch-accounts.nix
diff --git a/modules/programs/notmuch.nix b/home-manager/modules/programs/notmuch.nix
index cd0b1384ad9..cd0b1384ad9 100644
--- a/modules/programs/notmuch.nix
+++ b/home-manager/modules/programs/notmuch.nix
diff --git a/modules/programs/obs-studio.nix b/home-manager/modules/programs/obs-studio.nix
index f0dfecb63cc..f0dfecb63cc 100644
--- a/modules/programs/obs-studio.nix
+++ b/home-manager/modules/programs/obs-studio.nix
diff --git a/modules/programs/offlineimap-accounts.nix b/home-manager/modules/programs/offlineimap-accounts.nix
index 015a5974ab3..015a5974ab3 100644
--- a/modules/programs/offlineimap-accounts.nix
+++ b/home-manager/modules/programs/offlineimap-accounts.nix
diff --git a/modules/programs/offlineimap.nix b/home-manager/modules/programs/offlineimap.nix
index 82143b630ad..82143b630ad 100644
--- a/modules/programs/offlineimap.nix
+++ b/home-manager/modules/programs/offlineimap.nix
diff --git a/modules/programs/opam.nix b/home-manager/modules/programs/opam.nix
index 4de2e82da55..4de2e82da55 100644
--- a/modules/programs/opam.nix
+++ b/home-manager/modules/programs/opam.nix
diff --git a/modules/programs/pidgin.nix b/home-manager/modules/programs/pidgin.nix
index 8dcb2122172..8dcb2122172 100644
--- a/modules/programs/pidgin.nix
+++ b/home-manager/modules/programs/pidgin.nix
diff --git a/modules/programs/rofi.nix b/home-manager/modules/programs/rofi.nix
index e64e5d4782e..e64e5d4782e 100644
--- a/modules/programs/rofi.nix
+++ b/home-manager/modules/programs/rofi.nix
diff --git a/modules/programs/rtorrent.nix b/home-manager/modules/programs/rtorrent.nix
index 6300969a519..6300969a519 100644
--- a/modules/programs/rtorrent.nix
+++ b/home-manager/modules/programs/rtorrent.nix
diff --git a/modules/programs/skim.nix b/home-manager/modules/programs/skim.nix
index de1bff30fce..de1bff30fce 100644
--- a/modules/programs/skim.nix
+++ b/home-manager/modules/programs/skim.nix
diff --git a/modules/programs/ssh.nix b/home-manager/modules/programs/ssh.nix
index ab61c0dcbc4..ab61c0dcbc4 100644
--- a/modules/programs/ssh.nix
+++ b/home-manager/modules/programs/ssh.nix
diff --git a/modules/programs/starship.nix b/home-manager/modules/programs/starship.nix
index 81793c7a6f6..81793c7a6f6 100644
--- a/modules/programs/starship.nix
+++ b/home-manager/modules/programs/starship.nix
diff --git a/modules/programs/taskwarrior.nix b/home-manager/modules/programs/taskwarrior.nix
index eeacc77da29..eeacc77da29 100644
--- a/modules/programs/taskwarrior.nix
+++ b/home-manager/modules/programs/taskwarrior.nix
diff --git a/modules/programs/termite.nix b/home-manager/modules/programs/termite.nix
index 6eab39edb3a..6eab39edb3a 100644
--- a/modules/programs/termite.nix
+++ b/home-manager/modules/programs/termite.nix
diff --git a/modules/programs/texlive.nix b/home-manager/modules/programs/texlive.nix
index 0f8953e9f91..0f8953e9f91 100644
--- a/modules/programs/texlive.nix
+++ b/home-manager/modules/programs/texlive.nix
diff --git a/modules/programs/tmux.nix b/home-manager/modules/programs/tmux.nix
index 766bc6238ba..766bc6238ba 100644
--- a/modules/programs/tmux.nix
+++ b/home-manager/modules/programs/tmux.nix
diff --git a/modules/programs/urxvt.nix b/home-manager/modules/programs/urxvt.nix
index 6f4eb3ff7ba..6f4eb3ff7ba 100644
--- a/modules/programs/urxvt.nix
+++ b/home-manager/modules/programs/urxvt.nix
diff --git a/modules/programs/vim.nix b/home-manager/modules/programs/vim.nix
index a14a9562ac1..a14a9562ac1 100644
--- a/modules/programs/vim.nix
+++ b/home-manager/modules/programs/vim.nix
diff --git a/modules/programs/vscode.nix b/home-manager/modules/programs/vscode.nix
index 3a82816f588..3a82816f588 100644
--- a/modules/programs/vscode.nix
+++ b/home-manager/modules/programs/vscode.nix
diff --git a/modules/programs/vscode/haskell.nix b/home-manager/modules/programs/vscode/haskell.nix
index c8ea10d473e..c8ea10d473e 100644
--- a/modules/programs/vscode/haskell.nix
+++ b/home-manager/modules/programs/vscode/haskell.nix
diff --git a/modules/programs/z-lua.nix b/home-manager/modules/programs/z-lua.nix
index 245eff6a51e..245eff6a51e 100644
--- a/modules/programs/z-lua.nix
+++ b/home-manager/modules/programs/z-lua.nix
diff --git a/modules/programs/zathura.nix b/home-manager/modules/programs/zathura.nix
index f01bd501c39..f01bd501c39 100644
--- a/modules/programs/zathura.nix
+++ b/home-manager/modules/programs/zathura.nix
diff --git a/modules/programs/zsh.nix b/home-manager/modules/programs/zsh.nix
index ffe5f4960b6..ffe5f4960b6 100644
--- a/modules/programs/zsh.nix
+++ b/home-manager/modules/programs/zsh.nix
diff --git a/modules/services/blueman-applet.nix b/home-manager/modules/services/blueman-applet.nix
index 186dc7454f9..186dc7454f9 100644
--- a/modules/services/blueman-applet.nix
+++ b/home-manager/modules/services/blueman-applet.nix
diff --git a/modules/services/compton.nix b/home-manager/modules/services/compton.nix
index c227f0a8c07..c227f0a8c07 100644
--- a/modules/services/compton.nix
+++ b/home-manager/modules/services/compton.nix
diff --git a/modules/services/dunst.nix b/home-manager/modules/services/dunst.nix
index 96b1f71a2fa..96b1f71a2fa 100644
--- a/modules/services/dunst.nix
+++ b/home-manager/modules/services/dunst.nix
diff --git a/modules/services/dwm-status.nix b/home-manager/modules/services/dwm-status.nix
index 2b010cec1e1..2b010cec1e1 100644
--- a/modules/services/dwm-status.nix
+++ b/home-manager/modules/services/dwm-status.nix
diff --git a/modules/services/emacs.nix b/home-manager/modules/services/emacs.nix
index 33d6871c61b..33d6871c61b 100644
--- a/modules/services/emacs.nix
+++ b/home-manager/modules/services/emacs.nix
diff --git a/modules/services/flameshot.nix b/home-manager/modules/services/flameshot.nix
index 87b494d0fcd..87b494d0fcd 100644
--- a/modules/services/flameshot.nix
+++ b/home-manager/modules/services/flameshot.nix
diff --git a/modules/services/getmail.nix b/home-manager/modules/services/getmail.nix
index 46d4c1752d4..46d4c1752d4 100644
--- a/modules/services/getmail.nix
+++ b/home-manager/modules/services/getmail.nix
diff --git a/modules/services/gnome-keyring.nix b/home-manager/modules/services/gnome-keyring.nix
index 4ca6c7cacf2..4ca6c7cacf2 100644
--- a/modules/services/gnome-keyring.nix
+++ b/home-manager/modules/services/gnome-keyring.nix
diff --git a/modules/services/gpg-agent.nix b/home-manager/modules/services/gpg-agent.nix
index 5dc942fef63..5dc942fef63 100644
--- a/modules/services/gpg-agent.nix
+++ b/home-manager/modules/services/gpg-agent.nix
diff --git a/modules/services/hound.nix b/home-manager/modules/services/hound.nix
index a252a68d271..a252a68d271 100644
--- a/modules/services/hound.nix
+++ b/home-manager/modules/services/hound.nix
diff --git a/modules/services/imapnotify-accounts.nix b/home-manager/modules/services/imapnotify-accounts.nix
index 1c780bf28c3..1c780bf28c3 100644
--- a/modules/services/imapnotify-accounts.nix
+++ b/home-manager/modules/services/imapnotify-accounts.nix
diff --git a/modules/services/imapnotify.nix b/home-manager/modules/services/imapnotify.nix
index fbb0713e978..fbb0713e978 100644
--- a/modules/services/imapnotify.nix
+++ b/home-manager/modules/services/imapnotify.nix
diff --git a/modules/services/kbfs.nix b/home-manager/modules/services/kbfs.nix
index 863f4feea3b..863f4feea3b 100644
--- a/modules/services/kbfs.nix
+++ b/home-manager/modules/services/kbfs.nix
diff --git a/modules/services/kdeconnect.nix b/home-manager/modules/services/kdeconnect.nix
index bd698fcf836..bd698fcf836 100644
--- a/modules/services/kdeconnect.nix
+++ b/home-manager/modules/services/kdeconnect.nix
diff --git a/modules/services/keepassx.nix b/home-manager/modules/services/keepassx.nix
index ad791786f05..ad791786f05 100644
--- a/modules/services/keepassx.nix
+++ b/home-manager/modules/services/keepassx.nix
diff --git a/modules/services/keybase.nix b/home-manager/modules/services/keybase.nix
index 2d0a06b06a7..2d0a06b06a7 100644
--- a/modules/services/keybase.nix
+++ b/home-manager/modules/services/keybase.nix
diff --git a/modules/services/mbsync.nix b/home-manager/modules/services/mbsync.nix
index 73c3b326695..73c3b326695 100644
--- a/modules/services/mbsync.nix
+++ b/home-manager/modules/services/mbsync.nix
diff --git a/modules/services/mpd.nix b/home-manager/modules/services/mpd.nix
index 2aa1cd3a9fe..2aa1cd3a9fe 100644
--- a/modules/services/mpd.nix
+++ b/home-manager/modules/services/mpd.nix
diff --git a/modules/services/mpdris2.nix b/home-manager/modules/services/mpdris2.nix
index 450f84c5912..450f84c5912 100644
--- a/modules/services/mpdris2.nix
+++ b/home-manager/modules/services/mpdris2.nix
diff --git a/modules/services/muchsync.nix b/home-manager/modules/services/muchsync.nix
index 72bf737c27d..72bf737c27d 100644
--- a/modules/services/muchsync.nix
+++ b/home-manager/modules/services/muchsync.nix
diff --git a/modules/services/network-manager-applet.nix b/home-manager/modules/services/network-manager-applet.nix
index 72a4711e39a..72a4711e39a 100644
--- a/modules/services/network-manager-applet.nix
+++ b/home-manager/modules/services/network-manager-applet.nix
diff --git a/modules/services/nextcloud-client.nix b/home-manager/modules/services/nextcloud-client.nix
index 3d8dc0bc80b..3d8dc0bc80b 100644
--- a/modules/services/nextcloud-client.nix
+++ b/home-manager/modules/services/nextcloud-client.nix
diff --git a/modules/services/owncloud-client.nix b/home-manager/modules/services/owncloud-client.nix
index d98a508f088..d98a508f088 100644
--- a/modules/services/owncloud-client.nix
+++ b/home-manager/modules/services/owncloud-client.nix
diff --git a/modules/services/parcellite.nix b/home-manager/modules/services/parcellite.nix
index 455989ffe07..455989ffe07 100644
--- a/modules/services/parcellite.nix
+++ b/home-manager/modules/services/parcellite.nix
diff --git a/modules/services/pasystray.nix b/home-manager/modules/services/pasystray.nix
index 8f92f34c091..8f92f34c091 100644
--- a/modules/services/pasystray.nix
+++ b/home-manager/modules/services/pasystray.nix
diff --git a/modules/services/polybar.nix b/home-manager/modules/services/polybar.nix
index 4225ed9b38c..4225ed9b38c 100644
--- a/modules/services/polybar.nix
+++ b/home-manager/modules/services/polybar.nix
diff --git a/modules/services/random-background.nix b/home-manager/modules/services/random-background.nix
index cbec97ae7cb..cbec97ae7cb 100644
--- a/modules/services/random-background.nix
+++ b/home-manager/modules/services/random-background.nix
diff --git a/modules/services/redshift.nix b/home-manager/modules/services/redshift.nix
index 1452fcc95ed..1452fcc95ed 100644
--- a/modules/services/redshift.nix
+++ b/home-manager/modules/services/redshift.nix
diff --git a/modules/services/rsibreak.nix b/home-manager/modules/services/rsibreak.nix
index 242e03432e8..242e03432e8 100644
--- a/modules/services/rsibreak.nix
+++ b/home-manager/modules/services/rsibreak.nix
diff --git a/modules/services/screen-locker.nix b/home-manager/modules/services/screen-locker.nix
index e3da14069bc..e3da14069bc 100644
--- a/modules/services/screen-locker.nix
+++ b/home-manager/modules/services/screen-locker.nix
diff --git a/modules/services/stalonetray.nix b/home-manager/modules/services/stalonetray.nix
index 934e78c99a1..934e78c99a1 100644
--- a/modules/services/stalonetray.nix
+++ b/home-manager/modules/services/stalonetray.nix
diff --git a/modules/services/status-notifier-watcher.nix b/home-manager/modules/services/status-notifier-watcher.nix
index 8a2ded8720a..8a2ded8720a 100644
--- a/modules/services/status-notifier-watcher.nix
+++ b/home-manager/modules/services/status-notifier-watcher.nix
diff --git a/modules/services/sxhkd.nix b/home-manager/modules/services/sxhkd.nix
index d9f0a968515..d9f0a968515 100644
--- a/modules/services/sxhkd.nix
+++ b/home-manager/modules/services/sxhkd.nix
diff --git a/modules/services/syncthing.nix b/home-manager/modules/services/syncthing.nix
index 7fc556c5234..7fc556c5234 100644
--- a/modules/services/syncthing.nix
+++ b/home-manager/modules/services/syncthing.nix
diff --git a/modules/services/taffybar.nix b/home-manager/modules/services/taffybar.nix
index 69531a19dc9..69531a19dc9 100644
--- a/modules/services/taffybar.nix
+++ b/home-manager/modules/services/taffybar.nix
diff --git a/modules/services/tahoe-lafs.nix b/home-manager/modules/services/tahoe-lafs.nix
index bb7be8d7db9..bb7be8d7db9 100644
--- a/modules/services/tahoe-lafs.nix
+++ b/home-manager/modules/services/tahoe-lafs.nix
diff --git a/modules/services/taskwarrior-sync.nix b/home-manager/modules/services/taskwarrior-sync.nix
index 4179ac8aa85..4179ac8aa85 100644
--- a/modules/services/taskwarrior-sync.nix
+++ b/home-manager/modules/services/taskwarrior-sync.nix
diff --git a/modules/services/udiskie.nix b/home-manager/modules/services/udiskie.nix
index c058a23de6c..c058a23de6c 100644
--- a/modules/services/udiskie.nix
+++ b/home-manager/modules/services/udiskie.nix
diff --git a/modules/services/unclutter.nix b/home-manager/modules/services/unclutter.nix
index 6b5ac866ec5..6b5ac866ec5 100644
--- a/modules/services/unclutter.nix
+++ b/home-manager/modules/services/unclutter.nix
diff --git a/modules/services/window-managers/awesome.nix b/home-manager/modules/services/window-managers/awesome.nix
index fe914864e2a..fe914864e2a 100644
--- a/modules/services/window-managers/awesome.nix
+++ b/home-manager/modules/services/window-managers/awesome.nix
diff --git a/modules/services/window-managers/i3.nix b/home-manager/modules/services/window-managers/i3.nix
index 6c52ff6c335..6c52ff6c335 100644
--- a/modules/services/window-managers/i3.nix
+++ b/home-manager/modules/services/window-managers/i3.nix
diff --git a/modules/services/window-managers/xmonad.nix b/home-manager/modules/services/window-managers/xmonad.nix
index 6b3426b963b..6b3426b963b 100644
--- a/modules/services/window-managers/xmonad.nix
+++ b/home-manager/modules/services/window-managers/xmonad.nix
diff --git a/modules/services/xcape.nix b/home-manager/modules/services/xcape.nix
index 26115a93062..26115a93062 100644
--- a/modules/services/xcape.nix
+++ b/home-manager/modules/services/xcape.nix
diff --git a/modules/services/xembed-sni-proxy.nix b/home-manager/modules/services/xembed-sni-proxy.nix
index d9e5ae783f9..d9e5ae783f9 100644
--- a/modules/services/xembed-sni-proxy.nix
+++ b/home-manager/modules/services/xembed-sni-proxy.nix
diff --git a/modules/services/xscreensaver.nix b/home-manager/modules/services/xscreensaver.nix
index 4001c294e86..4001c294e86 100644
--- a/modules/services/xscreensaver.nix
+++ b/home-manager/modules/services/xscreensaver.nix
diff --git a/modules/services/xsuspender.nix b/home-manager/modules/services/xsuspender.nix
index 22a5ca536a5..22a5ca536a5 100644
--- a/modules/services/xsuspender.nix
+++ b/home-manager/modules/services/xsuspender.nix
diff --git a/modules/systemd-activate.rb b/home-manager/modules/systemd-activate.rb
index 8382c840e93..8382c840e93 100644
--- a/modules/systemd-activate.rb
+++ b/home-manager/modules/systemd-activate.rb
diff --git a/modules/systemd-activate.sh b/home-manager/modules/systemd-activate.sh
index 1c464693cfc..1c464693cfc 100644
--- a/modules/systemd-activate.sh
+++ b/home-manager/modules/systemd-activate.sh
diff --git a/modules/systemd.nix b/home-manager/modules/systemd.nix
index cdc4486f542..cdc4486f542 100644
--- a/modules/systemd.nix
+++ b/home-manager/modules/systemd.nix
diff --git a/modules/xcursor.nix b/home-manager/modules/xcursor.nix
index 171586028cd..171586028cd 100644
--- a/modules/xcursor.nix
+++ b/home-manager/modules/xcursor.nix
diff --git a/modules/xresources.nix b/home-manager/modules/xresources.nix
index 384008e2450..384008e2450 100644
--- a/modules/xresources.nix
+++ b/home-manager/modules/xresources.nix
diff --git a/modules/xsession.nix b/home-manager/modules/xsession.nix
index e1cf9942e7c..e1cf9942e7c 100644
--- a/modules/xsession.nix
+++ b/home-manager/modules/xsession.nix
diff --git a/nix-darwin/default.nix b/home-manager/nix-darwin/default.nix
index 1482c7bb245..1482c7bb245 100644
--- a/nix-darwin/default.nix
+++ b/home-manager/nix-darwin/default.nix
diff --git a/nixos/default.nix b/home-manager/nixos/default.nix
index f53b4d4d6b7..f53b4d4d6b7 100644
--- a/nixos/default.nix
+++ b/home-manager/nixos/default.nix
diff --git a/overlay.nix b/home-manager/overlay.nix
index fa779fe0370..fa779fe0370 100644
--- a/overlay.nix
+++ b/home-manager/overlay.nix
diff --git a/tests/default.nix b/home-manager/tests/default.nix
index 4bda0474f88..4bda0474f88 100644
--- a/tests/default.nix
+++ b/home-manager/tests/default.nix
diff --git a/tests/modules/accounts/email-test-accounts.nix b/home-manager/tests/modules/accounts/email-test-accounts.nix
index 9c9c90cf8fe..9c9c90cf8fe 100644
--- a/tests/modules/accounts/email-test-accounts.nix
+++ b/home-manager/tests/modules/accounts/email-test-accounts.nix
diff --git a/tests/modules/files/.hidden b/home-manager/tests/modules/files/.hidden
index ca05448e7a0..ca05448e7a0 100644
--- a/tests/modules/files/.hidden
+++ b/home-manager/tests/modules/files/.hidden
diff --git a/tests/modules/files/executable.nix b/home-manager/tests/modules/files/executable.nix
index b286c2b499f..b286c2b499f 100644
--- a/tests/modules/files/executable.nix
+++ b/home-manager/tests/modules/files/executable.nix
diff --git a/tests/modules/files/hidden-source.nix b/home-manager/tests/modules/files/hidden-source.nix
index a8635398f48..a8635398f48 100644
--- a/tests/modules/files/hidden-source.nix
+++ b/home-manager/tests/modules/files/hidden-source.nix
diff --git a/tests/modules/files/source with spaces! b/home-manager/tests/modules/files/source with spaces!
index e1ace404174..e1ace404174 100644
--- a/tests/modules/files/source with spaces!
+++ b/home-manager/tests/modules/files/source with spaces!
diff --git a/tests/modules/files/source-with-spaces.nix b/home-manager/tests/modules/files/source-with-spaces.nix
index 1d593c64256..1d593c64256 100644
--- a/tests/modules/files/source-with-spaces.nix
+++ b/home-manager/tests/modules/files/source-with-spaces.nix
diff --git a/tests/modules/files/text-expected.txt b/home-manager/tests/modules/files/text-expected.txt
index b3a0ff2db12..b3a0ff2db12 100644
--- a/tests/modules/files/text-expected.txt
+++ b/home-manager/tests/modules/files/text-expected.txt
diff --git a/tests/modules/files/text.nix b/home-manager/tests/modules/files/text.nix
index 6fc9a26fcb4..6fc9a26fcb4 100644
--- a/tests/modules/files/text.nix
+++ b/home-manager/tests/modules/files/text.nix
diff --git a/tests/modules/home-environment/default.nix b/home-manager/tests/modules/home-environment/default.nix
index 2a1201a2f0a..2a1201a2f0a 100644
--- a/tests/modules/home-environment/default.nix
+++ b/home-manager/tests/modules/home-environment/default.nix
diff --git a/tests/modules/home-environment/session-variables-expected.txt b/home-manager/tests/modules/home-environment/session-variables-expected.txt
index 5c3868c3901..5c3868c3901 100644
--- a/tests/modules/home-environment/session-variables-expected.txt
+++ b/home-manager/tests/modules/home-environment/session-variables-expected.txt
diff --git a/tests/modules/home-environment/session-variables.nix b/home-manager/tests/modules/home-environment/session-variables.nix
index 9f326ebc1b8..9f326ebc1b8 100644
--- a/tests/modules/home-environment/session-variables.nix
+++ b/home-manager/tests/modules/home-environment/session-variables.nix
diff --git a/tests/modules/misc/fontconfig/default.nix b/home-manager/tests/modules/misc/fontconfig/default.nix
index b669e1c343c..b669e1c343c 100644
--- a/tests/modules/misc/fontconfig/default.nix
+++ b/home-manager/tests/modules/misc/fontconfig/default.nix
diff --git a/tests/modules/misc/fontconfig/multiple-font-packages.nix b/home-manager/tests/modules/misc/fontconfig/multiple-font-packages.nix
index 3845b4ba4b1..3845b4ba4b1 100644
--- a/tests/modules/misc/fontconfig/multiple-font-packages.nix
+++ b/home-manager/tests/modules/misc/fontconfig/multiple-font-packages.nix
diff --git a/tests/modules/misc/fontconfig/no-font-package.nix b/home-manager/tests/modules/misc/fontconfig/no-font-package.nix
index c4c687a1320..c4c687a1320 100644
--- a/tests/modules/misc/fontconfig/no-font-package.nix
+++ b/home-manager/tests/modules/misc/fontconfig/no-font-package.nix
diff --git a/tests/modules/misc/fontconfig/single-font-package.nix b/home-manager/tests/modules/misc/fontconfig/single-font-package.nix
index b70bdf8a9a7..b70bdf8a9a7 100644
--- a/tests/modules/misc/fontconfig/single-font-package.nix
+++ b/home-manager/tests/modules/misc/fontconfig/single-font-package.nix
diff --git a/tests/modules/misc/pam/default.nix b/home-manager/tests/modules/misc/pam/default.nix
index 8a64f831caf..8a64f831caf 100644
--- a/tests/modules/misc/pam/default.nix
+++ b/home-manager/tests/modules/misc/pam/default.nix
diff --git a/tests/modules/misc/pam/session-variables-expected.txt b/home-manager/tests/modules/misc/pam/session-variables-expected.txt
index b84a12b7675..b84a12b7675 100644
--- a/tests/modules/misc/pam/session-variables-expected.txt
+++ b/home-manager/tests/modules/misc/pam/session-variables-expected.txt
diff --git a/tests/modules/misc/pam/session-variables.nix b/home-manager/tests/modules/misc/pam/session-variables.nix
index 4fbec4163b5..4fbec4163b5 100644
--- a/tests/modules/misc/pam/session-variables.nix
+++ b/home-manager/tests/modules/misc/pam/session-variables.nix
diff --git a/tests/modules/misc/xdg/default.nix b/home-manager/tests/modules/misc/xdg/default.nix
index 5772becd712..5772becd712 100644
--- a/tests/modules/misc/xdg/default.nix
+++ b/home-manager/tests/modules/misc/xdg/default.nix
diff --git a/tests/modules/misc/xdg/mime-apps-basics-expected.ini b/home-manager/tests/modules/misc/xdg/mime-apps-basics-expected.ini
index c27181eb58f..c27181eb58f 100644
--- a/tests/modules/misc/xdg/mime-apps-basics-expected.ini
+++ b/home-manager/tests/modules/misc/xdg/mime-apps-basics-expected.ini
diff --git a/tests/modules/misc/xdg/mime-apps-basics.nix b/home-manager/tests/modules/misc/xdg/mime-apps-basics.nix
index 2c32071064c..2c32071064c 100644
--- a/tests/modules/misc/xdg/mime-apps-basics.nix
+++ b/home-manager/tests/modules/misc/xdg/mime-apps-basics.nix
diff --git a/tests/modules/misc/xsession/basic-setxkbmap-expected.service b/home-manager/tests/modules/misc/xsession/basic-setxkbmap-expected.service
index 39f876dd60e..39f876dd60e 100644
--- a/tests/modules/misc/xsession/basic-setxkbmap-expected.service
+++ b/home-manager/tests/modules/misc/xsession/basic-setxkbmap-expected.service
diff --git a/tests/modules/misc/xsession/basic-xprofile-expected.txt b/home-manager/tests/modules/misc/xsession/basic-xprofile-expected.txt
index 05733a974ff..05733a974ff 100644
--- a/tests/modules/misc/xsession/basic-xprofile-expected.txt
+++ b/home-manager/tests/modules/misc/xsession/basic-xprofile-expected.txt
diff --git a/tests/modules/misc/xsession/basic-xsession-expected.txt b/home-manager/tests/modules/misc/xsession/basic-xsession-expected.txt
index c11b7c33048..c11b7c33048 100644
--- a/tests/modules/misc/xsession/basic-xsession-expected.txt
+++ b/home-manager/tests/modules/misc/xsession/basic-xsession-expected.txt
diff --git a/tests/modules/misc/xsession/basic.nix b/home-manager/tests/modules/misc/xsession/basic.nix
index 60623d1bf6b..60623d1bf6b 100644
--- a/tests/modules/misc/xsession/basic.nix
+++ b/home-manager/tests/modules/misc/xsession/basic.nix
diff --git a/tests/modules/misc/xsession/default.nix b/home-manager/tests/modules/misc/xsession/default.nix
index 2ddbf47efac..2ddbf47efac 100644
--- a/tests/modules/misc/xsession/default.nix
+++ b/home-manager/tests/modules/misc/xsession/default.nix
diff --git a/tests/modules/misc/xsession/keyboard-without-layout-expected.service b/home-manager/tests/modules/misc/xsession/keyboard-without-layout-expected.service
index a04af53dad7..a04af53dad7 100644
--- a/tests/modules/misc/xsession/keyboard-without-layout-expected.service
+++ b/home-manager/tests/modules/misc/xsession/keyboard-without-layout-expected.service
diff --git a/tests/modules/misc/xsession/keyboard-without-layout.nix b/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix
index b7eb3decebb..b7eb3decebb 100644
--- a/tests/modules/misc/xsession/keyboard-without-layout.nix
+++ b/home-manager/tests/modules/misc/xsession/keyboard-without-layout.nix
diff --git a/tests/modules/programs/alacritty/default.nix b/home-manager/tests/modules/programs/alacritty/default.nix
index f63e033d846..f63e033d846 100644
--- a/tests/modules/programs/alacritty/default.nix
+++ b/home-manager/tests/modules/programs/alacritty/default.nix
diff --git a/tests/modules/programs/alacritty/empty-settings.nix b/home-manager/tests/modules/programs/alacritty/empty-settings.nix
index f3f8486ad3d..f3f8486ad3d 100644
--- a/tests/modules/programs/alacritty/empty-settings.nix
+++ b/home-manager/tests/modules/programs/alacritty/empty-settings.nix
diff --git a/tests/modules/programs/alacritty/example-settings-expected.yml b/home-manager/tests/modules/programs/alacritty/example-settings-expected.yml
index 061624192c3..061624192c3 100644
--- a/tests/modules/programs/alacritty/example-settings-expected.yml
+++ b/home-manager/tests/modules/programs/alacritty/example-settings-expected.yml
diff --git a/tests/modules/programs/alacritty/example-settings.nix b/home-manager/tests/modules/programs/alacritty/example-settings.nix
index 2c84710d100..2c84710d100 100644
--- a/tests/modules/programs/alacritty/example-settings.nix
+++ b/home-manager/tests/modules/programs/alacritty/example-settings.nix
diff --git a/tests/modules/programs/bash/default.nix b/home-manager/tests/modules/programs/bash/default.nix
index e9f431cd2b9..e9f431cd2b9 100644
--- a/tests/modules/programs/bash/default.nix
+++ b/home-manager/tests/modules/programs/bash/default.nix
diff --git a/tests/modules/programs/bash/logout-expected.txt b/home-manager/tests/modules/programs/bash/logout-expected.txt
index 9462f58f732..9462f58f732 100644
--- a/tests/modules/programs/bash/logout-expected.txt
+++ b/home-manager/tests/modules/programs/bash/logout-expected.txt
diff --git a/tests/modules/programs/bash/logout.nix b/home-manager/tests/modules/programs/bash/logout.nix
index 8f96dc7e1ae..8f96dc7e1ae 100644
--- a/tests/modules/programs/bash/logout.nix
+++ b/home-manager/tests/modules/programs/bash/logout.nix
diff --git a/tests/modules/programs/bash/session-variables-expected.txt b/home-manager/tests/modules/programs/bash/session-variables-expected.txt
index c586477ec4d..c586477ec4d 100644
--- a/tests/modules/programs/bash/session-variables-expected.txt
+++ b/home-manager/tests/modules/programs/bash/session-variables-expected.txt
diff --git a/tests/modules/programs/bash/session-variables.nix b/home-manager/tests/modules/programs/bash/session-variables.nix
index a7a69a2a1f8..a7a69a2a1f8 100644
--- a/tests/modules/programs/bash/session-variables.nix
+++ b/home-manager/tests/modules/programs/bash/session-variables.nix
diff --git a/tests/modules/programs/browserpass.nix b/home-manager/tests/modules/programs/browserpass.nix
index 229392e171b..229392e171b 100644
--- a/tests/modules/programs/browserpass.nix
+++ b/home-manager/tests/modules/programs/browserpass.nix
diff --git a/tests/modules/programs/firefox/default.nix b/home-manager/tests/modules/programs/firefox/default.nix
index 6612a9ac978..6612a9ac978 100644
--- a/tests/modules/programs/firefox/default.nix
+++ b/home-manager/tests/modules/programs/firefox/default.nix
diff --git a/tests/modules/programs/firefox/profile-settings-expected-user.js b/home-manager/tests/modules/programs/firefox/profile-settings-expected-user.js
index 0edd47b9101..0edd47b9101 100644
--- a/tests/modules/programs/firefox/profile-settings-expected-user.js
+++ b/home-manager/tests/modules/programs/firefox/profile-settings-expected-user.js
diff --git a/tests/modules/programs/firefox/profile-settings.nix b/home-manager/tests/modules/programs/firefox/profile-settings.nix
index 45465b1d0bf..45465b1d0bf 100644
--- a/tests/modules/programs/firefox/profile-settings.nix
+++ b/home-manager/tests/modules/programs/firefox/profile-settings.nix
diff --git a/tests/modules/programs/firefox/state-version-19_09.nix b/home-manager/tests/modules/programs/firefox/state-version-19_09.nix
index 0c93096190e..0c93096190e 100644
--- a/tests/modules/programs/firefox/state-version-19_09.nix
+++ b/home-manager/tests/modules/programs/firefox/state-version-19_09.nix
diff --git a/tests/modules/programs/getmail-expected.conf b/home-manager/tests/modules/programs/getmail-expected.conf
index da54e709236..da54e709236 100644
--- a/tests/modules/programs/getmail-expected.conf
+++ b/home-manager/tests/modules/programs/getmail-expected.conf
diff --git a/tests/modules/programs/getmail.nix b/home-manager/tests/modules/programs/getmail.nix
index 12806c25679..12806c25679 100644
--- a/tests/modules/programs/getmail.nix
+++ b/home-manager/tests/modules/programs/getmail.nix
diff --git a/tests/modules/programs/git-expected.conf b/home-manager/tests/modules/programs/git-expected.conf
index d02ebf31649..d02ebf31649 100644
--- a/tests/modules/programs/git-expected.conf
+++ b/home-manager/tests/modules/programs/git-expected.conf
diff --git a/tests/modules/programs/git-with-email-expected.conf b/home-manager/tests/modules/programs/git-with-email-expected.conf
index 01c1eec5823..01c1eec5823 100644
--- a/tests/modules/programs/git-with-email-expected.conf
+++ b/home-manager/tests/modules/programs/git-with-email-expected.conf
diff --git a/tests/modules/programs/git-with-email.nix b/home-manager/tests/modules/programs/git-with-email.nix
index f8a762dcceb..f8a762dcceb 100644
--- a/tests/modules/programs/git-with-email.nix
+++ b/home-manager/tests/modules/programs/git-with-email.nix
diff --git a/tests/modules/programs/git-with-str-extra-config-expected.conf b/home-manager/tests/modules/programs/git-with-str-extra-config-expected.conf
index 957438de13a..957438de13a 100644
--- a/tests/modules/programs/git-with-str-extra-config-expected.conf
+++ b/home-manager/tests/modules/programs/git-with-str-extra-config-expected.conf
diff --git a/tests/modules/programs/git-with-str-extra-config.nix b/home-manager/tests/modules/programs/git-with-str-extra-config.nix
index 734c5ee764c..734c5ee764c 100644
--- a/tests/modules/programs/git-with-str-extra-config.nix
+++ b/home-manager/tests/modules/programs/git-with-str-extra-config.nix
diff --git a/tests/modules/programs/git.nix b/home-manager/tests/modules/programs/git.nix
index c5203e417dc..c5203e417dc 100644
--- a/tests/modules/programs/git.nix
+++ b/home-manager/tests/modules/programs/git.nix
diff --git a/tests/modules/programs/gpg/default.nix b/home-manager/tests/modules/programs/gpg/default.nix
index 5cb24817cb0..5cb24817cb0 100644
--- a/tests/modules/programs/gpg/default.nix
+++ b/home-manager/tests/modules/programs/gpg/default.nix
diff --git a/tests/modules/programs/gpg/override-defaults-expected.conf b/home-manager/tests/modules/programs/gpg/override-defaults-expected.conf
index 3198183f723..3198183f723 100644
--- a/tests/modules/programs/gpg/override-defaults-expected.conf
+++ b/home-manager/tests/modules/programs/gpg/override-defaults-expected.conf
diff --git a/tests/modules/programs/gpg/override-defaults.nix b/home-manager/tests/modules/programs/gpg/override-defaults.nix
index 850334dc589..850334dc589 100644
--- a/tests/modules/programs/gpg/override-defaults.nix
+++ b/home-manager/tests/modules/programs/gpg/override-defaults.nix
diff --git a/tests/modules/programs/mbsync-expected.conf b/home-manager/tests/modules/programs/mbsync-expected.conf
index f1ca79fe738..f1ca79fe738 100644
--- a/tests/modules/programs/mbsync-expected.conf
+++ b/home-manager/tests/modules/programs/mbsync-expected.conf
diff --git a/tests/modules/programs/mbsync.nix b/home-manager/tests/modules/programs/mbsync.nix
index fa9768a2fe1..fa9768a2fe1 100644
--- a/tests/modules/programs/mbsync.nix
+++ b/home-manager/tests/modules/programs/mbsync.nix
diff --git a/tests/modules/programs/rofi/assert-on-both-theme-and-colors-expected.json b/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors-expected.json
index 808288f4193..808288f4193 100644
--- a/tests/modules/programs/rofi/assert-on-both-theme-and-colors-expected.json
+++ b/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors-expected.json
diff --git a/tests/modules/programs/rofi/assert-on-both-theme-and-colors.nix b/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors.nix
index 2558a25832f..2558a25832f 100644
--- a/tests/modules/programs/rofi/assert-on-both-theme-and-colors.nix
+++ b/home-manager/tests/modules/programs/rofi/assert-on-both-theme-and-colors.nix
diff --git a/tests/modules/programs/rofi/default.nix b/home-manager/tests/modules/programs/rofi/default.nix
index b42b43e949a..b42b43e949a 100644
--- a/tests/modules/programs/rofi/default.nix
+++ b/home-manager/tests/modules/programs/rofi/default.nix
diff --git a/tests/modules/programs/ssh/default-config-expected.conf b/home-manager/tests/modules/programs/ssh/default-config-expected.conf
index 55748ea6c82..55748ea6c82 100644
--- a/tests/modules/programs/ssh/default-config-expected.conf
+++ b/home-manager/tests/modules/programs/ssh/default-config-expected.conf
diff --git a/tests/modules/programs/ssh/default-config.nix b/home-manager/tests/modules/programs/ssh/default-config.nix
index 266bc9d1f5d..266bc9d1f5d 100644
--- a/tests/modules/programs/ssh/default-config.nix
+++ b/home-manager/tests/modules/programs/ssh/default-config.nix
diff --git a/tests/modules/programs/ssh/default.nix b/home-manager/tests/modules/programs/ssh/default.nix
index 507eef0bdb8..507eef0bdb8 100644
--- a/tests/modules/programs/ssh/default.nix
+++ b/home-manager/tests/modules/programs/ssh/default.nix
diff --git a/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
index 2e9082de378..2e9082de378 100644
--- a/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
+++ b/home-manager/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
diff --git a/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts-expected.conf b/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts-expected.conf
index 5213d282c28..5213d282c28 100644
--- a/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts-expected.conf
+++ b/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts-expected.conf
diff --git a/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
index 15ab59e82ca..15ab59e82ca 100644
--- a/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
+++ b/home-manager/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
diff --git a/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
index c05cba82791..c05cba82791 100644
--- a/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
+++ b/home-manager/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
diff --git a/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
index 8cecc5e5121..8cecc5e5121 100644
--- a/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
+++ b/home-manager/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
diff --git a/tests/modules/programs/ssh/forwards-paths-with-ports-error.json b/home-manager/tests/modules/programs/ssh/forwards-paths-with-ports-error.json
index e7e3a374ecc..e7e3a374ecc 100644
--- a/tests/modules/programs/ssh/forwards-paths-with-ports-error.json
+++ b/home-manager/tests/modules/programs/ssh/forwards-paths-with-ports-error.json
diff --git a/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
index a0473147bd3..a0473147bd3 100644
--- a/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
+++ b/home-manager/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
diff --git a/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix b/home-manager/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
index 770b8ab2870..770b8ab2870 100644
--- a/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
+++ b/home-manager/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
diff --git a/tests/modules/programs/ssh/match-blocks-attrs-expected.conf b/home-manager/tests/modules/programs/ssh/match-blocks-attrs-expected.conf
index f0d768375f0..f0d768375f0 100644
--- a/tests/modules/programs/ssh/match-blocks-attrs-expected.conf
+++ b/home-manager/tests/modules/programs/ssh/match-blocks-attrs-expected.conf
diff --git a/tests/modules/programs/ssh/match-blocks-attrs.nix b/home-manager/tests/modules/programs/ssh/match-blocks-attrs.nix
index 94263ef9d27..94263ef9d27 100644
--- a/tests/modules/programs/ssh/match-blocks-attrs.nix
+++ b/home-manager/tests/modules/programs/ssh/match-blocks-attrs.nix
diff --git a/tests/modules/programs/ssh/no-assertions.json b/home-manager/tests/modules/programs/ssh/no-assertions.json
index 0637a088a01..0637a088a01 100644
--- a/tests/modules/programs/ssh/no-assertions.json
+++ b/home-manager/tests/modules/programs/ssh/no-assertions.json
diff --git a/tests/modules/programs/texlive-minimal.nix b/home-manager/tests/modules/programs/texlive-minimal.nix
index df143dbc660..df143dbc660 100644
--- a/tests/modules/programs/texlive-minimal.nix
+++ b/home-manager/tests/modules/programs/texlive-minimal.nix
diff --git a/tests/modules/programs/tmux/default.nix b/home-manager/tests/modules/programs/tmux/default.nix
index d4501c60981..d4501c60981 100644
--- a/tests/modules/programs/tmux/default.nix
+++ b/home-manager/tests/modules/programs/tmux/default.nix
diff --git a/tests/modules/programs/tmux/disable-confirmation-prompt.conf b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf
index b599e603e4a..b599e603e4a 100644
--- a/tests/modules/programs/tmux/disable-confirmation-prompt.conf
+++ b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf
diff --git a/tests/modules/programs/tmux/disable-confirmation-prompt.nix b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix
index 82c53438b00..82c53438b00 100644
--- a/tests/modules/programs/tmux/disable-confirmation-prompt.nix
+++ b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix
diff --git a/tests/modules/programs/tmux/emacs-with-plugins.conf b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf
index b047c97a766..b047c97a766 100644
--- a/tests/modules/programs/tmux/emacs-with-plugins.conf
+++ b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf
diff --git a/tests/modules/programs/tmux/emacs-with-plugins.nix b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.nix
index 5e147b7290e..5e147b7290e 100644
--- a/tests/modules/programs/tmux/emacs-with-plugins.nix
+++ b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.nix
diff --git a/tests/modules/programs/tmux/hm-session-vars.sh b/home-manager/tests/modules/programs/tmux/hm-session-vars.sh
index 40d9c24b50d..40d9c24b50d 100644
--- a/tests/modules/programs/tmux/hm-session-vars.sh
+++ b/home-manager/tests/modules/programs/tmux/hm-session-vars.sh
diff --git a/tests/modules/programs/tmux/not-enabled.nix b/home-manager/tests/modules/programs/tmux/not-enabled.nix
index b7c675a83a2..b7c675a83a2 100644
--- a/tests/modules/programs/tmux/not-enabled.nix
+++ b/home-manager/tests/modules/programs/tmux/not-enabled.nix
diff --git a/tests/modules/programs/tmux/secure-socket-enabled.nix b/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix
index 34e9129c5a4..34e9129c5a4 100644
--- a/tests/modules/programs/tmux/secure-socket-enabled.nix
+++ b/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix
diff --git a/tests/modules/programs/tmux/vi-all-true.conf b/home-manager/tests/modules/programs/tmux/vi-all-true.conf
index 08e37e19b97..08e37e19b97 100644
--- a/tests/modules/programs/tmux/vi-all-true.conf
+++ b/home-manager/tests/modules/programs/tmux/vi-all-true.conf
diff --git a/tests/modules/programs/tmux/vi-all-true.nix b/home-manager/tests/modules/programs/tmux/vi-all-true.nix
index e88ed587c03..e88ed587c03 100644
--- a/tests/modules/programs/tmux/vi-all-true.nix
+++ b/home-manager/tests/modules/programs/tmux/vi-all-true.nix
diff --git a/tests/modules/programs/zsh/default.nix b/home-manager/tests/modules/programs/zsh/default.nix
index da5dd5b55ed..da5dd5b55ed 100644
--- a/tests/modules/programs/zsh/default.nix
+++ b/home-manager/tests/modules/programs/zsh/default.nix
diff --git a/tests/modules/programs/zsh/session-variables.nix b/home-manager/tests/modules/programs/zsh/session-variables.nix
index a87d39820cf..a87d39820cf 100644
--- a/tests/modules/programs/zsh/session-variables.nix
+++ b/home-manager/tests/modules/programs/zsh/session-variables.nix
diff --git a/tests/modules/services/sxhkd/configuration.nix b/home-manager/tests/modules/services/sxhkd/configuration.nix
index ac04a7ecf30..ac04a7ecf30 100644
--- a/tests/modules/services/sxhkd/configuration.nix
+++ b/home-manager/tests/modules/services/sxhkd/configuration.nix
diff --git a/tests/modules/services/sxhkd/default.nix b/home-manager/tests/modules/services/sxhkd/default.nix
index ec25252cee0..ec25252cee0 100644
--- a/tests/modules/services/sxhkd/default.nix
+++ b/home-manager/tests/modules/services/sxhkd/default.nix
diff --git a/tests/modules/services/sxhkd/service.nix b/home-manager/tests/modules/services/sxhkd/service.nix
index 46ce259a718..46ce259a718 100644
--- a/tests/modules/services/sxhkd/service.nix
+++ b/home-manager/tests/modules/services/sxhkd/service.nix
diff --git a/tests/modules/services/sxhkd/sxhkdrc b/home-manager/tests/modules/services/sxhkd/sxhkdrc
index c8883464b29..c8883464b29 100644
--- a/tests/modules/services/sxhkd/sxhkdrc
+++ b/home-manager/tests/modules/services/sxhkd/sxhkdrc
diff --git a/tests/modules/services/window-managers/i3-keybindings.nix b/home-manager/tests/modules/services/window-managers/i3-keybindings.nix
index b5ee4fd8765..b5ee4fd8765 100644
--- a/tests/modules/services/window-managers/i3-keybindings.nix
+++ b/home-manager/tests/modules/services/window-managers/i3-keybindings.nix
diff --git a/tests/modules/systemd/default.nix b/home-manager/tests/modules/systemd/default.nix
index c1779ac59fb..c1779ac59fb 100644
--- a/tests/modules/systemd/default.nix
+++ b/home-manager/tests/modules/systemd/default.nix
diff --git a/tests/modules/systemd/services-expected.conf b/home-manager/tests/modules/systemd/services-expected.conf
index 34b9618d6d3..34b9618d6d3 100644
--- a/tests/modules/systemd/services-expected.conf
+++ b/home-manager/tests/modules/systemd/services-expected.conf
diff --git a/tests/modules/systemd/services.nix b/home-manager/tests/modules/systemd/services.nix
index f1f7a42bb1a..f1f7a42bb1a 100644
--- a/tests/modules/systemd/services.nix
+++ b/home-manager/tests/modules/systemd/services.nix
diff --git a/tests/modules/systemd/session-variables-expected.conf b/home-manager/tests/modules/systemd/session-variables-expected.conf
index 5b6e80bc32b..5b6e80bc32b 100644
--- a/tests/modules/systemd/session-variables-expected.conf
+++ b/home-manager/tests/modules/systemd/session-variables-expected.conf
diff --git a/tests/modules/systemd/session-variables.nix b/home-manager/tests/modules/systemd/session-variables.nix
index 7cfb4a6c7c3..7cfb4a6c7c3 100644
--- a/tests/modules/systemd/session-variables.nix
+++ b/home-manager/tests/modules/systemd/session-variables.nix
diff --git a/tests/modules/systemd/timers-expected.conf b/home-manager/tests/modules/systemd/timers-expected.conf
index b19f044cc0b..b19f044cc0b 100644
--- a/tests/modules/systemd/timers-expected.conf
+++ b/home-manager/tests/modules/systemd/timers-expected.conf
diff --git a/tests/modules/systemd/timers.nix b/home-manager/tests/modules/systemd/timers.nix
index 0fa0070cd77..0fa0070cd77 100644
--- a/tests/modules/systemd/timers.nix
+++ b/home-manager/tests/modules/systemd/timers.nix
diff --git a/tests/modules/xresources-expected.conf b/home-manager/tests/modules/xresources-expected.conf
index 20b47e5080b..20b47e5080b 100644
--- a/tests/modules/xresources-expected.conf
+++ b/home-manager/tests/modules/xresources-expected.conf
diff --git a/tests/modules/xresources.nix b/home-manager/tests/modules/xresources.nix
index f73e326f31e..f73e326f31e 100644
--- a/tests/modules/xresources.nix
+++ b/home-manager/tests/modules/xresources.nix