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/r: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-11 17:08:47 +02:00
commit 60a69abead
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
2 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/plugins/languages/r.nix
View file

@ -7,18 +7,13 @@
inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum;
inherit (lib.meta) getExe;
inherit (lib.types) enum listOf;
inherit (lib) genAttrs;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.generators) mkLuaInline;
cfg = config.vim.languages.r;
r-with-languageserver = pkgs.rWrapper.override {
packages = [pkgs.rPackages.languageserver];
};
defaultFormat = ["format_r"];
formats = {
styler = {
@ -47,19 +42,8 @@
};
};
defaultServers = ["r_language_server"];
servers = {
r_language_server = {
enable = true;
cmd = [(getExe r-with-languageserver) "--no-echo" "-e" "languageserver::run()"];
filetypes = ["r" "rmd" "quarto"];
root_dir = mkLuaInline ''
function(bufnr, on_dir)
on_dir(vim.fs.root(bufnr, '.git') or vim.uv.os_homedir())
end
'';
};
};
defaultServers = ["r-languageserver"];
servers = ["r-languageserver"];
in {
options.vim.languages.r = {
enable = mkEnableOption "R language support";
@ -83,7 +67,7 @@ in {
};
servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.r.lsp.servers" (enum (attrNames servers));
type = listOf (enum servers);
default = defaultServers;
description = "R LSP server to use";
};
@ -127,12 +111,12 @@ in {
})
(mkIf cfg.lsp.enable {
vim.lsp.servers =
mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
vim.lsp = {
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
servers = genAttrs cfg.lsp.servers (_: {
filetypes = ["r" "rmd" "quarto"];
});
};
})
]);
}