diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix index 988aa017..1b0301dd 100644 --- a/modules/plugins/languages/r.nix +++ b/modules/plugins/languages/r.nix @@ -7,6 +7,7 @@ inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.meta) getExe; + inherit (lib.nvim.types) mkGrammarOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.lists) isList; inherit (lib.types) enum either listOf package str bool; @@ -41,15 +42,6 @@ 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;}; @@ -69,11 +61,6 @@ in { }; 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;