diff --git a/default.nix b/default.nix index 48b6ad7..8204710 100644 --- a/default.nix +++ b/default.nix @@ -4,6 +4,7 @@ _: imports = [ ./config ./plugins + ./utils ]; config = { diff --git a/flake.nix b/flake.nix index 954fab7..4f88b28 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,7 @@ extraSpecialArgs = specialArgs // { inherit pkgs; - icons = import ./utils/icons.nix; + icons = import ./utils/_icons.nix; }; }; in diff --git a/utils/icons.nix b/utils/_icons.nix similarity index 100% rename from utils/icons.nix rename to utils/_icons.nix diff --git a/utils/default.nix b/utils/default.nix new file mode 100644 index 0000000..b064218 --- /dev/null +++ b/utils/default.nix @@ -0,0 +1,14 @@ +{ lib, ... }: + +let + definitions = lib.attrNames ( + lib.filterAttrs + (filename: kind: + filename != "default.nix" + && (lib.substring 0 1 filename) != "_" + && (kind == "regular" || kind == "directory") + ) + (builtins.readDir ./.) + ); +in +lib.mkMerge (map (file: import ./${file}) definitions)