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

This commit is contained in:
Snoweuph 2026-04-12 00:20:26 +02:00
commit d5ff92aee7
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55

View file

@ -4,54 +4,16 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) attrNames; inherit (lib) genAttrs;
inherit (lib.generators) mkLuaInline;
inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.types) enum listOf str; inherit (lib.types) enum listOf str;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
cfg = config.vim.languages.arduino; cfg = config.vim.languages.arduino;
defaultServers = ["arduino-language-server"]; defaultServers = ["arduino-language-server"];
servers = { servers = ["arduino-language-server"];
arduino-language-server = {
enable = true;
cmd =
[
(getExe pkgs.arduino-language-server)
"-clangd"
(getExe' pkgs.clang-tools "clangd")
"-cli"
(getExe pkgs.arduino-cli)
"-cli-config"
"$HOME/.arduino15/arduino-cli.yaml"
]
++ cfg.lsp.extraArgs;
filetypes = ["arduino"];
root_dir =
mkLuaInline
/*
lua
*/
''
function(bufnr, on_dir)
local fname = vim.api.nvim_buf_get_name(bufnr)
on_dir(util.root_pattern("*.ino")(fname))
end
'';
capabilities = {
textDocument = {
semanticTokens = mkLuaInline "vim.NIL";
};
workspace = {
semanticTokens = mkLuaInline "vim.NIL";
};
};
};
};
in { in {
options.vim.languages.arduino = { options.vim.languages.arduino = {
enable = mkEnableOption "Arduino support"; enable = mkEnableOption "Arduino support";
@ -74,7 +36,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 = "Arduino LSP servers to use"; description = "Arduino LSP servers to use";
}; };
@ -94,12 +56,12 @@ in {
}) })
(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 = ["arduino"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }