refactor: remove exporter dir

tao3k · Nov 1, 2023 · 927edff · 927edff
1 parent c93b86a
commit 927edff
Show file tree

Hide file tree

Showing 68 changed files with 121 additions and 83 deletions.
diff --git a/docs/README.org b/docs/README.org
@@ -31,7 +31,7 @@ flake: Flake {
 
   library.flakeOutputs -> outputs
   library.exporter.library -> outputs.lib: without pops interface
-  library.exporter.pops -> outputs.pops
+  library.pops -> outputs.pops
 }
 
 units: units {
@@ -86,8 +86,8 @@ user: User {shape: person}
 extensions <-> user
 flops -> extensions
 flake.outputs.pops -> extensions
-units -> flake.lib.exporter.pops: loading
-flake.library.exporter.pops <- flops.haumea: loader
+units -> flake.lib.pops: loading
+flake.library.pops <- flops.haumea: loader
 flops.haumea -> extensions.APIs.addLoadExtender
 flops.haumea -> extensions.APIs.addLoadExtenders
 

diff --git a/docs/omnibus.d2 b/docs/omnibus.d2
@@ -18,7 +18,7 @@ flake: Flake {
 
   library.flakeOutputs -> outputs
   library.exporter.library -> outputs.lib: without pops interface
-  library.exporter.pops -> outputs.pops
+  library.pops -> outputs.pops
 }
 
 units: units {
@@ -73,8 +73,8 @@ user: User {shape: person}
 extensions <-> user
 flops -> extensions
 flake.outputs.pops -> extensions
-units -> flake.library.exporter.pops: loading
-flake.library.exporter.pops <- flops.haumea: loader
+units -> flake.library.pops: loading
+flake.library.pops <- flops.haumea: loader
 flops.haumea -> extensions.APIs.addLoadExtender
 flops.haumea -> extensions.APIs.addLoadExtenders
 

diff --git a/flake.nix b/flake.nix
@@ -17,14 +17,14 @@
       omnibus = {
         inherit (self) pops;
         inherit lib;
-      } // lib.exporter.flakeOutputs;
+      } // lib.flakeOutputs;
 
       library = import ./lib/__init.nix { inherit inputs omnibus; };
       lib = library.layouts.default;
     in
-    lib.exporter.flakeOutputs
+    lib.flakeOutputs
     // {
-      pops = lib.exporter.pops // {
+      pops = lib.pops // {
         lib = library;
       };
 

diff --git a/lib/exporter/flakeOutputs.nix → lib/flakeOutputs.nix b/lib/exporter/flakeOutputs.nix → lib/flakeOutputs.nix
diff --git a/lib/exporter/pops.nix → lib/pops.nix b/lib/exporter/pops.nix → lib/pops.nix
diff --git a/templates/hivebus/flake.lock b/templates/hivebus/flake.lock
diff --git a/templates/hivebus/flake.nix b/templates/hivebus/flake.nix
@@ -17,9 +17,9 @@
       library = import ./nix/lib/__init.nix { inherit inputs eachSystem; };
       lib = library.layouts.default;
     in
-    lib.exporter.flakeOutputs
+    lib.flakeOutputs
     // {
       inherit lib;
-      pops = lib.exporter.pops;
+      pops = lib.pops;
     };
 }
diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/homeModules.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/homeModules.nix
diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/homeProfiles.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/homeProfiles.nix
diff --git a/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/nixosProfiles.nix b/templates/hivebus/nix/lib/exporter/pops/__hostsLoad/nixosProfiles.nix
diff --git a/templates/hivebus/nix/lib/filterPopsSrc.nix b/templates/hivebus/nix/lib/filterPopsSrc.nix
@@ -1,9 +1,9 @@
 { lib, root }:
 src: dir:
 let
-  inherit (root.exporter.pops.subflake.inputs) nix-filter;
+  inherit (root.pops.subflake.inputs) nix-filter;
   popsDirs = lib.attrNames (
-    lib.removeAttrs root.exporter.pops [
+    lib.removeAttrs root.pops [
       "hosts"
       "omnibus"
     ]
@@ -13,7 +13,7 @@ in
 #   let
 #     srcDirs = lib.attrNames (lib.readDir src);
 #     popsDirs = lib.attrNames (
-#       lib.removeAttrs root.exporter.pops [
+#       lib.removeAttrs root.pops [
 #         "hosts"
 #         "omnibus"
 #       ]

diff --git a/...s/nixos/nix/lib/exporter/flakeOutputs.nix → templates/hivebus/nix/lib/flakeOutputs.nix b/...s/nixos/nix/lib/exporter/flakeOutputs.nix → templates/hivebus/nix/lib/flakeOutputs.nix
@@ -25,7 +25,7 @@ in
       inputs' = (super.pops.flake.setSystem system).inputs;
       allData =
         (super.pops.omnibus.lib.addLoadExtender { load.inputs.inputs = inputs'; })
-        .layouts.default.exporter.pops.allData;
+        .layouts.default.pops.allData;
     in
     {
       data =
@@ -41,7 +41,7 @@ in
     in
     (
       (flops.haumea.pops.default.setInit {
-        src = ../../packages;
+        src = ../packages;
         loader = _: path: inputs.nixpkgs.callPackage path { };
         transformer = [ (_cursor: dir: if dir ? default then dir.default else dir) ];
       })

diff --git a/templates/nixos/nix/lib/exporter/hosts.nix → templates/hivebus/nix/lib/hosts.nix b/templates/nixos/nix/lib/exporter/hosts.nix → templates/hivebus/nix/lib/hosts.nix
@@ -2,7 +2,7 @@
   load = {
     src = inputs.self.outPath + "/units/nixos/hosts";
     inputs = {
-      inputs = inputs // root.exporter.pops.subflake.inputs;
+      inputs = inputs // root.pops.subflake.inputs;
       omnibus = inputs.omnibus // {
         self = root.omnibus.lib.layouts.default;
       };

diff --git a/...porter/pops/__hostsLoad/darwinModules.nix → ...ix/lib/pops/__hostsLoad/darwinModules.nix b/...porter/pops/__hostsLoad/darwinModules.nix → ...ix/lib/pops/__hostsLoad/darwinModules.nix
@@ -1,5 +1,5 @@
 { root, inputs }:
-(root.exporter.pops.nixosModules.addLoadExtender {
+(root.pops.nixosModules.addLoadExtender {
   load = {
     inputs = {
       # only for host

diff --git a/...orter/pops/__hostsLoad/darwinProfiles.nix → ...x/lib/pops/__hostsLoad/darwinProfiles.nix b/...orter/pops/__hostsLoad/darwinProfiles.nix → ...x/lib/pops/__hostsLoad/darwinProfiles.nix
@@ -1,5 +1,5 @@
 { root, inputs }:
-(root.exporter.pops.nixosModules.addLoadExtender {
+(root.pops.nixosModules.addLoadExtender {
   load = {
     inputs = { };
   };

diff --git a/templates/hivebus/nix/lib/pops/__hostsLoad/homeModules.nix b/templates/hivebus/nix/lib/pops/__hostsLoad/homeModules.nix
@@ -0,0 +1 @@
+{ root, inputs }: name: (root.pops.homeModules.addLoadExtender { load = { }; })
diff --git a/templates/hivebus/nix/lib/pops/__hostsLoad/homeProfiles.nix b/templates/hivebus/nix/lib/pops/__hostsLoad/homeProfiles.nix
@@ -0,0 +1 @@
+{ root, inputs }: (root.pops.homeProfiles.addLoadExtender { load = { }; })
diff --git a/...xporter/pops/__hostsLoad/nixosModules.nix → ...nix/lib/pops/__hostsLoad/nixosModules.nix b/...xporter/pops/__hostsLoad/nixosModules.nix → ...nix/lib/pops/__hostsLoad/nixosModules.nix
@@ -1,6 +1,6 @@
 { root, inputs }:
 name:
-(root.exporter.pops.nixosModules.addLoadExtender {
+(root.pops.nixosModules.addLoadExtender {
   load = {
     inputs = { };
   };

diff --git a/templates/hivebus/nix/lib/pops/__hostsLoad/nixosProfiles.nix b/templates/hivebus/nix/lib/pops/__hostsLoad/nixosProfiles.nix
@@ -0,0 +1 @@
+{ root, inputs }: (root.pops.nixosProfiles.addLoadExtender { load = { }; })
diff --git a/...s/nix/lib/exporter/pops/darwinModules.nix → ...es/hivebus/nix/lib/pops/darwinModules.nix b/...s/nix/lib/exporter/pops/darwinModules.nix → ...es/hivebus/nix/lib/pops/darwinModules.nix
diff --git a/.../nix/lib/exporter/pops/darwinProfiles.nix → ...s/hivebus/nix/lib/pops/darwinProfiles.nix b/.../nix/lib/exporter/pops/darwinProfiles.nix → ...s/hivebus/nix/lib/pops/darwinProfiles.nix
diff --git a/...bus/nix/lib/exporter/pops/homeModules.nix → ...ates/hivebus/nix/lib/pops/homeModules.nix b/...bus/nix/lib/exporter/pops/homeModules.nix → ...ates/hivebus/nix/lib/pops/homeModules.nix
diff --git a/...us/nix/lib/exporter/pops/homeProfiles.nix → ...tes/hivebus/nix/lib/pops/homeProfiles.nix b/...us/nix/lib/exporter/pops/homeProfiles.nix → ...tes/hivebus/nix/lib/pops/homeProfiles.nix
diff --git a/...s/hivebus/nix/lib/exporter/pops/hosts.nix → templates/hivebus/nix/lib/pops/hosts.nix b/...s/hivebus/nix/lib/exporter/pops/hosts.nix → templates/hivebus/nix/lib/pops/hosts.nix
diff --git a/...us/nix/lib/exporter/pops/nixosModules.nix → ...tes/hivebus/nix/lib/pops/nixosModules.nix b/...us/nix/lib/exporter/pops/nixosModules.nix → ...tes/hivebus/nix/lib/pops/nixosModules.nix
diff --git a/...s/nix/lib/exporter/pops/nixosProfiles.nix → ...es/hivebus/nix/lib/pops/nixosProfiles.nix b/...s/nix/lib/exporter/pops/nixosProfiles.nix → ...es/hivebus/nix/lib/pops/nixosProfiles.nix
diff --git a/...lib/exporter/pops/omnibus/homeModules.nix → ...ebus/nix/lib/pops/omnibus/homeModules.nix b/...lib/exporter/pops/omnibus/homeModules.nix → ...ebus/nix/lib/pops/omnibus/homeModules.nix
diff --git a/...ib/exporter/pops/omnibus/homeProfiles.nix → ...bus/nix/lib/pops/omnibus/homeProfiles.nix b/...ib/exporter/pops/omnibus/homeProfiles.nix → ...bus/nix/lib/pops/omnibus/homeProfiles.nix
diff --git a/...xos/nix/lib/exporter/pops/omnibus/lib.nix → ...ates/hivebus/nix/lib/pops/omnibus/lib.nix b/...xos/nix/lib/exporter/pops/omnibus/lib.nix → ...ates/hivebus/nix/lib/pops/omnibus/lib.nix
@@ -1,5 +1,5 @@
 omnibus.pops.lib.addLoadExtender {
   load.inputs = {
-    inputs = inputs // root.exporter.pops.subflake.inputs;
+    inputs = inputs // root.pops.subflake.inputs;
   };
 }
diff --git a/...ib/exporter/pops/omnibus/nixosModules.nix → ...bus/nix/lib/pops/omnibus/nixosModules.nix b/...ib/exporter/pops/omnibus/nixosModules.nix → ...bus/nix/lib/pops/omnibus/nixosModules.nix
diff --git a/...b/exporter/pops/omnibus/nixosProfiles.nix → ...us/nix/lib/pops/omnibus/nixosProfiles.nix b/...b/exporter/pops/omnibus/nixosProfiles.nix → ...us/nix/lib/pops/omnibus/nixosProfiles.nix
diff --git a/...s/nix/lib/exporter/pops/omnibus/srvos.nix → ...es/hivebus/nix/lib/pops/omnibus/srvos.nix b/...s/nix/lib/exporter/pops/omnibus/srvos.nix → ...es/hivebus/nix/lib/pops/omnibus/srvos.nix
diff --git a/...ivebus/nix/lib/exporter/pops/subflake.nix → templates/hivebus/nix/lib/pops/subflake.nix b/...ivebus/nix/lib/exporter/pops/subflake.nix → templates/hivebus/nix/lib/pops/subflake.nix
@@ -2,7 +2,7 @@
   POP.extendPop flops.flake.pops.inputsExtender (
     self: super:
     let
-      subflake = omnibus.pops.flake.setInitInputs ../../../lock;
+      subflake = omnibus.pops.flake.setInitInputs ../../lock;
     in
     {
       inputs = subflake.inputs;

diff --git a/templates/nixos/flake.lock b/templates/nixos/flake.lock
diff --git a/templates/nixos/flake.nix b/templates/nixos/flake.nix
@@ -17,9 +17,9 @@
       library = import ./nix/lib/__init.nix { inherit inputs eachSystem; };
       lib = library.layouts.default;
     in
-    lib.exporter.flakeOutputs
+    lib.flakeOutputs
     // {
       inherit lib;
-      pops = lib.exporter.pops;
+      pops = lib.pops;
     };
 }
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/homeModules.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/homeModules.nix
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/homeProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/homeProfiles.nix
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsLoad/nixosProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsLoad/nixosProfiles.nix
diff --git a/templates/nixos/nix/lib/filterPopsSrc.nix b/templates/nixos/nix/lib/filterPopsSrc.nix
@@ -1,9 +1,9 @@
 { lib, root }:
 src: dir:
 let
-  inherit (root.exporter.pops.subflake.inputs) nix-filter;
+  inherit (root.pops.subflake.inputs) nix-filter;
   popsDirs = lib.attrNames (
-    lib.removeAttrs root.exporter.pops [
+    lib.removeAttrs root.pops [
       "hosts"
       "omnibus"
     ]
@@ -13,7 +13,7 @@ in
 #   let
 #     srcDirs = lib.attrNames (lib.readDir src);
 #     popsDirs = lib.attrNames (
-#       lib.removeAttrs root.exporter.pops [
+#       lib.removeAttrs root.pops [
 #         "hosts"
 #         "omnibus"
 #       ]

diff --git a/...hivebus/nix/lib/exporter/flakeOutputs.nix → templates/nixos/nix/lib/flakeOutputs.nix b/...hivebus/nix/lib/exporter/flakeOutputs.nix → templates/nixos/nix/lib/flakeOutputs.nix
@@ -3,8 +3,6 @@
   super,
   omnibus,
   eachSystem,
-  flops,
-  projectDir,
 }:
 let
   filterConfigs =
@@ -27,7 +25,7 @@ in
       inputs' = (super.pops.flake.setSystem system).inputs;
       allData =
         (super.pops.omnibus.lib.addLoadExtender { load.inputs.inputs = inputs'; })
-        .layouts.default.exporter.pops.allData;
+        .layouts.default.pops.allData;
     in
     {
       data =
@@ -43,7 +41,7 @@ in
     in
     (
       (flops.haumea.pops.default.setInit {
-        src = ../../packages;
+        src = ../packages;
         loader = _: path: inputs.nixpkgs.callPackage path { };
         transformer = [ (_cursor: dir: if dir ? default then dir.default else dir) ];
       })

diff --git a/templates/hivebus/nix/lib/exporter/hosts.nix → templates/nixos/nix/lib/hosts.nix b/templates/hivebus/nix/lib/exporter/hosts.nix → templates/nixos/nix/lib/hosts.nix
@@ -2,7 +2,7 @@
   load = {
     src = inputs.self.outPath + "/units/nixos/hosts";
     inputs = {
-      inputs = inputs // root.exporter.pops.subflake.inputs;
+      inputs = inputs // root.pops.subflake.inputs;
       omnibus = inputs.omnibus // {
         self = root.omnibus.lib.layouts.default;
       };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{ root, inputs }: name: (root.pops.homeModules.addLoadExtender { load = { }; })
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{ root, inputs }: (root.pops.homeProfiles.addLoadExtender { load = { }; })
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{ root, inputs }: (root.pops.nixosProfiles.addLoadExtender { load = { }; })