made r packages an overlay

templates/r/flake.nix

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

templates/r/rpkgs.nix

@@ -1,22 +1,30 @@
-pkgs: with pkgs.rPackages; [
+final: prev: {
-  languageserver
+  rWrapper = prev.rWrapper.override {
-  fixest
+    packages = with prev.rPackages; [
-  dplyr
+      languageserver
-  ggplot2
+      fixest
-  (buildRPackage {
+      dplyr
-    name = "nvimcom";
+      ggplot2
-    src = pkgs.fetchFromGitHub {
+      janitor
-      owner = "R-nvim";
+      tidyr
-      repo = "R.nvim";
+      WeightIt
-      rev = "f30c3b2be9ca1a3c277c5e66f5612774cc3fbcf4";
+      broom
-      sha256 = "sha256-X5ZfbrG7FtGJpnMJ2b7FMY/OM9rIIliFSqnbtudZCZg=";
+      (buildRPackage {
-    };
+        name = "nvimcom";
-    sourceRoot = "source/nvimcom";
+        src = pkgs.fetchFromGitHub {
-    buildInputs = with pkgs; [
+          owner = "R-nvim";
-      R
+          repo = "R.nvim";
-      gcc
+          rev = "f30c3b2be9ca1a3c277c5e66f5612774cc3fbcf4";
-      gnumake
+          sha256 = "sha256-X5ZfbrG7FtGJpnMJ2b7FMY/OM9rIIliFSqnbtudZCZg=";
+        };
+        sourceRoot = "source/nvimcom";
+        buildInputs = with prev; [
+          R
+          gcc
+          gnumake
+        ];
+        propagatedBuildInputs = [ ];
+      })
     ];
-    propagatedBuildInputs = [ ];
+  };
-  })
+}
-]