added fran

This commit is contained in:
Daniel Winkler 2025-09-01 18:03:01 +10:00
commit dcc5a73ee4
2 changed files with 39 additions and 13 deletions

View file

@ -1,5 +1,28 @@
{ {
"nodes": { "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": { "nixCats": {
"inputs": { "inputs": {
"nixCats": "nixCats_2", "nixCats": "nixCats_2",
@ -130,6 +153,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"fran": "fran",
"nixCats": "nixCats", "nixCats": "nixCats",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references", "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",

View file

@ -18,7 +18,7 @@
enabledLanguages = { enabledLanguages = {
julia = false; julia = false;
python = false; python = false;
r = false; r = true;
}; };
## Enable packages ## Enable packages
enabledPackages = { enabledPackages = {
@ -60,18 +60,10 @@
reprex reprex
styler styler
tidyverse tidyverse
(buildRPackage { ] ++ (with final.extraRPackages;[
name = "nvimcom"; nvimcom
src = inputs.plugins-r; httpgd
sourceRoot = "source/nvimcom"; ] );
buildInputs = with prev.rpkgs; [
R
stdenv.cc.cc
gnumake
];
propagatedBuildInputs = [];
})
];
in { in {
quarto = final.rpkgs.quarto.override {extraRPackages = reqPkgs;}; quarto = final.rpkgs.quarto.override {extraRPackages = reqPkgs;};
rWrapper = final.rpkgs.rWrapper.override {packages = reqPkgs;}; rWrapper = final.rpkgs.rWrapper.override {packages = reqPkgs;};
@ -299,6 +291,7 @@
(utils.standardPluginOverlay inputs) (utils.standardPluginOverlay inputs)
extraPkgOverlay extraPkgOverlay
rixOverlay rixOverlay
inputs.fran.overlays.default
rOverlay rOverlay
pythonOverlay pythonOverlay
projectScriptsOverlay projectScriptsOverlay
@ -647,11 +640,20 @@
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
rixpkgs.follows = "rixpkgs"; rixpkgs.follows = "rixpkgs";
fran.follows = "fran";
plugins-cmp-pandoc-references.follows = "plugins-cmp-pandoc-references"; plugins-cmp-pandoc-references.follows = "plugins-cmp-pandoc-references";
plugins-cmp-r.follows = "plugins-cmp-r"; plugins-cmp-r.follows = "plugins-cmp-r";
plugins-r.follows = "plugins-r"; plugins-r.follows = "plugins-r";
}; };
}; };
## Extra R packages
fran = {
url = "github:dwinkler1/fran";
inputs = {
nixpkgs.follows = "rixpkgs";
nvimcom.follows = "plugins-r";
};
};
## Git Plugins ## Git Plugins
"plugins-r" = { "plugins-r" = {
url = "github:R-nvim/R.nvim"; url = "github:R-nvim/R.nvim";