5 files changed, 6 insertions, 12 deletions
diff --git a/bin/nixos-build b/bin/nixos-build
index 41e9774a3..cfbf07123 100755
--- a/bin/nixos-build
+++ b/bin/nixos-build
@@ -14,15 +14,9 @@ nixos_config=$config_root/modules/$host
 secrets_nix=$secrets_root/$host/nix
 secrets_rsync=$secrets_root/$host/rsync
 
-(
-  # Notice NIX_PATH used from host
-  # Notice secrets required to evaluate configuration
-  NIX_PATH=$NIX_PATH:nixos-config=$nixos_config
-  NIX_PATH=$NIX_PATH:secrets=$secrets_nix
-  export NIX_PATH
-
+# Notice how host's NIX_PATH is used to prefetch nixpkgs.
+NIXOS_CONFIG=$nixos_config \
   prefetch nixpkgs tmp/nixpkgs/$host
-)
 
 nix-build \
     -I "$nixpkgs" \
diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index 016f88324..d57d46be2 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -7,7 +7,7 @@ in
 {
   imports =
     [
-      <secrets/hashedPasswords.nix>
+      { users.extraUsers = import <secrets/extraUsers.nix>; }
       ./networking.nix
       ./users.nix
       ../common/nixpkgs.nix
diff --git a/modules/mkdir/default.nix b/modules/mkdir/default.nix
index 964a3c4b2..5427a4590 100644
--- a/modules/mkdir/default.nix
+++ b/modules/mkdir/default.nix
@@ -7,7 +7,7 @@ in
 {
   imports =
     [
-      <secrets/hashedPasswords.nix>
+      { users.extraUsers = import <secrets/extraUsers.nix>; }
       ./networking.nix
       ./users.nix
       ../common/nixpkgs.nix
diff --git a/modules/rmdir/default.nix b/modules/rmdir/default.nix
index 346618a04..62fbd84f1 100644
--- a/modules/rmdir/default.nix
+++ b/modules/rmdir/default.nix
@@ -7,7 +7,7 @@ in
 {
   imports =
     [
-      <secrets/hashedPasswords.nix>
+      { users.extraUsers = import <secrets/extraUsers.nix>; }
       ./networking.nix
       ./users.nix
       ../common/nixpkgs.nix
diff --git a/modules/wu/users.nix b/modules/wu/users.nix
index 4c8631489..e50878cd0 100644
--- a/modules/wu/users.nix
+++ b/modules/wu/users.nix
@@ -211,7 +211,7 @@ in
 
 {
   imports = [
-    <secrets/hashedPasswords.nix>
+    { users.extraUsers = import <secrets/extraUsers.nix>; }
   ];
 
   users.defaultUserShell = "/run/current-system/sw/bin/bash";