export functions in util/ better

2 files changed, 11 insertions, 12 deletions

diff --git a/flake.nix b/flake.nix
index c381557..274bc95 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,8 +58,7 @@
       inherit (nixpkgs) lib;
       inherit inputs;
     };
-    inherit (util.host) mapHosts;
-    inherit (util.user) mapHMUsers;
+    inherit (util) mapHosts mapHMUsers;
 
     users = import ./users {inherit inputs;};
     hosts = import ./hosts {inherit inputs;};
diff --git a/util/default.nix b/util/default.nix
index c3fa0b8..0d8dca5 100644
--- a/util/default.nix
+++ b/util/default.nix
@@ -2,13 +2,13 @@
   inputs,
   lib,
 }: let
-  mapFilterDirs = dir: filter: map:
-    with builtins;
-    with lib; let
-      dirs = filterAttrs filter (readDir dir);
-    in
-      mapAttrs map dirs;
-in {
-  host = import ./host.nix {inherit lib inputs mapFilterDirs;};
-  user = import ./user.nix {inherit lib inputs mapFilterDirs;};
-}
+  inherit (builtins) readDir;
+  inherit (lib) filterAttrs mapAttrs;
+
+  mapFilterDirs = dir: filter: map: let
+    dirs = filterAttrs filter (readDir dir);
+  in
+    mapAttrs map dirs;
+in
+  (import ./host.nix {inherit lib inputs mapFilterDirs;})
+  // (import ./user.nix {inherit lib inputs mapFilterDirs;})