work on lib

lib.nix

@@ -13,13 +13,9 @@ let
   inherit (nixpkgs) lib;
 
   self = rec {
+    moduleList = builtins.attrNames (builtins.readDir ./${modulesFolder});
     mergedModules = mergeModules (
-      builtins.listToAttrs (
-        map (fn: {
-          name = fn;
-          value = import ./${modulesFolder}/${fn} { };
-        }) (builtins.attrNames (builtins.readDir ./${modulesFolder}))
-      )
+      builtins.listToAttrs (map (fn: (import ./${modulesFolder}/${fn} { })) (moduleList))
     );
 
     generateHostname =
@@ -192,12 +188,10 @@ let
     mergeModules =
       modules:
       let
-        mergedModules = builtins.attrValues (
-          builtins.mapAttrs (name: module: {
-            nixos = if builtins.hasAttr "nixos" module then [ module.nixos ] else [ ];
-            home = if builtins.hasAttr "home" module then [ module.home ] else [ ];
-          }) modules
-        );
+        mergedModules = builtins.mapAttrs (name: module: {
+          nixos = if builtins.hasAttr "nixos" module then [ module.nixos ] else [ ];
+          home = if builtins.hasAttr "home" module then [ module.home ] else [ ];
+        }) modules;
       in
       deepMerge mergedModules;
   };