More configuration progression

lib/fs.nix

@@ -7,6 +7,10 @@
     in
       builtins.filter (name: dirs.${name} == "directory") (builtins.attrNames dirs);
 
-  getModuleImports = builtins.attrNames (builtins.removeAttrs (builtins.readDir ./.) ["default.nix"]);
+  getModuleImports =
+    path: let
+      files = builtins.attrNames (builtins.removeAttrs (builtins.readDir path) ["default.nix"]);
+    in
+      map (file: "${path}/${file}") files;
 }
 

lib/hosts.nix

@@ -5,12 +5,19 @@
     nixpkgs,
     inputs,
     modules,
+    user,
   }: builtins.listToAttrs (builtins.map (host: {
       name = host;
       value = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = modules ++ [ ../hosts/${host} ];
-        specialArgs = { inherit inputs; };
+        modules = modules ++ [
+          ../hosts/${host}
+          ../modules/nixos/user/${user}.nix
+        ];
+        specialArgs = { 
+          inherit inputs;
+          inherit lib;
+        };
       };
     }) (lib.getDirsInDir ../hosts));
 }