Merge branch 'main' into improve-terraformls

This commit is contained in:
ppenguin 2026-01-24 12:19:49 +01:00 committed by GitHub
commit 63d59ff40a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 71 additions and 28 deletions

View file

@ -9,7 +9,7 @@
inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
inherit (lib.types) bool enum listOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption;
inherit (lib.nvim.dag) entryBefore;
inherit (lib.nvim.attrsets) mapListToAttrs;
@ -46,6 +46,9 @@
luacheck = {
package = pkgs.luajitPackages.luacheck;
};
selene = {
package = pkgs.selene;
};
};
in {
imports = [
@ -79,7 +82,7 @@ in {
description = "Enable Lua formatting";
};
type = mkOption {
type = deprecatedSingleOrListOf "vim.language.lua.format.type" (enum (attrNames formats));
type = listOf (enum (attrNames formats));
default = defaultFormat;
description = "Lua formatter to use";
};

View file

@ -169,6 +169,22 @@
".git"
];
};
zuban = {
enable = true;
cmd = [(getExe pkgs.zuban) "server"];
filetypes = ["python"];
root_markers = [
"pyproject.toml"
"setup.py"
"setup.cfg"
"requirements.txt"
"Pipfile"
".git"
"mypy.ini"
".mypy.ini"
];
};
};
defaultFormat = ["black"];