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:38:18 +10:00
commit d218b05d48
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,11 @@
let 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;
quartoPkg =
if config.cats.r or false
then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; }
else pkgs.quarto;
in in
{ {
options.catPkgs = lib.mkOption { options.catPkgs = lib.mkOption {
@ -35,7 +40,7 @@ in
markdown = maybe "markdown" (with pkgs; [ markdown = maybe "markdown" (with pkgs; [
python313Packages.pylatexenc python313Packages.pylatexenc
quarto quartoPkg
zk zk
]); ]);
@ -87,16 +92,14 @@ in
uv uv
]); ]);
r = maybe "r" (let r = maybe "r" [
r_packages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r; (pkgs.rpkgs.rWrapper.override { packages = rPackages; })
in [
(pkgs.rpkgs.rWrapper.override { packages = r_packages; })
pkgs.rpkgs.radianWrapper pkgs.rpkgs.radianWrapper
(pkgs.rpkgs.quarto.override { extraRPackages = r_packages; }) quartoPkg
pkgs.air-formatter pkgs.air-formatter
pkgs.yaml-language-server pkgs.yaml-language-server
pkgs.rnvimserver pkgs.rnvimserver
]); ];
# cats without packages get empty lists # cats without packages get empty lists
general = [ ]; general = [ ];

6
modules/module/settings/hosts.nix
View file

@ -4,6 +4,10 @@
lib, lib,
... ...
}: }:
let
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
rWrapperPkg = pkgs.rpkgs.rWrapper.override { packages = rPackages; };
in
{ {
config.hosts = lib.mkMerge [ config.hosts = lib.mkMerge [
{ {
@ -45,7 +49,7 @@
(lib.mkIf (config.cats.r or false) { (lib.mkIf (config.cats.r or false) {
r = { r = {
nvim-host.enable = true; nvim-host.enable = true;
nvim-host.package = "${pkgs.rWrapper}/bin/R"; nvim-host.package = "${rWrapperPkg}/bin/R";
nvim-host.argv0 = "R"; nvim-host.argv0 = "R";
nvim-host.addFlag = [ nvim-host.addFlag = [
"--no-save" "--no-save"