NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-27 11:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

languages/lua: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-11 23:41:53 +02:00
commit cef2e99018
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

33
modules/plugins/languages/lua.nix
View file

@ -8,6 +8,7 @@
inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib) genAttrs;
inherit (lib.types) bool enum listOf; inherit (lib.types) bool enum listOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption; inherit (lib.nvim.types) diagnostics mkGrammarOption;
inherit (lib.nvim.dag) entryBefore; inherit (lib.nvim.dag) entryBefore;
@ -16,23 +17,7 @@
cfg = config.vim.languages.lua; cfg = config.vim.languages.lua;
defaultServers = ["lua-language-server"]; defaultServers = ["lua-language-server"];
servers = { servers = ["lua-language-server"];
lua-language-server = {
enable = true;
cmd = [(getExe pkgs.lua-language-server)];
filetypes = ["lua"];
root_markers = [
".luarc.json"
".luarc.jsonc"
".luacheckrc"
".stylua.toml"
"stylua.toml"
"selene.toml"
"selene.yml"
".git"
];
};
};
defaultFormat = ["stylua"]; defaultFormat = ["stylua"];
formats = { formats = {
@ -77,7 +62,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable"; defaultText = literalExpression "config.vim.lsp.enable";
}; };
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "Lua LSP server to use"; description = "Lua LSP server to use";
}; };
@ -122,12 +107,12 @@ in {
(mkIf cfg.enable (mkMerge [ (mkIf cfg.enable (mkMerge [
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.servers = vim.lsp = {
mapListToAttrs (n: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
name = n; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${n}; filetypes = ["lsp"];
}) });
cfg.lsp.servers; };
}) })
(mkIf cfg.lsp.lazydev.enable { (mkIf cfg.lsp.lazydev.enable {