chore: bring back dogfood for display

divnix · Jun 22, 2023 · c1c2f32 · c1c2f32
1 parent 4e9e5f0
commit c1c2f32
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 39 deletions.
diff --git a/dogfood.nix b/dogfood.nix
@@ -0,0 +1,41 @@
+std: inputs: let
+  inherit (inputs) incl;
+  inherit (inputs.paisano) pick harvest;
+in
+  std.growOn {
+    inherit inputs;
+    cellsFrom = incl ./src ["std" "lib"];
+    cellBlocks = with std.blockTypes; [
+      ## For downstream use
+
+      # std
+      (runnables "cli" {ci.build = true;})
+      (functions "devshellProfiles")
+      (functions "errors")
+      (data "templates")
+
+      # lib
+      (functions "dev")
+      (functions "ops")
+      (nixago "cfg")
+    ];
+  }
+  (std.grow {
+    inherit inputs;
+    cellsFrom = incl ./src ["local" "tests"];
+    cellBlocks = with std.blockTypes; [
+      ## For local use in the Standard repository
+      # local
+      (devshells "shells" {ci.build = true;})
+      (nixago "configs")
+      (containers "containers")
+      (namaka "checks")
+    ];
+  })
+  {
+    # auxiliary outputs
+    devShells = harvest inputs.self ["local" "shells"];
+    packages = harvest inputs.self [["std" "cli"] ["std" "packages"]];
+    templates = pick inputs.self ["std" "templates"];
+    checks = pick inputs.self ["tests" "checks"];
+  }
diff --git a/flake.nix b/flake.nix
@@ -54,53 +54,16 @@
     };
     # load fwlib again through the framework
     # to enable input overloading for blocktypes
-    std = pick (fwlib.grow {
+    std = inputs.paisano.pick (fwlib.grow {
       inherit inputs;
       cellsFrom = inputs.incl ./src ["std"];
       cellBlocks = [(fwlib.blockTypes.functions "fwlib")];
     }) ["std" "fwlib"];
-    inherit (inputs.paisano) pick harvest;
   in
-    std.growOn {
-      inherit inputs;
-      cellsFrom = ./src;
-      cellBlocks = with std.blockTypes; [
-        ## For downstream use
-
-        # std
-        (runnables "cli" {ci.build = true;})
-        (functions "devshellProfiles")
-        (functions "errors")
-
-        # lib
-        (functions "dev")
-        (functions "ops")
-        (nixago "cfg")
-
-        # presets
-        (data "templates")
-        (nixago "nixago")
-
-        ## For local use in the Standard repository
-
-        # local
-        (devshells "shells" {ci.build = true;})
-        (nixago "configs")
-        (containers "containers")
-        (namaka "checks")
-      ];
-    }
-    {
+    (import ./dogfood.nix std inputs) {
       # the framework's basic top-level tools
       inherit (inputs) yants dmerge incl;
       inherit (inputs.paisano) pick harvest winnow;
       inherit (std) blockTypes actions dataWith flakeModule grow growOn;
-    }
-    {
-      # auxiliary outputs
-      devShells = harvest inputs.self ["local" "shells"];
-      packages = harvest inputs.self [["std" "cli"] ["std" "packages"]];
-      templates = pick inputs.self ["std" "templates"];
-      checks = pick inputs.self ["tests" "checks"];
     };
 }