diff --git a/lib/extended.nix b/lib/extended.nix index 3485703..4a1e4da 100644 --- a/lib/extended.nix +++ b/lib/extended.nix @@ -1,6 +1,6 @@ final: prev: let - inherit (builtins) listToAttrs substring; + inherit (builtins) listToAttrs substring filter; inherit (final) concatStringsSep hasSuffix @@ -9,6 +9,7 @@ let mkOption types ; + inherit (final.filesystem) listFilesRecursive; in let enabled = { @@ -61,7 +62,11 @@ let (substring 4 2 longDate) (substring 6 2 longDate) ]); - isNixFile = path: hasSuffix ".nix" path; + + isNixFile = p: hasSuffix ".nix" p; + isDefaultNixFile = p: hasSuffix "default.nix" p; + filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths; + listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir); in { @@ -73,7 +78,8 @@ in mkOizysModule mkDefaultOizysModule mkDate - isNixFile mkIfIn + isNixFile + listNixFilesRecursive ; } diff --git a/modules/languages/default.nix b/modules/languages/default.nix index 2ba33a9..4bc6264 100644 --- a/modules/languages/default.nix +++ b/modules/languages/default.nix @@ -3,15 +3,11 @@ let inherit (lib) mkOption types - isNixFile literalExpression - mdDoc - ; - inherit (lib.filesystem) listFilesRecursive; - inherit (builtins) filter; - listNixFilesRecursive = - dir: filter (f: (f != ./default.nix) && (isNixFile f)) (listFilesRecursive dir); + mdDoc + listNixFilesRecursive + ; in { imports = listNixFilesRecursive ./.;