From 13c97347f85d558cf84cb1bd41b623ac31d65f7e Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Fri, 2 Aug 2024 01:41:38 -0700 Subject: [PATCH] hm-modules: extract getModules function --- home/modules/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/home/modules/default.nix b/home/modules/default.nix index e100af9..bbb1fa7 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -1,14 +1,19 @@ { lib, ... }: let - dirEntries = builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ]; - moduleEntries = lib.attrsets.filterAttrs (n: v: v == "regular") dirEntries; - moduleNames = builtins.attrNames moduleEntries; + getModules = path: + let + dirEntries = builtins.removeAttrs (builtins.readDir path) [ "default.nix" ]; + moduleEntries = lib.attrsets.filterAttrs (n: v: v == "regular") dirEntries; + moduleNames = builtins.attrNames moduleEntries; - modulePaths = builtins.map (name: ./${name}) moduleNames; + + modulePaths = builtins.map (name: path + /${name}) moduleNames; + in + modulePaths; in { - imports = modulePaths; + imports = getModules ./.; nixpkgs.config.allowUnfree = true;