Merge commit '6cc4fd6ede4909226cb81d3475834251ed1b7210'

1 files changed, 40 insertions, 39 deletions

diff --git a/home-manager/tests/default.nix b/home-manager/tests/default.nix
index ecb98e14188..49c27239730 100644
--- a/home-manager/tests/default.nix
+++ b/home-manager/tests/default.nix
@@ -2,52 +2,53 @@
 
 let
 
+  lib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
+
   nmt = pkgs.fetchFromGitLab {
     owner = "rycee";
     repo = "nmt";
-    rev = "89fb12a2aaa8ec671e22a033162c7738be714305";
-    sha256 = "07yc1jkgw8vhskzk937k9hfba401q8rn4sgj9baw3fkjl9zrbcyf";
+    rev = "6f866d1acb89fa15cd3b62baa052deae1f685c0c";
+    sha256 = "1qr1shhapjn4nnd4k6hml69ri8vgz4l8lakjll5hc516shs9a9nn";
+  };
+
+  modules = import ../modules/modules.nix {
+    inherit lib pkgs;
+    check = false;
   };
 
 in
 
 import nmt {
-  inherit pkgs;
-  modules = import ../modules/modules.nix { inherit pkgs; lib = pkgs.lib; };
+  inherit lib pkgs modules;
   testedAttrPath = [ "home" "activationPackage" ];
-  tests = {
-    browserpass = ./modules/programs/browserpass.nix;
-    files-executable = ./modules/files/executable.nix;
-    files-hidden-source = ./modules/files/hidden-source.nix;
-    files-source-with-spaces = ./modules/files/source-with-spaces.nix;
-    files-text = ./modules/files/text.nix;
-    git-with-email = ./modules/programs/git-with-email.nix;
-    git-with-most-options = ./modules/programs/git.nix;
-    git-with-str-extra-config = ./modules/programs/git-with-str-extra-config.nix;
-    mbsync = ./modules/programs/mbsync.nix;
-    texlive-minimal = ./modules/programs/texlive-minimal.nix;
-    xresources = ./modules/xresources.nix;
-  }
-  // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (
-    {
-      getmail = ./modules/programs/getmail.nix;
-      i3-keybindings = ./modules/services/window-managers/i3-keybindings.nix;
-    }
-    // import ./modules/misc/pam
-    // import ./modules/misc/xdg
-    // import ./modules/misc/xsession
-    // import ./modules/programs/firefox
-    // import ./modules/programs/rofi
-    // import ./modules/services/sxhkd
-    // import ./modules/systemd
-  )
-  // import ./modules/home-environment
-  // import ./modules/misc/fontconfig
-  // import ./modules/programs/alacritty
-  // import ./modules/programs/bash
-  // import ./modules/programs/gpg
-  // import ./modules/programs/newsboat
-  // import ./modules/programs/ssh
-  // import ./modules/programs/tmux
-  // import ./modules/programs/zsh;
+  tests = builtins.foldl' (a: b: a // (import b)) { } ([
+    ./lib/types
+    ./modules/files
+    ./modules/home-environment
+    ./modules/misc/fontconfig
+    ./modules/programs/alacritty
+    ./modules/programs/bash
+    ./modules/programs/browserpass
+    ./modules/programs/git
+    ./modules/programs/gpg
+    ./modules/programs/mbsync
+    ./modules/programs/neomutt
+    ./modules/programs/newsboat
+    ./modules/programs/readline
+    ./modules/programs/ssh
+    ./modules/programs/texlive
+    ./modules/programs/tmux
+    ./modules/programs/zsh
+    ./modules/xresources
+  ] ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
+    ./modules/misc/pam
+    ./modules/misc/xdg
+    ./modules/misc/xsession
+    ./modules/programs/firefox
+    ./modules/programs/getmail
+    ./modules/programs/rofi
+    ./modules/services/sxhkd
+    ./modules/services/window-managers/i3
+    ./modules/systemd
+  ]);
 }