making a mess of it, but getting to auto loading multi user setups!

lib/nixos.nix

@@ -1,24 +1,53 @@
-{ inputs, lib, pkgs, self, ... }:
-let
+{
+  inputs,
+  lib,
+  pkgs,
+  self,
+  ...
+}: let
   inherit (inputs.nixpkgs.lib) nixosSystem;
   inherit (builtins) baseNameOf elem;
   inherit (lib.attrsets) filterAttrs;
   inherit (lib.modules) mkDefault;
   inherit (lib.strings) removeSuffix;
   inherit (self.modules) mapModules;
+  inherit (self) mkSysUser mkHmUser;
 in rec
 {
   mkHost = path: attrs @ {system ? "x86_64-linux", ...}:
     nixosSystem {
       inherit system;
 
-      specialArgs = { inherit lib inputs system; };
+      specialArgs = {inherit lib inputs system;};
 
-      modules = [
+      modules =
+      let
+        stateVersion = "23.11";
+      in [
         inputs.nixos-boot.nixosModules.default
         {
           nixpkgs.pkgs = pkgs;
           networking.hostName = mkDefault (removeSuffix ".nix" (baseNameOf path));
+
+          system = {
+            inherit stateVersion;
+            configurationRevision = with inputs; mkIf (self ? rev) self.rev;
+          };
+
+          imports = [ "${path}/hardware.nix" ];
+
+          users = {
+            mutableUsers = false;
+            users = mapModules "${path}/users" mkSysUser;
+          };
+          home-manager = {
+            useGlobalPkgs = true;
+            useUserPackages = true;
+            sharedModules = [
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+            ];
+            users = mapModules "${path}/users" (p: mkHmUser p stateVersion);
+          };
         }
         (filterAttrs (n: v: !elem n ["system"]) attrs)
         ../. # ../default.nix
@@ -26,6 +55,6 @@ in rec
       ];
     };
 
-  mapHosts = dir: attrs @ { system ? system, ... }:
+  mapHosts = dir: attrs @ {system ? system, ...}:
     mapModules dir (hostPath: mkHost hostPath attrs);
 }