From f50323e2f275da3456bc48adcb551811294298ac Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 17 Apr 2023 18:58:34 -0400 Subject: further improve lib --- lib/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'lib/default.nix') diff --git a/lib/default.nix b/lib/default.nix index afd2890..94acb96 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -2,10 +2,15 @@ inherit (builtins) readDir; inherit (lib) filterAttrs mapAttrs; - mapFilterDirs = dir: filter: map: let - dirs = filterAttrs filter (readDir dir); - in - mapAttrs map dirs; + my = { + mapFilterDirs = dir: filter: map: let + dirs = filterAttrs filter (readDir dir); + in + mapAttrs map dirs; + }; + + myLib = lib.extend (_: _: {inherit my;}); + common = {lib = myLib;}; in - (import ./host.nix {inherit mapFilterDirs;}) - // (import ./user.nix {inherit mapFilterDirs;}) + (import ./host.nix common) + // (import ./user.nix common) -- cgit v1.2.3