dwinkl/nvimConfig
1
0
Fork 0
mirror of https://github.com/dwinkler1/nvimConfig.git synced 2026-07-07 16:08:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

hopefully R fix

Browse source
This commit is contained in:
Daniel Winkler 2026-05-23 23:54:07 +10:00
commit 62f456ed46
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/module/settings/cat-packages.nix
View file

@ -8,7 +8,7 @@ let
maybe = cat: pkgsList: maybe = cat: pkgsList:
lib.optionals (config.cats.${cat} or false) pkgsList; lib.optionals (config.cats.${cat} or false) pkgsList;
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r; rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
rWrapperPackages = rPackages ++ [pkgs.nvimcom]; rWrapperPackages = rPackages;
quartoPkg = quartoPkg =
if config.cats.r or false if config.cats.r or false
then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; } then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; }

7
modules/module/settings/env.nix
View file

@ -13,15 +13,10 @@
}) })
(lib.mkIf (config.cats.r or false) { (lib.mkIf (config.cats.r or false) {
RNVIM_COMPLDIR = "$PWD/.r-compl"; RNVIM_COMPLDIR = "$PWD/.r-compl";
R_LIBS_USER = "$PWD/.r-libs";
TMPDIR = "$PWD/.r-tmp"; TMPDIR = "$PWD/.r-tmp";
}) })
]; ];
# Environment variables with defaults (can be overridden by user) # Environment variables with defaults (can be overridden by user)
config.envDefault = lib.mkMerge [ config.envDefault = lib.mkMerge [ ];
(lib.mkIf (config.cats.r or false) {
R_LIBS_USER = "$PWD/.r-libs";
})
];
} }