refactor: layputs.default -> exports

flake.nix

@@ -13,7 +13,7 @@
       } // lib.flakeOutputs;
 
       library = import ./lib/__init.nix { inherit inputs omnibus; };
-      lib = library.layouts.default;
+      lib = library.exports.default;
     in
     lib.flakeOutputs
     // {

lib/mapPopsLayouts.nix

@@ -24,5 +24,5 @@ in
 #     map (attr: f attr set.${attr}) (lib.attrNames set)
 #   );
 lib.mapAttrsRecursiveCond ((as: !(as ? "layouts" && as.layouts ? "default")))
-  (_: v: v.layouts.default or v)
+  (_: v: v.exports.default or v)
   pops

local/cells/repo/configs.nix

@@ -10,12 +10,8 @@
 with inputs.std.inputs.dmerge;
 let
   inherit (inputs) nixpkgs;
-  configs =
-    let
-      inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
-    in
-    inputs.omnibus.pops.configs.addLoadExtender { load.inputs.inputs = inputs'; };
-  inherit (configs.layouts.default) treefmt lefthook conform;
+
+  inherit (cell.pops.configs.exports.default) treefmt lefthook conform;
 in
 {
   inherit treefmt lefthook;

local/cells/repo/devshellProfiles.nix

@@ -1,8 +1 @@
-let
-  inptus' = (inputs.omnibus.pops.flake.setSystem inputs.nixpkgs.system).inputs;
-in
-(inputs.omnibus.pops.devshellProfiles.addLoadExtender {
-  load.inputs = {
-    inputs = inptus';
-  };
-}).layouts.default
+cell.pops.devshellProfiles.exports.self.exports.default

local/cells/repo/pops.nix

@@ -0,0 +1,23 @@
+let
+  inherit (inputs) nixpkgs;
+  inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
+in
+{
+  devshellProfiles =
+    (inputs.omnibus.pops.devshellProfiles.addLoadExtender {
+      load.inputs.inputs = inputs';
+    }).addExporter
+      {
+        exports = {
+          self =
+            (inputs.omnibus.pops.devshellProfiles.addLoadExtender {
+              load.inputs = {
+                inputs = inputs';
+              };
+            });
+        };
+      };
+  configs = inputs.omnibus.pops.configs.addLoadExtender {
+    load.inputs.inputs = inputs';
+  };
+}

local/cells/repo/shells.nix

@@ -12,7 +12,7 @@ in
   default = lib.dev.mkShell {
     name = "omnibus devshell";
 
-    # imports = [ devshellProfiles.rust ];
+    imports = [ cell.pops.devshellProfiles.exports.default.nickel ];
 
     # Tool Homepage: https://nix-community.github.io/nixago/
     # This is Standard's devshell integration.
@@ -22,7 +22,9 @@ in
         cell.configs.conform.custom
       )
       (std.lib.dev.mkNixago std.lib.cfg.lefthook cell.configs.lefthook.default)
-      (std.lib.dev.mkNixago std.lib.cfg.treefmt cell.configs.treefmt.default)
+      (std.lib.dev.mkNixago std.lib.cfg.treefmt cell.configs.treefmt.default
+        cell.configs.treefmt.topiary
+      )
     ];
 
     packages = [ nixpkgs.d2 ];

local/flake.nix

@@ -1,5 +1,16 @@
 {
-  description = "omnibus";
+  nixConfig = {
+    extra-substituters = [
+      "https://tweag-topiary.cachix.org"
+      "https://tweag-nickel.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "tweag-topiary.cachix.org-1:8TKqya43LAfj4qNHnljLpuBnxAY/YwEBfzo3kzXxNY0="
+      "tweag-nickel.cachix.org-1:GIthuiK4LRgnW64ALYEoioVUQBWs0jexyoYVeLDBwRA="
+    ];
+  };
+
+  description = "omnibus & std";
 
   inputs.std.follows = "std-ext/std";
   inputs.nixpkgs.follows = "std-ext/nixpkgs";
@@ -26,6 +37,7 @@
           (nixago "configs")
           (devshells "shells")
           (functions "devshellProfiles")
+          (functions "pops")
         ];
       }
       {