refactor

Rix packages repo is now an overlay to nixpkgs-unstable

templates/r/flake.lock

@@ -39,14 +39,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746525332,
-        "narHash": "sha256-hnr+j3EeNt0An/+2N+7p7/UAfR3jWTaHSwHdr7K86aU=",
-        "type": "tarball",
-        "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-05.tar.gz"
+        "lastModified": 1748506378,
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3866ad91cfc172f08a6839def503d8fc2923c603",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
-        "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-05.tar.gz"
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "plugins-r": {
@@ -77,10 +80,23 @@
         "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-04-29.tar.gz"
       }
     },
+    "rixpkgs_2": {
+      "locked": {
+        "lastModified": 1747664360,
+        "narHash": "sha256-DskCWKtHNGApsP3PI/HB+fETs3qXpwul3PtSgTb++N4=",
+        "type": "tarball",
+        "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-19.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-19.tar.gz"
+      }
+    },
     "root": {
       "inputs": {
         "nCats": "nCats",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "rixpkgs": "rixpkgs_2"
       }
     }
   },

templates/r/flake.nix

@@ -1,9 +1,8 @@
 {
   description = "Project Template";
   inputs = {
-    nixpkgs = {
-      url = "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-05.tar.gz";
-    };
+    rixpkgs.url = "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-19.tar.gz";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nCats.url = "github:dwinkler1/nixCatsConfig";
     nCats.inputs.nixpkgs.follows = "nixpkgs";
   };
@@ -23,6 +22,9 @@
             prev.dependencyOverlays
             ++ [
               (utils.standardPluginOverlay inputs)
+              (final: prev: {
+                rpkgs = import inputs.rixpkgs {inherit system;};
+              })
               (import ./rpkgs.nix)
             ];
           categoryDefinitions = utils.mergeCatDefs prev.categoryDefinitions (

templates/r/rpkgs.nix

@@ -1,30 +1,33 @@
-final: prev: {
-  rWrapper = prev.rWrapper.override {
-    packages = with prev.rPackages; [
-      languageserver
-      fixest
-      dplyr
-      ggplot2
-      janitor
-      tidyr
-      WeightIt
-      broom
-      (buildRPackage {
-        name = "nvimcom";
-        src = prev.fetchFromGitHub {
-          owner = "R-nvim";
-          repo = "R.nvim";
-          rev = "f30c3b2be9ca1a3c277c5e66f5612774cc3fbcf4";
-          sha256 = "sha256-X5ZfbrG7FtGJpnMJ2b7FMY/OM9rIIliFSqnbtudZCZg=";
-        };
-        sourceRoot = "source/nvimcom";
-        buildInputs = with prev; [
-          R
-          stdenv.cc.cc
-          gnumake
-        ];
-        propagatedBuildInputs = [];
-      })
-    ];
-  };
+final: prev: let
+  reqPkgs = with prev.rpkgs.rPackages; [
+    Hmisc
+    broom
+    data_table
+    dplyr
+    ggplot2
+    gt
+    janitor
+    psych
+    tidyr
+    languageserver
+    (buildRPackage {
+      name = "nvimcom";
+      src = prev.rpkgs.fetchFromGitHub {
+        owner = "R-nvim";
+        repo = "R.nvim";
+        rev = "382858fcf23aabbf47ff06279baf69d52260b939";
+        sha256 = "sha256-j2rXXO7246Nh8U6XyX43nNTbrire9ta9Ono9Yr+Eh9M=";
+      };
+      sourceRoot = "source/nvimcom";
+      buildInputs = with prev.rpkgs; [
+        R
+        stdenv.cc.cc
+        gnumake
+      ];
+      propagatedBuildInputs = [];
+    })
+  ];
+in {
+  rWrapper = prev.rpkgs.rWrapper.override {packages = reqPkgs;};
+  quarto = prev.rpkgs.quarto.override {extraRPackages = reqPkgs;};
 }