From 458332a141840cdad6dc431a8fe9c3f3be5fea94 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sat, 23 May 2026 23:44:56 +1000
Subject: [PATCH] hopefully R fix

---
 README.md                                 | 2 +-
 modules/module/settings/cat-packages.nix  | 3 ++-
 modules/module/settings/hosts.nix         | 2 +-
 modules/module/settings/lang-packages.nix | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 715d4c6..068d704 100644
--- a/README.md
+++ b/README.md
@@ -201,7 +201,7 @@ projectSettings = {
 Add Python/R/Julia libraries that get appended to the module defaults. The built-in defaults are:
 
 - Python: `duckdb`, `polars`
-- R: `arrow`, `broom`, `data_table`, `janitor`, `styler`, `nvimcom`
+- R: `arrow`, `broom`, `data_table`, `janitor`, `styler`
 - Julia: `DataFramesMeta`, `QuackIO`
 
 ```nix
diff --git a/modules/module/settings/cat-packages.nix b/modules/module/settings/cat-packages.nix
index 8f027ba..6406327 100644
--- a/modules/module/settings/cat-packages.nix
+++ b/modules/module/settings/cat-packages.nix
@@ -8,6 +8,7 @@ let
   maybe = cat: pkgsList:
     lib.optionals (config.cats.${cat} or false) pkgsList;
   rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
+  rWrapperPackages = rPackages ++ [pkgs.nvimcom];
   quartoPkg =
     if config.cats.r or false
     then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; }
@@ -93,7 +94,7 @@ in
       ]);
 
     r = maybe "r" [
-      (pkgs.rpkgs.rWrapper.override { packages = rPackages; })
+      (pkgs.rpkgs.rWrapper.override { packages = rWrapperPackages; })
       pkgs.rpkgs.radianWrapper
       quartoPkg
       pkgs.air-formatter
diff --git a/modules/module/settings/hosts.nix b/modules/module/settings/hosts.nix
index a47467a..aadd70f 100644
--- a/modules/module/settings/hosts.nix
+++ b/modules/module/settings/hosts.nix
@@ -6,7 +6,7 @@
 }:
 let
   rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
-  rWrapperPkg = pkgs.rpkgs.rWrapper.override { packages = rPackages; };
+  rWrapperPkg = pkgs.rpkgs.rWrapper.override { packages = rPackages ++ [pkgs.nvimcom]; };
 in
 {
   config.hosts = lib.mkMerge [
diff --git a/modules/module/settings/lang-packages.nix b/modules/module/settings/lang-packages.nix
index b6fff27..a91d9a5 100644
--- a/modules/module/settings/lang-packages.nix
+++ b/modules/module/settings/lang-packages.nix
@@ -45,7 +45,6 @@
         janitor
         styler
       ])
-      ++ [pkgs.nvimcom]
     );
     julia = lib.mkDefault [
       "DataFramesMeta"