diff --git a/modules/plugins.nix b/modules/plugins.nix index f2f5228c..9eb2f576 100644 --- a/modules/plugins.nix +++ b/modules/plugins.nix @@ -2,15 +2,21 @@ let inherit (builtins) readDir; inherit (lib.attrsets) foldlAttrs; - inherit (lib.lists) optional; - by-name = ../plugins/by-name; + inherit (lib.lists) optional concatMap; + + mkByName = + dir: + foldlAttrs ( + prev: name: type: + prev ++ optional (type == "directory") (dir + "/${name}") + ) [ ] (readDir dir); in { imports = [ ../plugins ] - ++ foldlAttrs ( - prev: name: type: - prev ++ optional (type == "directory") (by-name + "/${name}") - ) [ ] (readDir by-name); + ++ concatMap mkByName [ + ../colorschemes + ../plugins/by-name + ]; }