From 5caaa5d3e0a0eb62b10b91565c8db61fbb62f337 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 18 May 2026 07:00:39 +0000 Subject: [PATCH 1/5] 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/da5ad66' (2026-05-10) → 'github:nixos/nixpkgs/d233902' (2026-05-15) • Updated input 'r-nvim-nix': 'github:dwinkler1/r_nvim_nix/e54fb57' (2026-05-13) → 'github:dwinkler1/r_nvim_nix/2f49dfe' (2026-05-13) • Updated input 'wrappers': 'github:BirdeeHub/nix-wrapper-modules/46e7c1e' (2026-05-13) → 'github:BirdeeHub/nix-wrapper-modules/a4d6ea2' (2026-05-18) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 73686b6..43de4b3 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1778683425, - "narHash": "sha256-bY44RR+7q+8R8PDNWbavFEcpSKiBvWyoWHI7iSLvsQc=", + "lastModified": 1778684156, + "narHash": "sha256-Z4y1tQfkIsPK4NRxGn668HMDfWxnxNxSJ0CAOOXiIfY=", "owner": "dwinkler1", "repo": "r_nvim_nix", - "rev": "e54fb57802fa9eca81024762f397ec7caa446842", + "rev": "2f49dfee27886068e2f49cbd54558ce4cc424c82", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1778662548, - "narHash": "sha256-e6XKnrzKr48r1UdCr+5bekibSqe2L1/Sgi46IODHtGQ=", + "lastModified": 1779078555, + "narHash": "sha256-p18v4DHcVqAUwstamlftM+oMsC2Ca2eWX5rlg8o6W+Q=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "46e7c1e3f0e149b28f539eb8601152db8a67ad0c", + "rev": "a4d6ea205928bad051089079edba7a1e35a80a2a", "type": "github" }, "original": { From 4d28d0d4907c2d3d20bdf0c5b2482ccc860114dc Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Tue, 19 May 2026 13:15:29 +1000 Subject: [PATCH 2/5] fix for codecompanion --- flake.lock | 18 +++++++++--------- flake.nix | 2 +- modules/module/specs/plugins.nix | 11 ++++++----- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 73686b6..9fbb80f 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1778683425, - "narHash": "sha256-bY44RR+7q+8R8PDNWbavFEcpSKiBvWyoWHI7iSLvsQc=", + "lastModified": 1778684156, + "narHash": "sha256-Z4y1tQfkIsPK4NRxGn668HMDfWxnxNxSJ0CAOOXiIfY=", "owner": "dwinkler1", "repo": "r_nvim_nix", - "rev": "e54fb57802fa9eca81024762f397ec7caa446842", + "rev": "2f49dfee27886068e2f49cbd54558ce4cc424c82", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1778662548, - "narHash": "sha256-e6XKnrzKr48r1UdCr+5bekibSqe2L1/Sgi46IODHtGQ=", + "lastModified": 1779145538, + "narHash": "sha256-j2RQqBLYhPuddU6C8n5hGKboXq1tDLCZ7bWe5/LgTHM=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "46e7c1e3f0e149b28f539eb8601152db8a67ad0c", + "rev": "597b35c93dd0ab0ae38758e3193582b2fd259aa1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1ffa69a..fa1140a 100644 --- a/flake.nix +++ b/flake.nix @@ -105,7 +105,7 @@ forAllSystems = nixpkgs.lib.genAttrs systems; extra_pkg_config = { - # allowUnfree = true; + allowUnfree = true; }; overlayDefs = import ./overlays inputs; diff --git a/modules/module/specs/plugins.nix b/modules/module/specs/plugins.nix index ca8d970..431005d 100644 --- a/modules/module/specs/plugins.nix +++ b/modules/module/specs/plugins.nix @@ -3,10 +3,9 @@ pkgs, lib, ... -}: -{ +}: { config.specs.gitPlugins = { - data = [ ]; + data = []; }; config.specs.r = { @@ -112,7 +111,9 @@ nvim-treesitter-context nvim-treesitter-textobjects { - data = pkgs.codecompanion-nvim; + data = pkgs.codecompanion-nvim.overrideAttrs (old: { + doCheck = false; + }); pname = "codecompanion"; } ]; @@ -176,6 +177,6 @@ config.specs.gitPlugins-lazy = { lazy = true; - data = [ ]; + data = []; }; } From bfd4ba417d3f385436974b5388981994116a13d0 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Tue, 19 May 2026 13:18:29 +1000 Subject: [PATCH 3/5] remove languageserver package from config --- plugin/25_lsp.lua | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/plugin/25_lsp.lua b/plugin/25_lsp.lua index 9591da3..8c67295 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 ad9473a9166fc7e220449c9fd7625f8c52e05423 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Tue, 19 May 2026 13:28:40 +1000 Subject: [PATCH 4/5] different ls --- plugin/25_lsp.lua | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/plugin/25_lsp.lua b/plugin/25_lsp.lua index 8c67295..f3c4c50 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_ls = { + filetypes = { 'r', 'rmd', 'rmarkdown' }, + settings = { + ['r_ls'] = { + lsp = { + rich_documentation = true, + enable = true, + }, + }, + } + }, julials = { settings = { julia = { From 7715ce18a5175b77468f49af3b6145bfce831512 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 19 May 2026 06:52:18 +0000 Subject: [PATCH 5/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'wrappers': 'github:BirdeeHub/nix-wrapper-modules/597b35c' (2026-05-18) → 'github:BirdeeHub/nix-wrapper-modules/7fe1af6' (2026-05-19) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9fbb80f..83ccd9a 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1779145538, - "narHash": "sha256-j2RQqBLYhPuddU6C8n5hGKboXq1tDLCZ7bWe5/LgTHM=", + "lastModified": 1779172953, + "narHash": "sha256-+GFVS5x/04IQVAsvTcv0Hv5LJPtNJz23ZdE96SgSK1Q=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "597b35c93dd0ab0ae38758e3193582b2fd259aa1", + "rev": "7fe1af63a393a5ca5f6964a9627eec2c0acdde2e", "type": "github" }, "original": {