From bda9deb791b29454d49f8f5c35198e2b23f7751a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 23 Jun 2025 10:56:02 -0500 Subject: [PATCH] modules: allow root level nix files More flexibility in allowing root level files to import, for those that don't need nesting. Signed-off-by: Austin Horstman --- modules/modules.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/modules.nix b/modules/modules.nix index 5094b7760..d8c0274b8 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -77,9 +77,11 @@ let ++ (lib.concatMap ( dir: - lib.pipe dir [ - builtins.readDir - (lib.filterAttrs (_path: kind: kind == "directory")) + lib.pipe (builtins.readDir dir) [ + (lib.filterAttrs (path: _kind: !lib.hasPrefix "_" path)) + (lib.filterAttrs ( + _path: kind: kind == "directory" || (kind == "regular" && lib.hasSuffix ".nix" _path) + )) (lib.mapAttrsToList (path: _kind: lib.path.append dir path)) ] )