diff --git a/.gitignore b/.gitignore index 5bfb5c9..457fcaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .DS_Store .direnv +*.R +.Rlibs diff --git a/flake.lock b/flake.lock index b952666..cc0bc5c 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1769731670, - "narHash": "sha256-iHq0bwOsDI5IkJuxVsljdztZdVKIBb8yO0RBRMrco68=", + "lastModified": 1769745458, + "narHash": "sha256-Fq6THKEiAKx+wWQ4wTg9HvOAyD6i8JkWfHVQDZH7Byo=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "4622dd5ef8e152475fce48307d3bc77211249c6a", + "rev": "cc5e052dd1e93ae75dc06e3fabf46f0820c272f2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7d4dd7d..edb2913 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ nix = true; optional = false; python = false; - r = true; + r = false; }; settings = { @@ -132,8 +132,8 @@ in { default = nvimPkg; vv = nvimPkg; - vim = nvimPkg; - nvim = nvimPkg; + #vim = nvimPkg; + #nvim = nvimPkg; } ); diff --git a/modules/module/settings/core.nix b/modules/module/settings/core.nix index 1f9039f..6db12a6 100644 --- a/modules/module/settings/core.nix +++ b/modules/module/settings/core.nix @@ -28,7 +28,7 @@ config.settings.dont_link = false; # Create additional aliases for the binary - config.settings.aliases = [ "vim" ]; + config.settings.aliases = [ "vvim" ]; # Enable wrapper handling of spec runtimeDeps (template pattern). config.settings.autowrapRuntimeDeps = true; diff --git a/overlays/r.nix b/overlays/r.nix index dce7be3..96f149d 100644 --- a/overlays/r.nix +++ b/overlays/r.nix @@ -29,7 +29,7 @@ # Standard R packages used by default in rWrapper and quarto reqPkgs = with rpkgs.rPackages; [ - languageserver +# languageserver ]; in { inherit rpkgs; diff --git a/plugin/25_lsp.lua b/plugin/25_lsp.lua index d943ba1..b888751 100644 --- a/plugin/25_lsp.lua +++ b/plugin/25_lsp.lua @@ -15,17 +15,17 @@ now_if_args(function() marksman = { filetypes = { "markdown", "markdown_inline", "codecompanion" }, }, - r_language_server = { - filetypes = { 'r', 'rmd', 'rmarkdown' }, - settings = { - ['r_language_server'] = { - lsp = { - rich_documentation = true, - enable = true, - }, - }, - } - }, + -- r_language_server = { + -- filetypes = { 'r', 'rmd', 'rmarkdown' }, + -- settings = { + -- ['r_language_server'] = { + -- lsp = { + -- rich_documentation = true, + -- enable = true, + -- }, + -- }, + -- } + -- }, julials = { settings = { julia = {