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 ]);