From 35cf3c5d4a4b638dbdf4e8d79a82c4cabbaf5cb8 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 15 May 2024 20:35:52 -0400 Subject: [PATCH] mkModules impl --- src/user/modules/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/user/modules/default.nix b/src/user/modules/default.nix index 01abb97..7126bfd 100644 --- a/src/user/modules/default.nix +++ b/src/user/modules/default.nix @@ -1,9 +1,14 @@ +{ lib, ... }: + +with lib; +let + mkModules = dir: recursiveUpdate + (attrsets.mapAttrs (_: moduleDir: { + inherit (moduleDir) default; + }) (filterAttrs (n: v: isAttrs v) (attrsets.mapAttrs (_: v: builtins.readDir v) dir))) + { inherit (dir) default; }; + +in { - imports = [ - ./bash - ./git - ./gui - ./security - ./utils - ]; + imports = mkModules ./.; }