mirror of
https://github.com/dwinkler1/nvimConfig.git
synced 2026-07-07 16:08:22 -04:00
Corrected Rnvim setup
This commit is contained in:
parent
3cf282e4f8
commit
3ba96f380c
4 changed files with 20 additions and 22 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -5,3 +5,4 @@
|
||||||
.nvimcom
|
.nvimcom
|
||||||
.commandcode
|
.commandcode
|
||||||
.commandcode/
|
.commandcode/
|
||||||
|
.r-*
|
||||||
|
|
|
||||||
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -60,49 +60,49 @@
|
||||||
"rnvimsrc": "rnvimsrc"
|
"rnvimsrc": "rnvimsrc"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779438909,
|
"lastModified": 1781392459,
|
||||||
"narHash": "sha256-1lvv0bdvSVyeCIgeZ7Ws7ffbDFurA5LJscS9dRLHzC8=",
|
"narHash": "sha256-9CMG+trBd9AX7cWiGPrMr0eJwuZaql+pj2WVGyT417I=",
|
||||||
"owner": "dwinkler1",
|
"owner": "dwinkler1",
|
||||||
"repo": "r_nvim_nix",
|
"repo": "r_nvim_nix",
|
||||||
"rev": "ec17e22ab362a0ddfd6c2e9c5e95d43897a143be",
|
"rev": "03d7872d7702db37ede41f3c6e4d4ce4c129e862",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "dwinkler1",
|
"owner": "dwinkler1",
|
||||||
"ref": "v0.99.4",
|
"ref": "v0.99.5",
|
||||||
"repo": "r_nvim_nix",
|
"repo": "r_nvim_nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rixpkgs": {
|
"rixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771303851,
|
"lastModified": 1782576256,
|
||||||
"narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=",
|
"narHash": "sha256-KOvpL9DJJmShb64mX9QTjhxHaxE8MizQIqNUAniuJ2E=",
|
||||||
"owner": "dwinkler1",
|
"owner": "dwinkler1",
|
||||||
"repo": "rixpkgs",
|
"repo": "rixpkgs",
|
||||||
"rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
|
"rev": "815afc01bc0cc9a2eba80906645bd08f976a4401",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "dwinkler1",
|
"owner": "dwinkler1",
|
||||||
|
"ref": "nixpkgs",
|
||||||
"repo": "rixpkgs",
|
"repo": "rixpkgs",
|
||||||
"rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rnvimsrc": {
|
"rnvimsrc": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776905071,
|
"lastModified": 1780759435,
|
||||||
"narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=",
|
"narHash": "sha256-VxgKMOP1hseQre3cas2dmMXZu4PVyl05INla2OdHTU4=",
|
||||||
"owner": "R-nvim",
|
"owner": "R-nvim",
|
||||||
"repo": "R.nvim",
|
"repo": "R.nvim",
|
||||||
"rev": "582f2af11290ac067e49018db38e12a511325556",
|
"rev": "6ca306191531c3e3d501ee1609c84a5d29059386",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "R-nvim",
|
"owner": "R-nvim",
|
||||||
"ref": "v0.99.4",
|
"ref": "v0.99.5",
|
||||||
"repo": "R.nvim",
|
"repo": "R.nvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,10 @@
|
||||||
url = "github:BirdeeHub/nix-wrapper-modules";
|
url = "github:BirdeeHub/nix-wrapper-modules";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e";
|
rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs";
|
||||||
|
|
||||||
r-nvim-nix = {
|
r-nvim-nix = {
|
||||||
url = "github:dwinkler1/r_nvim_nix/v0.99.4";
|
url = "github:dwinkler1/r_nvim_nix/v0.99.5";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.follows = "rixpkgs";
|
nixpkgs.follows = "rixpkgs";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,11 @@
|
||||||
{
|
{inputs, ...}: final: prev: let
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: final: prev: let
|
|
||||||
rpkgs = import inputs.rixpkgs {
|
rpkgs = import inputs.rixpkgs {
|
||||||
system = prev.stdenv.hostPlatform.system;
|
system = prev.stdenv.hostPlatform.system;
|
||||||
overlays = [inputs.fran.overlays.default];
|
overlays = [inputs.fran.overlays.default inputs.r-nvim-nix.overlays.default];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
inherit rpkgs;
|
inherit rpkgs;
|
||||||
baseRPackages = [ ];
|
baseRPackages = [rpkgs.nvimcom];
|
||||||
rWrapper = rpkgs.rWrapper.override {packages = [ ];};
|
rWrapper = rpkgs.rWrapper.override {packages = [];};
|
||||||
quarto = rpkgs.quarto.override {extraRPackages = [ ];};
|
quarto = rpkgs.quarto.override {extraRPackages = [];};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue