refactor: layputs.default -> exports

tao3k · Nov 2, 2023 · 5b45da0 · 5b45da0
1 parent 3a9d5ce
commit 5b45da0
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 36 deletions.
diff --git a/lib/flakeOutputs.nix b/lib/flakeOutputs.nix
@@ -1,5 +1,5 @@
 let
-  outputs = root.mapPopsLayouts super.pops;
+  outputs = root.mapPopsExports super.pops;
 in
 {
   inherit (outputs)

diff --git a/lib/mapPopsExports'.nix b/lib/mapPopsExports'.nix
@@ -0,0 +1,3 @@
+{ lib }:
+pops:
+lib.mapAttrsRecursiveCond ((as: !(as ? "exports"))) (_: v: v.exports) pops
diff --git a/lib/mapPopsLayouts.nix → lib/mapPopsExports.nix b/lib/mapPopsLayouts.nix → lib/mapPopsExports.nix
@@ -23,6 +23,6 @@ in
 #   lib.foldl' (a: b: a // b) { } (
 #     map (attr: f attr set.${attr}) (lib.attrNames set)
 #   );
-lib.mapAttrsRecursiveCond ((as: !(as ? "layouts" && as.layouts ? "default")))
+lib.mapAttrsRecursiveCond ((as: !(as ? "exports" && as.exports ? "default")))
   (_: v: v.exports.default or v)
   pops
diff --git a/lib/mapPopsLayouts'.nix b/lib/mapPopsLayouts'.nix
diff --git a/local/cells/repo/devshellProfiles.nix b/local/cells/repo/devshellProfiles.nix
@@ -1 +1 @@
-cell.pops.devshellProfiles.exports.self.exports.default
+cell.pops.devshellProfiles.exports.self
diff --git a/local/cells/repo/pops.nix b/local/cells/repo/pops.nix
@@ -8,8 +8,9 @@ in
       load.inputs.inputs = inputs';
     }).addExporter
       {
-        exports = {
-          self =
+        exports = rec {
+          self = pops.self.exports.default;
+          pops.self =
             (inputs.omnibus.pops.devshellProfiles.addLoadExtender {
               load.inputs = {
                 inputs = inputs';

diff --git a/templates/hivebus/nix/lib/flakeOutputs.nix b/templates/hivebus/nix/lib/flakeOutputs.nix
@@ -11,9 +11,9 @@ let
       (lib.filterAttrs (_: v: v ? "${config}"))
       (lib.mapAttrs (_: v: v.${config}))
     ];
-  inherit (omnibus.lib) mapPopsLayouts;
+  inherit (omnibus.lib) mapPopsExports;
 in
-(mapPopsLayouts super.pops)
+(mapPopsExports super.pops)
 // {
   nixosConfigurations = filterConfigs "nixosConfiguration";
 

diff --git a/templates/nixos/flake.lock b/templates/nixos/flake.lock
diff --git a/templates/nixos/nix/lib/flakeOutputs.nix b/templates/nixos/nix/lib/flakeOutputs.nix
@@ -11,9 +11,9 @@ let
       (lib.filterAttrs (_: v: v ? "${config}"))
       (lib.mapAttrs (_: v: v.${config}))
     ];
-  inherit (omnibus.lib) mapPopsLayouts;
+  inherit (omnibus.lib) mapPopsExports;
 in
-(mapPopsLayouts super.pops)
+(mapPopsExports super.pops)
 // {
   nixosConfigurations = filterConfigs "nixosConfiguration";
 

diff --git a/templates/simple/flake.nix b/templates/simple/flake.nix
@@ -53,9 +53,9 @@
           }
         );
       };
-      inherit (inputs.omnibus.lib) mapPopsLayouts;
+      inherit (inputs.omnibus.lib) mapPopsExports;
     in
-    mapPopsLayouts pops
+    mapPopsExports pops
     // {
       inherit pops;
       nixosConfigurations.simple = inputs.nixos-unstable.lib.nixosSystem {

diff --git a/tests/nixos/__fixture/layouts.nix b/tests/nixos/__fixture/layouts.nix
@@ -1,9 +1,9 @@
 let
   inherit (inputs) nixpkgs darwin nixos;
   # exports.default to be default
-  outputs = omnibus.lib.mapPopsLayouts' super.pops;
+  outputs = omnibus.lib.mapPopsExports' super.pops;
   # with multi-layout
-  outputs' = omnibus.lib.mapPopsLayouts super.pops;
+  outputs' = omnibus.lib.mapPopsExports super.pops;
 in
 {
   system = "x86_64-linux";