From 6915c3f7644da6cd233df90700f6e49620eb910a Mon Sep 17 00:00:00 2001 From: Soliprem Date: Fri, 20 Sep 2024 14:29:07 +0200 Subject: [PATCH 1/3] r: implementing lsp --- configuration.nix | 1 + modules/plugins/languages/default.nix | 1 + modules/plugins/languages/r.nix | 82 +++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 modules/plugins/languages/r.nix diff --git a/configuration.nix b/configuration.nix index b0c613b2..954e811c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -60,6 +60,7 @@ isMaximal: { python.enable = isMaximal; dart.enable = isMaximal; bash.enable = isMaximal; + r.enable = isMaximal; tailwind.enable = isMaximal; typst.enable = isMaximal; clang = { diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index e86a521b..28c1fd8f 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -17,6 +17,7 @@ in { ./ocaml.nix ./php.nix ./python.nix + ./r.nix ./rust.nix ./sql.nix ./svelte.nix diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix new file mode 100644 index 00000000..6b9be04c --- /dev/null +++ b/modules/plugins/languages/r.nix @@ -0,0 +1,82 @@ +{ + config, + pkgs, + lib, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.meta) getExe; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.lists) isList; + inherit (lib.types) enum either listOf package str bool; + inherit (lib.nvim.lua) expToLua; + + cfg = config.vim.languages.r; + + r-with-languageserver = pkgs.rWrapper.override { + packages = with pkgs.rPackages; [languageserver]; + }; + + defaultServer = "r_language_server"; + servers = { + r_language_server = { + package = pkgs.writeShellScriptBin "r_lsp" '' + ${r-with-languageserver}/bin/R --slave -e "languageserver::run()" + ''; + lspConfig = '' + lspconfig.r_language_server.setup{ + capabilities = capabilities; + on_attach = default_on_attach; + cmd = ${ + if isList cfg.lsp.package + then expToLua cfg.lsp.package + else ''{"${lib.getExe cfg.lsp.package}"}'' + } + } + ''; + }; + }; +in { + options.vim.languages.r = { + enable = mkEnableOption "R language support"; + + treesitter = { + enable = mkEnableOption "R treesitter" // {default = config.vim.languages.enableTreesitter;}; + package = mkOption { + description = "R treesitter grammar to use"; + type = package; + default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.r; + }; + }; + + lsp = { + enable = mkEnableOption "R LSP support" // {default = config.vim.languages.enableLSP;}; + + server = mkOption { + description = "R LSP server to use"; + type = enum (attrNames servers); + default = defaultServer; + }; + + 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; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + vim.treesitter.enable = true; + vim.treesitter.grammars = [cfg.treesitter.package]; + }) + + (mkIf cfg.lsp.enable { + vim.lsp.lspconfig.enable = true; + vim.lsp.lspconfig.sources.r-lsp = servers.${cfg.lsp.server}.lspConfig; + }) + ]); +} From ae90ed1706c4999c28544516af950bb145124084 Mon Sep 17 00:00:00 2001 From: Soliprem Date: Tue, 24 Sep 2024 12:21:30 +0200 Subject: [PATCH 2/3] r: version bump to context fixes treesitter bug --- flake.lock | 6 +++--- modules/plugins/languages/r.nix | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 377c0847..9e11e8ce 100644 --- a/flake.lock +++ b/flake.lock @@ -1280,11 +1280,11 @@ "plugin-nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1716388265, - "narHash": "sha256-EY5Si6t7LXcxOP3ubGAAMd3lgbeaCOCIybSKi1Ucx98=", + "lastModified": 1726947805, + "narHash": "sha256-5oN/vyhSqDqjLEzECj01A7A+Yq7U1H1HXLbzkC1Ljqw=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683", + "rev": "3d5390c49e3f8fe457b376df2a49aa39d75b7911", "type": "github" }, "original": { diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix index 6b9be04c..7ad1680f 100644 --- a/modules/plugins/languages/r.nix +++ b/modules/plugins/languages/r.nix @@ -6,10 +6,9 @@ }: let inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption literalExpression; - inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.lists) isList; - inherit (lib.types) enum either listOf package str bool; + inherit (lib.types) enum either listOf package str; inherit (lib.nvim.lua) expToLua; cfg = config.vim.languages.r; From 42d7294a5e8e78453bed89d4658df44e80292bab Mon Sep 17 00:00:00 2001 From: Soliprem Date: Tue, 24 Sep 2024 12:34:56 +0200 Subject: [PATCH 3/3] r: changing treesitter package definition to mkGrammarOption --- modules/plugins/languages/r.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix index 7ad1680f..27d7c994 100644 --- a/modules/plugins/languages/r.nix +++ b/modules/plugins/languages/r.nix @@ -10,6 +10,7 @@ inherit (lib.lists) isList; inherit (lib.types) enum either listOf package str; inherit (lib.nvim.lua) expToLua; + inherit (lib.nvim.types) mkGrammarOption; cfg = config.vim.languages.r; @@ -42,11 +43,7 @@ in { treesitter = { enable = mkEnableOption "R treesitter" // {default = config.vim.languages.enableTreesitter;}; - package = mkOption { - description = "R treesitter grammar to use"; - type = package; - default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.r; - }; + package = mkGrammarOption pkgs "r"; }; lsp = {