From 92bd53feeaa483f1686214f2793bf545726bdff6 Mon Sep 17 00:00:00 2001
From: Daniel <22460147+dwinkler1@users.noreply.github.com>
Date: Mon, 27 Jul 2026 00:30:10 +0000
Subject: [PATCH] fix: add ripgrep to always category and revert shellHook to
 use rg

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

diff --git a/flake.nix b/flake.nix
index d55ec6f..db14f58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,9 +69,7 @@
       ''
       + nixpkgs.lib.optionalString (config.cats.r or false) ''
         export R_HOME=$(R RHOME)
-        # Use R itself to discover the library paths, avoiding a dependency on
-        # ripgrep/strings/grep in the devShell PATH.
-        export R_LIBS_SITE=$(Rscript -e 'cat(.libPaths(), sep = ":")')
+        export R_LIBS_SITE=$(strings "$(command -v R)" | rg -o '/nix/store/[^:]+/library' | sort -u | paste -sd: -)
         export R_LIBS_USER="$PWD/.r-libs"
         mkdir -p "$R_LIBS_USER"
       '';
diff --git a/modules/module/settings/cat-packages.nix b/modules/module/settings/cat-packages.nix
index 213f85c..ee1a255 100644
--- a/modules/module/settings/cat-packages.nix
+++ b/modules/module/settings/cat-packages.nix
@@ -25,7 +25,9 @@ in
   };
 
   config.catPkgs = {
-    always = maybe "always" (with pkgs; [ ]);
+    always = maybe "always" (with pkgs; [
+      ripgrep
+    ]);
 
     clickhouse = maybe "clickhouse" (with pkgs; [ clickhouse-lts ]);