diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock
index 8ae7a66..da99989 100644
--- a/templates/rde/flake.lock
+++ b/templates/rde/flake.lock
@@ -6,9 +6,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
-        "plugins-cmp-r": "plugins-cmp-r",
-        "plugins-r": "plugins-r",
+        "plugins-cmp-pandoc-references": [
+          "plugins-cmp-pandoc-references"
+        ],
+        "plugins-cmp-r": [
+          "plugins-cmp-r"
+        ],
+        "plugins-r": [
+          "plugins-r"
+        ],
         "rixpkgs": [
           "rixpkgs"
         ]
@@ -74,22 +80,6 @@
         "type": "github"
       }
     },
-    "plugins-cmp-pandoc-references_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1743491695,
-        "narHash": "sha256-XsdneGNJzmRBggk8lz9JNDQYk7wbYfUAF2oZLXzFb9c=",
-        "owner": "jmbuhr",
-        "repo": "cmp-pandoc-references",
-        "rev": "130eae4f75029d6495808e0ea4b769fa1ce4c9ac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jmbuhr",
-        "repo": "cmp-pandoc-references",
-        "type": "github"
-      }
-    },
     "plugins-cmp-r": {
       "flake": false,
       "locked": {
@@ -106,22 +96,6 @@
         "type": "github"
       }
     },
-    "plugins-cmp-r_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1746709841,
-        "narHash": "sha256-TwmLSILu1H3RyRivCQlbsgUN4dsEqO1E8Hx71N/lFws=",
-        "owner": "R-nvim",
-        "repo": "cmp-r",
-        "rev": "602f399c4efde01147cadfebcc884b7aa154f8b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "R-nvim",
-        "repo": "cmp-r",
-        "type": "github"
-      }
-    },
     "plugins-r": {
       "flake": false,
       "locked": {
@@ -138,22 +112,6 @@
         "type": "github"
       }
     },
-    "plugins-r_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1755532199,
-        "narHash": "sha256-mb8HCaMasPUP9JZUkH1sPrtdbhM2HMUkJEKDsRt6wTs=",
-        "owner": "R-nvim",
-        "repo": "R.nvim",
-        "rev": "fd992e1c13ad3df794a30af2e937b994bf7bf4db",
-        "type": "github"
-      },
-      "original": {
-        "owner": "R-nvim",
-        "repo": "R.nvim",
-        "type": "github"
-      }
-    },
     "rixpkgs": {
       "locked": {
         "lastModified": 1754915244,
@@ -170,9 +128,9 @@
       "inputs": {
         "nixCats": "nixCats",
         "nixpkgs": "nixpkgs",
-        "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references_2",
-        "plugins-cmp-r": "plugins-cmp-r_2",
-        "plugins-r": "plugins-r_2",
+        "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
+        "plugins-cmp-r": "plugins-cmp-r",
+        "plugins-r": "plugins-r",
         "rixpkgs": "rixpkgs"
       }
     }
diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix
index 97f893e..7cad7d3 100644
--- a/templates/rde/flake.nix
+++ b/templates/rde/flake.nix
@@ -5,8 +5,13 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nixCats = {
       url = "github:dwinkler1/nixCatsConfig";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.rixpkgs.follows = "rixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        rixpkgs.follows = "rixpkgs";
+        plugins-cmp-pandoc-references.follows = "plugins-cmp-pandoc-references";
+        plugins-cmp-r.follows = "plugins-cmp-r";
+        plugins-r.follows = "plugins-r";
+      };
     };
     ## Git Plugins
     "plugins-r" = {
@@ -164,7 +169,7 @@
           echo "✓ Initialized Git repository and added: flake.nix, flake.lock"
         fi
         # Check if files are already staged/tracked before adding
-        if ! git diff --cached --name-only | grep -q "flake.nix\|flake.lock" && 
+        if ! git diff --cached --name-only | grep -q "flake.nix\|flake.lock" &&
            ! git ls-files --error-unmatch flake.nix flake.lock >/dev/null 2>&1; then
           echo "✓ Adding flake.nix, flake.lock to Git repository"
           git add flake.nix flake.lock
@@ -543,4 +548,14 @@
         };
     });
   };
+  nixConfig = {
+    extra-substituters = [
+      "https://rstats-on-nix.cachix.org"
+      "https://rde.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "rstats-on-nix.cachix.org-1:vdiiVgocg6WeJrODIqdprZRUrhi1JzhBnXv7aWI6+F0="
+      "rde.cachix.org-1:yRxQYM+69N/dVER6HNWRjsjytZnJVXLS/+t/LI9d1D4="
+    ];
+  };
 }