another major refactor

1 files changed, 13 insertions, 3 deletions

diff --git a/util/default.nix b/util/default.nix
index 0fb91b5..c3fa0b8 100644
--- a/util/default.nix
+++ b/util/default.nix
@@ -1,4 +1,14 @@
-{home-manager, ...}: {
-  host = import ./host.nix {};
-  user = import ./user.nix {inherit home-manager;};
+{
+  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;};
 }