From 62f456ed46a4c283877bad845af6e404d637284a Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sat, 23 May 2026 23:54:07 +1000
Subject: [PATCH] hopefully R fix

---
 modules/module/settings/cat-packages.nix | 2 +-
 modules/module/settings/env.nix          | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/module/settings/cat-packages.nix b/modules/module/settings/cat-packages.nix
index 6406327..b92c331 100644
--- a/modules/module/settings/cat-packages.nix
+++ b/modules/module/settings/cat-packages.nix
@@ -8,7 +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];
+  rWrapperPackages = rPackages;
   quartoPkg =
     if config.cats.r or false
     then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; }
diff --git a/modules/module/settings/env.nix b/modules/module/settings/env.nix
index d7ecc36..c7a1a8b 100644
--- a/modules/module/settings/env.nix
+++ b/modules/module/settings/env.nix
@@ -13,15 +13,10 @@
     })
     (lib.mkIf (config.cats.r or false) {
       RNVIM_COMPLDIR = "$PWD/.r-compl";
-      R_LIBS_USER = "$PWD/.r-libs";
       TMPDIR = "$PWD/.r-tmp";
     })
   ];
 
   # Environment variables with defaults (can be overridden by user)
-  config.envDefault = lib.mkMerge [
-    (lib.mkIf (config.cats.r or false) {
-      R_LIBS_USER = "$PWD/.r-libs";
-    })
-  ];
+  config.envDefault = lib.mkMerge [ ];
 }