diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index 7295281..cc16584 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "fran": { + "inputs": { + "nixpkgs": [ + "rixpkgs" + ], + "nvimcom": [ + "plugins-r" + ] + }, + "locked": { + "lastModified": 1756709359, + "narHash": "sha256-CUO2ZkeND0PiHMefVQy47buPDP9KXRfXb4HRbIQUbQI=", + "owner": "dwinkler1", + "repo": "fran", + "rev": "416ff93fd4b78d09a31d671bce0b8e084f55e44f", + "type": "github" + }, + "original": { + "owner": "dwinkler1", + "repo": "fran", + "type": "github" + } + }, "nixCats": { "inputs": { "nixCats": "nixCats_2", @@ -130,6 +153,7 @@ }, "root": { "inputs": { + "fran": "fran", "nixCats": "nixCats", "nixpkgs": "nixpkgs", "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references", diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 141d6ee..c23778d 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -18,7 +18,7 @@ enabledLanguages = { julia = false; python = false; - r = false; + r = true; }; ## Enable packages enabledPackages = { @@ -60,18 +60,10 @@ reprex styler tidyverse - (buildRPackage { - name = "nvimcom"; - src = inputs.plugins-r; - sourceRoot = "source/nvimcom"; - buildInputs = with prev.rpkgs; [ - R - stdenv.cc.cc - gnumake - ]; - propagatedBuildInputs = []; - }) - ]; + ] ++ (with final.extraRPackages;[ + nvimcom + httpgd + ] ); in { quarto = final.rpkgs.quarto.override {extraRPackages = reqPkgs;}; rWrapper = final.rpkgs.rWrapper.override {packages = reqPkgs;}; @@ -299,6 +291,7 @@ (utils.standardPluginOverlay inputs) extraPkgOverlay rixOverlay + inputs.fran.overlays.default rOverlay pythonOverlay projectScriptsOverlay @@ -647,11 +640,20 @@ inputs = { nixpkgs.follows = "nixpkgs"; rixpkgs.follows = "rixpkgs"; + fran.follows = "fran"; plugins-cmp-pandoc-references.follows = "plugins-cmp-pandoc-references"; plugins-cmp-r.follows = "plugins-cmp-r"; plugins-r.follows = "plugins-r"; }; }; + ## Extra R packages + fran = { + url = "github:dwinkler1/fran"; + inputs = { + nixpkgs.follows = "rixpkgs"; + nvimcom.follows = "plugins-r"; + }; + }; ## Git Plugins "plugins-r" = { url = "github:R-nvim/R.nvim";