diff --git a/.gitignore b/.gitignore index 6e33f00..e402ff0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ .nvimcom .commandcode .commandcode/ -.r-* diff --git a/flake.lock b/flake.lock index fb4f1c8..5820f45 100644 --- a/flake.lock +++ b/flake.lock @@ -60,49 +60,49 @@ "rnvimsrc": "rnvimsrc" }, "locked": { - "lastModified": 1781392459, - "narHash": "sha256-9CMG+trBd9AX7cWiGPrMr0eJwuZaql+pj2WVGyT417I=", + "lastModified": 1779438909, + "narHash": "sha256-1lvv0bdvSVyeCIgeZ7Ws7ffbDFurA5LJscS9dRLHzC8=", "owner": "dwinkler1", "repo": "r_nvim_nix", - "rev": "03d7872d7702db37ede41f3c6e4d4ce4c129e862", + "rev": "ec17e22ab362a0ddfd6c2e9c5e95d43897a143be", "type": "github" }, "original": { "owner": "dwinkler1", - "ref": "v0.99.5", + "ref": "v0.99.4", "repo": "r_nvim_nix", "type": "github" } }, "rixpkgs": { "locked": { - "lastModified": 1782576256, - "narHash": "sha256-KOvpL9DJJmShb64mX9QTjhxHaxE8MizQIqNUAniuJ2E=", + "lastModified": 1771303851, + "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=", "owner": "dwinkler1", "repo": "rixpkgs", - "rev": "815afc01bc0cc9a2eba80906645bd08f976a4401", + "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", "type": "github" }, "original": { "owner": "dwinkler1", - "ref": "nixpkgs", "repo": "rixpkgs", + "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", "type": "github" } }, "rnvimsrc": { "flake": false, "locked": { - "lastModified": 1780759435, - "narHash": "sha256-VxgKMOP1hseQre3cas2dmMXZu4PVyl05INla2OdHTU4=", + "lastModified": 1776905071, + "narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=", "owner": "R-nvim", "repo": "R.nvim", - "rev": "6ca306191531c3e3d501ee1609c84a5d29059386", + "rev": "582f2af11290ac067e49018db38e12a511325556", "type": "github" }, "original": { "owner": "R-nvim", - "ref": "v0.99.5", + "ref": "v0.99.4", "repo": "R.nvim", "type": "github" } diff --git a/flake.nix b/flake.nix index d8c0018..ee9c05c 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,10 @@ url = "github:BirdeeHub/nix-wrapper-modules"; inputs.nixpkgs.follows = "nixpkgs"; }; - rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs"; + rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e"; r-nvim-nix = { - url = "github:dwinkler1/r_nvim_nix/v0.99.5"; + url = "github:dwinkler1/r_nvim_nix/v0.99.4"; inputs = { nixpkgs.follows = "rixpkgs"; }; diff --git a/overlays/r.nix b/overlays/r.nix index e736b77..18f01dd 100644 --- a/overlays/r.nix +++ b/overlays/r.nix @@ -1,11 +1,14 @@ -{inputs, ...}: final: prev: let +{ + inputs, + ... +}: final: prev: let rpkgs = import inputs.rixpkgs { system = prev.stdenv.hostPlatform.system; - overlays = [inputs.fran.overlays.default inputs.r-nvim-nix.overlays.default]; + overlays = [inputs.fran.overlays.default]; }; in { inherit rpkgs; - baseRPackages = [rpkgs.nvimcom]; - rWrapper = rpkgs.rWrapper.override {packages = [];}; - quarto = rpkgs.quarto.override {extraRPackages = [];}; + baseRPackages = [ ]; + rWrapper = rpkgs.rWrapper.override {packages = [ ];}; + quarto = rpkgs.quarto.override {extraRPackages = [ ];}; }