chore: update flops

lib/exporter/flakeOutputs.nix

@@ -12,6 +12,7 @@ in
     homeModules
     devshellModules
     devshellProfiles
+    flake
   ;
 
   units = {
@@ -36,7 +37,6 @@ in
   dotfiles = inputs.self.outPath + "/dotfiles";
 
   # aliases
-  __inputs__ = outputs.loadInputs;
   flakeModules = outputs.flake-parts.profiles;
   flakeProfiles = outputs.flake-parts.modules;
 }

lib/exporter/pops.nix

@@ -8,7 +8,7 @@ let
   };
 in
 {
-  loadInputs = flops.flake.pops.default.setInitInputs (
+  flake = flops.flake.pops.default.setInitInputs (
     inputs.self.outPath + "/local/lock"
   );
 
@@ -73,7 +73,7 @@ in
   };
 
   srvos = flops.haumea.pops.default.setInit {
-    src = self.loadInputs.outputs.srvos + "/nixos";
+    src = self.flake.inputs.srvos + "/nixos";
     type = "nixosProfiles";
     # reset the transformer to the default
     transformer = [ (_: _: _) ];

lib/mapPopsLayouts'.nix

@@ -1,5 +1,3 @@
 { lib }:
 pops:
-lib.mapAttrsRecursiveCond ((as: !(as ? "layouts" || as ? "outputs")))
-  (_: v: v.layouts or v.outputs)
-  pops
+lib.mapAttrsRecursiveCond ((as: !(as ? "layouts"))) (_: v: v.layouts or v) pops

lib/mapPopsLayouts.nix

@@ -1,6 +1,5 @@
 { lib }:
 pops:
-lib.mapAttrsRecursiveCond
-  ((as: !(as ? "layouts" && as.layouts ? "default" || as ? "outputs")))
-  (_: v: v.layouts.default or v.outputs)
+lib.mapAttrsRecursiveCond ((as: !(as ? "layouts" && as.layouts ? "default")))
+  (_: v: v.layouts.default or v)
   pops

local/cells/repo/shells.nix

@@ -8,7 +8,7 @@ let
   inherit (inputs) nixpkgs;
   devshellProfiles =
     let
-      __inptus__ = (inputs.omnibus.pops.loadInputs.setSystem nixpkgs.system).outputs;
+      __inptus__ = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
     in
     (inputs.omnibus.devshell.loadProfiles.addLoadExtender {
       inputs = {

templates/nixos/nix/lib/exporter/flakeOutputs.nix

@@ -1,3 +1,9 @@
+{
+  lib,
+  super,
+  omnibus,
+  eachSystem,
+}:
 let
   filterConfigs =
     config:
@@ -17,13 +23,13 @@ in
     system:
     let
       inputs' = (super.inputs.setSystem system).outputs;
-      loadDataAll =
+      dataAll =
         (super.pops.omnibus.lib.addLoadExtender { load.inputs.inputs = inputs'; })
-        .layouts.default.loadDataAll;
+        .layouts.default.exporter.pops.loadDataAll;
     in
     {
       data =
-        (loadDataAll.addLoadExtender { load.src = projectDir + "/local/data"; })
+        (dataAll.addLoadExtender { load.src = projectDir + "/local/data"; })
         .layouts.default;
     }
   );

templates/nixos/nix/lib/exporter/hosts.nix

@@ -2,7 +2,7 @@
   load = {
     src = inputs.self.outPath + "/nixos/hosts";
     inputs = {
-      inputs = inputs // root.exporter.inputs;
+      inputs = inputs // root.exporter.pops.flake.inputs;
       omnibus = inputs.omnibus // {
         self = root.omnibus.lib.layouts.default;
       };

templates/nixos/nix/lib/exporter/pops/__hostsFun/darwinModules.nix

@@ -1,10 +1,6 @@
-{
-  omnibus,
-  root,
-  inputs,
-}:
+{ root, inputs }:
 name:
-(omnibus.pops.nixosModules.addLoadExtender {
+(root.exporter.pops.nixosModules.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

templates/nixos/nix/lib/exporter/pops/__hostsFun/darwinProfiles.nix

@@ -1,10 +1,6 @@
-{
-  omnibus,
-  root,
-  inputs,
-}:
+{ root, inputs }:
 name:
-(omnibus.pops.nixosModules.addLoadExtender {
+(root.exporter.nixosModules.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

templates/nixos/nix/lib/exporter/pops/__hostsFun/homeModules.nix

@@ -1,10 +1,6 @@
-{
-  omnibus,
-  root,
-  inputs,
-}:
+{ root, inputs }:
 name:
-(omnibus.pops.homeModules.addLoadExtender {
+(root.exporter.pops.homeModules.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

templates/nixos/nix/lib/exporter/pops/__hostsFun/homeProfiles.nix

@@ -1,10 +1,6 @@
-{
-  omnibus,
-  root,
-  inputs,
-}:
+{ root, inputs }:
 name:
-(omnibus.pops.homeProfiles.addLoadExtender {
+(root.exporter.homeProfiles.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

templates/nixos/nix/lib/exporter/pops/__hostsFun/nixosModules.nix

@@ -1,10 +1,6 @@
-{
-  omnibus,
-  root,
-  inputs,
-}:
+{ root, inputs }:
 name:
-(omnibus.pops.nixosModules.addLoadExtender {
+(root.exporter.nixosModules.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

templates/nixos/nix/lib/exporter/pops/__hostsFun/nixosProfiles.nix

@@ -1,10 +1,6 @@
-{
-  omnibus,
-  root,
-  inputs,
-}:
+{ root, inputs }:
 name:
-(omnibus.pops.nixosProfiles.addLoadExtender {
+(root.exporter.pops.nixosProfiles.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

templates/nixos/nix/lib/exporter/inputs.nix → templates/nixos/nix/lib/exporter/pops/flake.nix

@@ -1,13 +1,13 @@
-(omnibus.pops.loadInputs.addInputsExtender (
+(omnibus.pops.flake.addInputsExtender (
   POP.extendPop flops.flake.pops.inputsExtender (
     self: super:
     let
-      selfInputs = omnibus.pops.loadInputs.setInitInputs ../__lock;
+      selfInputs = omnibus.pops.flake.setInitInputs ../../__lock;
     in
     {
       inputs = {
         nixpkgs = inputs.nixpkgs.legacyPackages;
-      } // selfInputs.outputs;
+      } // selfInputs.inputs;
     }
   )
 ))

templates/nixos/nix/lib/exporter/pops/omnibus/lib.nix

@@ -1,5 +1,5 @@
 omnibus.pops.lib.addLoadExtender {
   load.inputs = {
-    inputs = inputs // root.exporter.inputs.outputs;
+    inputs = inputs // root.exporter.pops.flake.inputs;
   };
 }

templates/nixos/nix/lib/filterPopsSrc.nix

@@ -1,7 +1,7 @@
 { lib, root }:
 src: dir:
 let
-  inherit (root.exporter.inputs.outputs) nix-filter;
+  inherit (root.exporter.pops.flake.inputs) nix-filter;
   popsDirs = lib.attrNames (
     lib.removeAttrs root.exporter.pops [
       "hosts"

templates/nixos/nixos/hosts/nixos/layouts.nix

@@ -1,14 +1,14 @@
 let
   outputs = inputs.self;
-  host = inputs.self.hosts.nixos;
+  self' = inputs.self.hosts.nixos;
 in
 {
   system = "x86_64-linux";
 
   data = outputs.data.default;
 
   nixosSuites = lib.flatten [
-    host.nixosProfiles.bootstrap
+    self'.nixosProfiles.bootstrap
 
     outputs.nixosProfiles.presets.boot
     # outputs.nixosModules.default.programs.git

tests/data/expr.nix

@@ -1,6 +1,6 @@
 { omnibus }:
 let
-  inherit (omnibus.__inputs__) nixpkgs;
+  inherit (omnibus.flake.inputs) nixpkgs;
   dataAll =
     (omnibus.pops.lib.addLoadExtender {
       load = {

tests/devshell/expr.nix

@@ -7,20 +7,20 @@
 let
   inputs =
     let
-      baseInputs = omnibus.pops.loadInputs.setInitInputs ./__lock;
+      baseInputs = omnibus.pops.flake.setInitInputs ./__lock;
     in
     ((baseInputs.addInputsExtender (
       POP.lib.extendPop flops.lib.flake.pops.inputsExtender (
         self: super: {
           inputs = {
-            devshell = baseInputs.outputs.devshell.legacyPackages;
-            nixpkgs = baseInputs.outputs.nixpkgs.legacyPackages;
+            devshell = baseInputs.inputs.devshell.legacyPackages;
+            nixpkgs = baseInputs.inputs.nixpkgs.legacyPackages;
           };
         }
       )
     )).setSystem
       "x86_64-linux"
-    ).outputs;
+    ).inputs;
 
   devshellProfiles =
     (omnibus.pops.devshellProfiles.addLoadExtender {

tests/flake-parts/expr.nix

@@ -7,44 +7,44 @@
 }:
 let
   system = "x86_64-linux";
-  __inputs__ =
+  flake.inputs =
     let
-      loadInputs = omnibus.pops.loadInputs.setInitInputs ./__lock;
+      flake = omnibus.pops.flake.setInitInputs ./__lock;
     in
-    ((loadInputs.addInputsExtender (
+    ((flake.addInputsExtender (
       POP.lib.extendPop flops.lib.flake.pops.inputsExtender (
         self: super: {
           inputs = {
-            nixpkgs = loadInputs.outputs.nixpkgs.legacyPackages;
+            nixpkgs = flake.inputs.nixpkgs.legacyPackages;
           };
         }
       )
     )).setSystem
       system
-    ).outputs;
+    ).inputs;
 
   flakeProfiles =
     (omnibus.pops.flake-parts.profiles.addLoadExtender {
       load = {
         inputs = {
           inputs = {
-            inherit (__inputs__) chinookDb;
+            inherit (flake.inputs) chinookDb;
           };
         };
       };
     }).layouts.default.process-compose;
 
   mkFlake =
-    __inputs__.flake-parts.lib.mkFlake
+    flake.inputs.flake-parts.lib.mkFlake
       {
-        inputs = __inputs__ // {
+        inputs = flake.inputs // {
           # fake self argument to make sure that the flake is
           self = inputs.self;
         };
       }
       {
         systems = [ system ];
-        imports = [ __inputs__.process-compose-flake.flakeModule ];
+        imports = [ flake.inputs.process-compose-flake.flakeModule ];
         perSystem = { self', ... }: { imports = [ flakeProfiles.sqlite-example ]; };
       };
 in

tests/makes/expr.nix

@@ -1,6 +1,6 @@
 { omnibus, lib }:
 let
-  inherit (omnibus.__inputs__) nixpkgs makes;
+  inherit (omnibus.flake.inputs) nixpkgs makes;
   makesLib =
     (omnibus.pops.lib.addLoadExtender {
       load = {

tests/nixos/__fixture/pops/homeModules.nix

@@ -4,7 +4,7 @@ in
 (omnibus.pops.homeModules.addLoadExtender {
   load.inputs = {
     __misc__ = {
-      inherit (super.inputs.outputs) catppuccin-bat;
+      inherit (super.inputs.inputs) catppuccin-bat;
     };
   };
 }).addExporters

tests/nixos/__fixture/pops/homeProfiles.nix

@@ -2,12 +2,12 @@ let
   inherit (inputs) dmerge;
 in
 (omnibus.pops.homeProfiles.addLoadExtender {
-  load.inputs = super.inputs.outputs // {
+  load.inputs = super.inputs.inputs // {
     omnibus = {
       homeModules = super.homeModules.layouts.nixosModules;
     };
     inputs = {
-      inherit (omnibus.__inputs__) nur;
+      inherit (omnibus.flake.inputs) nur;
     };
   };
 }).addExporters