From ed24f176bc7bdb3a042d8fbca9a5e9a1fa165209 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Sun, 3 May 2026 16:58:11 +1000 Subject: [PATCH 1/4] feat(r): add R languageserver for Neovim LSP - Add languageserver to settings.lang_packages.r - Enable r_language_server in LSP config (plugin/25_lsp.lua) --- flake.nix | 1 + plugin/25_lsp.lua | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 6dc8545..f7db07c 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,7 @@ broom data_table janitor + languageserver styler ]; julia = ["DataFramesMeta" "QuackIO"]; diff --git a/plugin/25_lsp.lua b/plugin/25_lsp.lua index 8c67295..9591da3 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 = { From b9dbf83c9952fb483a2551944d723a764eb96a07 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 6 May 2026 06:09:19 +0000 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/4bd9165' (2026-04-14) → 'github:nixos/nixpkgs/549bd84' (2026-05-05) • Updated input 'plugins-r': 'github:R-nvim/R.nvim/b9cfffe' (2026-04-16) → 'github:R-nvim/R.nvim/09d6340' (2026-05-04) • Updated input 'wrappers': 'github:BirdeeHub/nix-wrapper-modules/f11469c' (2026-04-16) → 'github:BirdeeHub/nix-wrapper-modules/dc51840' (2026-05-05) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 78a5bd8..d0cee4d 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "plugins-r": { "flake": false, "locked": { - "lastModified": 1776340770, - "narHash": "sha256-o/8UZIc/Bq9dWTjA+MpSR5uMUpE7KHTErk+TwWID8Ww=", + "lastModified": 1777892669, + "narHash": "sha256-FXA1td1E4/Hz7uwvYxvbxDSwOeDPEsP+PD0vO6FQkIU=", "owner": "R-nvim", "repo": "R.nvim", - "rev": "b9cfffeb9b4e484aa9e13f01c0eb80230aada455", + "rev": "09d63401160d202f96630f24febffbb29c71732e", "type": "github" }, "original": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1776375800, - "narHash": "sha256-/SSAR77Brr9fbapsh1cb2K47JXCbvwS1GjM4yyDxle8=", + "lastModified": 1777991014, + "narHash": "sha256-0DS24OW9d9iz+w0LCz6KpS2IpE2z2gHxeBdMZg9xpDY=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "f11469ca69068bac13d9e163b2bd268cc06dff57", + "rev": "dc5184095ad488e937ec308b52c9c0b218959d8b", "type": "github" }, "original": { From 4884bf685f157da4f4d60f8e40febeac0b9bf0e9 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Thu, 7 May 2026 10:48:37 +1000 Subject: [PATCH 3/4] up --- flake.lock | 19 ++++++++++--------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 78a5bd8..32a6765 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -55,15 +55,16 @@ "plugins-r": { "flake": false, "locked": { - "lastModified": 1776340770, - "narHash": "sha256-o/8UZIc/Bq9dWTjA+MpSR5uMUpE7KHTErk+TwWID8Ww=", + "lastModified": 1776905071, + "narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=", "owner": "R-nvim", "repo": "R.nvim", - "rev": "b9cfffeb9b4e484aa9e13f01c0eb80230aada455", + "rev": "582f2af11290ac067e49018db38e12a511325556", "type": "github" }, "original": { "owner": "R-nvim", + "ref": "v0.99.4", "repo": "R.nvim", "type": "github" } @@ -101,11 +102,11 @@ ] }, "locked": { - "lastModified": 1776375800, - "narHash": "sha256-/SSAR77Brr9fbapsh1cb2K47JXCbvwS1GjM4yyDxle8=", + "lastModified": 1777991014, + "narHash": "sha256-0DS24OW9d9iz+w0LCz6KpS2IpE2z2gHxeBdMZg9xpDY=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "f11469ca69068bac13d9e163b2bd268cc06dff57", + "rev": "dc5184095ad488e937ec308b52c9c0b218959d8b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f7db07c..8482605 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ }; "plugins-r" = { - url = "github:R-nvim/R.nvim"; + url = "github:R-nvim/R.nvim/v0.99.4"; flake = false; }; From ce0c5a1dc89654382596f540c3603d8531516dc1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 7 May 2026 06:14:31 +0000 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'rixpkgs': 'github:dwinkler1/rixpkgs/af2dd3f' (2026-02-17) → 'github:dwinkler1/rixpkgs/028af91' (2026-05-07) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 32a6765..d931e59 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ }, "rixpkgs": { "locked": { - "lastModified": 1771303851, - "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=", + "lastModified": 1778115084, + "narHash": "sha256-K+Rz+pghAmynE83+e9svnNYsDgPnbEohrcPb6duG5wM=", "owner": "dwinkler1", "repo": "rixpkgs", - "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", + "rev": "028af91e9161008fce750f3e249afe471a302037", "type": "github" }, "original": {