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

moved r-nvim to flake build

Browse source
This commit is contained in:
Daniel Winkler 2026-05-13 12:30:17 +10:00
commit 1055522af9
9 changed files with 54 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
modules/module/specs/plugins.nix
View file

@ -14,7 +14,7 @@
(config.nvim-lib.neovimPlugins.r.overrideAttrs (old: {
postInstall = (old.postInstall or "") + ''
mkdir -p $out/rnvimserver
cp ${pkgs.nvimcom}/bin/rnvimserver $out/rnvimserver/rnvimserver
cp ${pkgs.rnvimserver}/bin/rnvimserver $out/rnvimserver/rnvimserver
chmod +x $out/rnvimserver/rnvimserver
'';
}))