refactor: compose hosts and home-manager features explicitly

modules/users.nix

@@ -1,11 +1,5 @@
-{
-  config,
-  lib,
-  ...
-}:
+{ ... }:
 let
-  homeModules = config.flake.modules.homeManager;
-
   kiri = {
     name = "kiri";
     realName = "Jelle Spreeuwenberg";
@@ -46,98 +40,6 @@ let
       };
     };
   };
-
-  mkUserModules =
-    {
-      name,
-      extraHomeImports ? [ ],
-    }:
-    let
-      userModuleName = "user-${name}";
-      workstationModuleName = "${name}-workstation";
-    in
-    {
-      nixos =
-        {
-          config,
-          pkgs,
-          ...
-        }:
-        let
-          account = config.meta.host.users.${name};
-          primaryEmails = lib.filter (email: email.primary) (builtins.attrValues account.emails);
-          isWorkstation = config.meta.host.kind == "workstation";
-          hasWorkstationModule = builtins.hasAttr workstationModuleName homeModules;
-          baseModuleName = if isWorkstation then "workstation-user-base" else "server-user-base";
-        in
-        {
-          assertions = [
-            {
-              assertion = builtins.length primaryEmails == 1;
-              message = "User ${name} must define exactly one primary email entry.";
-            }
-          ];
-
-          programs.zsh.enable = true;
-
-          sops.secrets = lib.optionalAttrs isWorkstation {
-            "hashed-password-${name}".neededForUsers = true;
-          };
-
-          users.users.${name} = {
-            name = account.name;
-            home = account.homeDirectory;
-            isNormalUser = true;
-            shell = pkgs.zsh;
-            extraGroups = [
-              "wheel"
-              "networkmanager"
-            ];
-          }
-          // lib.optionalAttrs isWorkstation {
-            hashedPasswordFile = config.sops.secrets."hashed-password-${name}".path;
-          };
-
-          home-manager.users.${name} = {
-            imports = [
-              homeModules.${baseModuleName}
-              homeModules.${userModuleName}
-            ]
-            ++ extraHomeImports
-            ++ lib.optionals (isWorkstation && hasWorkstationModule) [
-              homeModules.${workstationModuleName}
-            ];
-            meta = {
-              host = config.meta.host;
-              user = account;
-            };
-          };
-        };
-
-      homeManager =
-        { config, ... }:
-        let
-          account = config.meta.user;
-        in
-        {
-          home = {
-            username = account.name;
-            homeDirectory = account.homeDirectory;
-            stateVersion = "24.05";
-          };
-        };
-    };
-
-  kiriModules = mkUserModules {
-    name = "kiri";
-    extraHomeImports = [
-      homeModules.syncthing
-    ];
-  };
-
-  ergonModules = mkUserModules {
-    name = "ergon";
-  };
 in
 {
   meta.lib.users = {
@@ -146,10 +48,4 @@ in
       kiri
       ;
   };
-
-  flake.modules.nixos."user-kiri" = kiriModules.nixos;
-  flake.modules.nixos."user-ergon" = ergonModules.nixos;
-
-  flake.modules.homeManager."user-kiri" = kiriModules.homeManager;
-  flake.modules.homeManager."user-ergon" = ergonModules.homeManager;
 }