made r packages an overlay

templates/r/flake.nix

@@ -7,23 +7,24 @@
     nCats.url = "github:dwinkler1/nixCatsConfig";
     nCats.inputs.nixpkgs.follows = "nixpkgs";
   };
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     nCats,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
     forSystems = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all;
-    in
+  in {
-    {
     packages = forSystems (
-        system:
+      system: let
-        let
-
         inherit (nCats) utils;
         finalPackage = nCats.packages.${system}.default.override (prev: {
+          dependencyOverlays =
+            prev.dependencyOverlays
+            ++ [
+              (utils.standardPluginOverlay inputs)
+              (import ./rpkgs.nix)
+            ];
           categoryDefinitions = utils.mergeCatDefs prev.categoryDefinitions (
             {
               pkgs,
@@ -33,25 +34,22 @@
               extra,
               mkPlugin,
               ...
-              }@packageDef:
+            } @ packageDef: let
-              let
               rpkgs = import ./rpkgs.nix pkgs;
-              in
+            in {
-              {
               lspsAndRuntimeDeps.rdev = with pkgs; [
-                  (rWrapper.override {
+                rWrapper
-                    packages = rpkgs;
-                  })
                 just
                 wget
               ];
             }
           );
 
-            packageDefinitions = prev.packageDefinitions // {
+          packageDefinitions =
+            prev.packageDefinitions
+            // {
               nixCats = utils.mergeCatDefs prev.packageDefinitions.nixCats (
-                { ... }:
+                {...}: {
-                {
                   settings = {
                     suffix-path = false;
                     suffix-LD = false;
@@ -66,7 +64,6 @@
       in
         # and
         utils.mkAllWithDefault finalPackage
-
     );
   };
 }

templates/r/rpkgs.nix

@@ -1,8 +1,14 @@
-pkgs: with pkgs.rPackages; [
+final: prev: {
+  rWrapper = prev.rWrapper.override {
+    packages = with prev.rPackages; [
       languageserver
       fixest
       dplyr
       ggplot2
+      janitor
+      tidyr
+      WeightIt
+      broom
       (buildRPackage {
         name = "nvimcom";
         src = pkgs.fetchFromGitHub {
@@ -12,11 +18,13 @@ pkgs: with pkgs.rPackages; [
           sha256 = "sha256-X5ZfbrG7FtGJpnMJ2b7FMY/OM9rIIliFSqnbtudZCZg=";
         };
         sourceRoot = "source/nvimcom";
-    buildInputs = with pkgs; [
+        buildInputs = with prev; [
           R
           gcc
           gnumake
         ];
         propagatedBuildInputs = [ ];
       })
-]
+    ];
+  };
+}