NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 10:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

convert r module

Browse source
This commit is contained in:
sjcobb 2025-07-09 10:19:19 +01:00
commit 11bb5982c5
1 changed files with 21 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,10 +7,11 @@
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.lists) isList; inherit (lib.types) enum listOf package;
inherit (lib.types) enum either listOf package str; inherit (lib.meta) getExe;
inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.generators) mkLuaInline;
cfg = config.vim.languages.r; cfg = config.vim.languages.r;
@ -50,22 +51,16 @@
}; };
}; };
defaultServer = "r_language_server"; defaultServers = ["r_language_server"];
servers = { servers = {
r_language_server = { r_language_server = {
package = pkgs.writeShellScriptBin "r_lsp" '' enable = true;
${r-with-languageserver}/bin/R --slave -e "languageserver::run()" cmd = [(getExe r-with-languageserver) "--no-echo" "-e" "languageserver::run()"];
''; filetypes = ["r" "rmd" "quarto"];
lspConfig = '' root_dir = mkLuaInline ''
lspconfig.r_language_server.setup{ function(bufnr, on_dir)
capabilities = capabilities; on_dir(vim.fs.root(bufnr, '.git') or vim.uv.os_homedir())
on_attach = default_on_attach; end
cmd = ${
if isList cfg.lsp.package
then expToLua cfg.lsp.package
else ''{"${lib.getExe cfg.lsp.package}"}''
}
}
''; '';
}; };
}; };
@ -81,17 +76,10 @@ in {
lsp = { lsp = {
enable = mkEnableOption "R LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "R LSP support" // {default = config.vim.lsp.enable;};
server = mkOption { servers = mkOption {
description = "R LSP server to use"; description = "R LSP server to use";
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServers;
};
package = mkOption {
description = "R LSP server package, or the command to run as a list of strings";
example = literalExpression "[ (lib.getExe pkgs.jdt-language-server) \"-data\" \"~/.cache/jdtls/workspace\" ]";
type = either package (listOf str);
default = servers.${cfg.lsp.server}.package;
}; };
}; };
@ -127,8 +115,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.r-lsp = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
}) })
]); ]);
} }