merge main into breadcrumbs

This commit is contained in:
raf 2023-07-28 16:00:40 +03:00
commit d96d885fdd
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
20 changed files with 205 additions and 63 deletions

View file

@ -4,6 +4,6 @@
typesLanguage = import ./languages.nix {inherit lib;};
in {
inherit (typesDag) dagOf;
inherit (typesPlugin) pluginsOpt;
inherit (typesPlugin) pluginsOpt extraPluginType;
inherit (typesLanguage) diagnostics mkGrammarOption;
}

View file

@ -92,15 +92,37 @@ with lib; let
"copilot-cmp"
];
# You can either use the name of the plugin or a package.
pluginsType = with types;
listOf (
nullOr (
either
(enum availablePlugins)
package
)
pluginType = with types;
nullOr (
either
package
(enum availablePlugins)
);
pluginsType = types.listOf pluginType;
extraPluginType = with types;
submodule {
options = {
package = mkOption {
type = pluginType;
};
after = mkOption {
type = listOf str;
default = [];
description = "Setup this plugin after the following ones.";
};
setup = mkOption {
type = lines;
default = "";
description = "Lua code to run during setup.";
example = "require('aerial').setup {}";
};
};
};
in {
inherit extraPluginType;
pluginsOpt = {
description,
default ? [],