nhms works again

2026-03-11 22:06:46 -05:00
parent b4d74f8a8d
commit cd14a37c8c
5 changed files with 34 additions and 43 deletions
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -1,4 +1,4 @@
-{ inputs, lib, ... }:
+{ inputs, ... }:
 let
  username = "john";
 in
@@ -17,35 +17,30 @@ in
      ];
    };

-    modules = lib.recursiveUpdate
-      (inputs.self.factory.user username true)
-      {
-        #
-        # NixOS
-        #
-        nixos."${username}" = {
-          users.users."${username}" = {
-            openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
-            extraGroups = [ "docker" ];
-          };
-        };
-
-        #
-        # Home Manager
-        #
-        homeManager."${username}" = with inputs.self.meta.users."${username}"; {
-          home.stateVersion = "25.11";
-          xdg.enable = true;
-
-          programs.git.settings.user.name = name;
-          programs.git.settings.user.email = email;
-
-          imports = with inputs.self.modules.homeManager; [
-            ssh
-            shell-tools
-            git
-          ];
+    modules = {
+      nixos."${username}" = {
+        imports = [
+          (inputs.self.factory.user username true).nixos."${username}"
+        ];
+        users.users."${username}" = {
+          openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
+          extraGroups = [ "docker" ];
        };
      };
+
+      homeManager."${username}" = with inputs.self.meta.users."${username}"; {
+        home.stateVersion = "25.11";
+        xdg.enable = true;
+
+        programs.git.settings.user.name = name;
+        programs.git.settings.user.email = email;
+
+        imports = with inputs.self.modules.homeManager; [
+          ssh
+          shell-tools
+          git
+        ];
+      };
+    };
  };
 }