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

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

Browse source
This commit is contained in:
Snoweuph 2026-04-12 15:46:49 +02:00
commit 6e02715cc2
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/plugins/languages/cmake.nix
View file

@ -7,25 +7,15 @@
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib) genAttrs;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.types) enum listOf package; inherit (lib.types) enum listOf package;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
cfg = config.vim.languages.cmake; cfg = config.vim.languages.cmake;
defaultServers = ["neocmakelsp"]; defaultServers = ["neocmakelsp"];
servers = { servers = ["neocmakelsp"];
neocmakelsp = {
enable = true;
cmd = [(getExe pkgs.neocmakelsp) "stdio"];
filetypes = ["cmake"];
root_markers = [".gersemirc" ".git" "build" "cmake"];
capabilities = {
textDocument.completion.completionItem.snippetSupport = true;
};
};
};
defaultFormat = "gersemi"; defaultFormat = "gersemi";
formats = { formats = {
@ -55,7 +45,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 = "CMake LSP servers to use"; description = "CMake LSP servers to use";
}; };
@ -90,12 +80,13 @@ 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 = ["cmake"];
}) root_markers = ["build" "cmake"];
cfg.lsp.servers; });
};
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {