diff --git a/.gitignore b/.gitignore
index e402ff0..6e33f00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 .nvimcom
 .commandcode
 .commandcode/
+.r-*
diff --git a/flake.lock b/flake.lock
index 0b89d7a..fb4f1c8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776413584,
-        "narHash": "sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E=",
+        "lastModified": 1781337902,
+        "narHash": "sha256-QjXxUvpOBbnlpSskBOZJ9nUbpYyFRD4cBo4s1aHniGs=",
         "owner": "dwinkler1",
         "repo": "fran",
-        "rev": "da09626e4dd8f0f57078b3a04e0443a8c20defa1",
+        "rev": "30ab141871ede23b245a90afea58e076ef83b515",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "lastModified": 1782467914,
+        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
         "type": "github"
       },
       "original": {
@@ -60,49 +60,49 @@
         "rnvimsrc": "rnvimsrc"
       },
       "locked": {
-        "lastModified": 1779438909,
-        "narHash": "sha256-1lvv0bdvSVyeCIgeZ7Ws7ffbDFurA5LJscS9dRLHzC8=",
+        "lastModified": 1781392459,
+        "narHash": "sha256-9CMG+trBd9AX7cWiGPrMr0eJwuZaql+pj2WVGyT417I=",
         "owner": "dwinkler1",
         "repo": "r_nvim_nix",
-        "rev": "ec17e22ab362a0ddfd6c2e9c5e95d43897a143be",
+        "rev": "03d7872d7702db37ede41f3c6e4d4ce4c129e862",
         "type": "github"
       },
       "original": {
         "owner": "dwinkler1",
-        "ref": "v0.99.4",
+        "ref": "v0.99.5",
         "repo": "r_nvim_nix",
         "type": "github"
       }
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1771303851,
-        "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=",
+        "lastModified": 1782576256,
+        "narHash": "sha256-KOvpL9DJJmShb64mX9QTjhxHaxE8MizQIqNUAniuJ2E=",
         "owner": "dwinkler1",
         "repo": "rixpkgs",
-        "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
+        "rev": "815afc01bc0cc9a2eba80906645bd08f976a4401",
         "type": "github"
       },
       "original": {
         "owner": "dwinkler1",
+        "ref": "nixpkgs",
         "repo": "rixpkgs",
-        "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
         "type": "github"
       }
     },
     "rnvimsrc": {
       "flake": false,
       "locked": {
-        "lastModified": 1776905071,
-        "narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=",
+        "lastModified": 1780759435,
+        "narHash": "sha256-VxgKMOP1hseQre3cas2dmMXZu4PVyl05INla2OdHTU4=",
         "owner": "R-nvim",
         "repo": "R.nvim",
-        "rev": "582f2af11290ac067e49018db38e12a511325556",
+        "rev": "6ca306191531c3e3d501ee1609c84a5d29059386",
         "type": "github"
       },
       "original": {
         "owner": "R-nvim",
-        "ref": "v0.99.4",
+        "ref": "v0.99.5",
         "repo": "R.nvim",
         "type": "github"
       }
@@ -124,11 +124,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779297405,
-        "narHash": "sha256-VFoBwH7ZjVxCnvZTb5ODRXt70sLtWMxstive0N+RS50=",
+        "lastModified": 1782135443,
+        "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "e7ed7a1205945befdf2e0d73ba7df91d935e5af1",
+        "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ee9c05c..d8c0018 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/af2dd3f7b4b172077747c0869d4e30702fb71b0e";
+    rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs";
 
     r-nvim-nix = {
-      url = "github:dwinkler1/r_nvim_nix/v0.99.4";
+      url = "github:dwinkler1/r_nvim_nix/v0.99.5";
       inputs = {
         nixpkgs.follows = "rixpkgs";
       };
diff --git a/overlays/r.nix b/overlays/r.nix
index 18f01dd..e736b77 100644
--- a/overlays/r.nix
+++ b/overlays/r.nix
@@ -1,14 +1,11 @@
-{
-  inputs,
-  ...
-}: final: prev: let
+{inputs, ...}: final: prev: let
   rpkgs = import inputs.rixpkgs {
     system = prev.stdenv.hostPlatform.system;
-    overlays = [inputs.fran.overlays.default];
+    overlays = [inputs.fran.overlays.default inputs.r-nvim-nix.overlays.default];
   };
 in {
   inherit rpkgs;
-  baseRPackages = [ ];
-  rWrapper = rpkgs.rWrapper.override {packages = [ ];};
-  quarto = rpkgs.quarto.override {extraRPackages = [ ];};
+  baseRPackages = [rpkgs.nvimcom];
+  rWrapper = rpkgs.rWrapper.override {packages = [];};
+  quarto = rpkgs.quarto.override {extraRPackages = [];};
 }