chore: rename pops.{...}

tao3k · Oct 17, 2023 · 294c2a9 · 294c2a9
1 parent 2a1ce85
commit 294c2a9
Show file tree

Hide file tree

Showing 27 changed files with 94 additions and 92 deletions.
diff --git a/lib/exporter/flakeOutputs.nix b/lib/exporter/flakeOutputs.nix
@@ -1,38 +1,42 @@
 let
-  outputs =
-    let
-      f = p: lib.mapAttrs (_: v: v.layouts.default) (lib.removeAttrs p [ ]);
-    in
-    f super.pops
-    // {
-      flake-parts = f super.pops.flake-parts;
-      devshell = f super.pops.devshell;
-    }
-  ;
+  outputs = root.mapPopsLayouts super.pops;
 in
 {
-  inherit (outputs) srvos;
+  inherit (outputs)
+    srvos
+    nixosModules
+    nixosProfiles
+    darwinModules
+    darwinProfiles
+    homeProfiles
+    homeModules
+    devshellModules
+    devshellProfiles
+  ;
 
   units = {
     inherit (outputs) configs;
+    nixos = {
+      inherit (outputs) nixosProfiles nixosModules;
+    };
+    darwin = {
+      inherit (outputs) darwinProfiles darwinModules;
+    };
+    home-manager = {
+      inherit (outputs) homeProfiles homeModules;
+    };
+    flake-parts = {
+      inherit (outputs.flake-parts) profiles modules;
+    };
+    devshell = {
+      inherit (outputs) devshellProfiles devshellModules;
+    };
   };
 
-  __inputs__ = super.pops.loadInputs.outputs;
-
   dotfiles = inputs.self.outPath + "/dotfiles";
 
-  devshellModules = outputs.devshell.loadModules;
-  devshellProfiles = outputs.devshell.loadProfiles;
-
-  flakePartsProfiles = outputs.flake-parts.loadProfiles;
-  flakePartsModules = outputs.flake-parts.loadModules;
-
-  nixosModules = outputs.loadNixOSModules;
-  nixosProfiles = outputs.loadNixOSProfiles;
-
-  darwinModules = outputs.loadDarwinModules;
-  darwinProfiles = outputs.loadDarwinProfiles;
-
-  homeProfiles = outputs.loadHomeProfiles;
-  homeModules = outputs.loadHomeModules;
+  # aliases
+  __inputs__ = outputs.loadInputs;
+  flakeModules = outputs.flake-parts.profiles;
+  flakeProfiles = outputs.flake-parts.modules;
 }
diff --git a/lib/exporter/pops.nix b/lib/exporter/pops.nix
@@ -12,23 +12,35 @@ in
     inputs.self.outPath + "/local/lock"
   );
 
-  loadData = flops.haumea.pops.default.setInit {
+  data = flops.haumea.pops.default.setInit {
     loader = with haumea; [
       matchers.json
       matchers.toml
     ];
   };
-  loadNixOSModules = flops.haumea.pops.default.setInit {
+  dataAll =
+    (self.data.addLoadExtender {
+      load = {
+        loader = with haumea; [
+          (matchers.regex "^(.+)\\.(yaml|yml)$" (
+            _: _: path:
+            root.readYAML path
+          ))
+        ];
+      };
+    });
+
+  nixosModules = flops.haumea.pops.default.setInit {
     src = inputs.self.outPath + "/units/nixos/nixosModules";
     type = "nixosModules";
     inputs = baseInputs;
   };
-  loadHomeModules = flops.haumea.pops.default.setInit {
+  homeModules = flops.haumea.pops.default.setInit {
     src = inputs.self.outPath + "/units/nixos/homeModules";
     type = "nixosModules";
     inputs = baseInputs;
   };
-  loadHomeProfiles = self.loadHomeModules.addLoadExtender {
+  homeProfiles = self.homeModules.addLoadExtender {
     load = {
       src = inputs.self.outPath + "/units/nixos/homeProfiles";
       loader = haumea.loaders.scoped;
@@ -37,21 +49,21 @@ in
     };
   };
 
-  loadNixOSProfiles = self.loadNixOSModules.addLoadExtender {
+  nixosProfiles = self.nixosModules.addLoadExtender {
     load = {
       src = inputs.self.outPath + "/units/nixos/nixosProfiles";
       type = "nixosProfiles";
       transformer = [ (_: _: _) ];
     };
   };
 
-  loadDarwinProfiles = self.loadNixOSProfiles.addLoadExtender {
+  darwinProfiles = self.nixosProfiles.addLoadExtender {
     load = {
       src = inputs.self.outPath + "/units/nixos/darwinProfiles";
     };
   };
 
-  loadDarwinModules = self.loadNixOSModules.addLoadExtender {
+  darwinModules = self.nixosModules.addLoadExtender {
     load.src = inputs.self.outPath + "/units/nixos/darwinModules";
   };
 
@@ -67,27 +79,26 @@ in
     transformer = [ (_: _: _) ];
   };
   flake-parts = {
-    loadModules = self.loadNixOSModules.addLoadExtender {
+    modules = self.nixosModules.addLoadExtender {
       load.src = inputs.self.outPath + "/units/flake-parts/modules";
     };
-    loadProfiles = self.loadNixOSProfiles.addLoadExtender {
+    profiles = self.nixosProfiles.addLoadExtender {
       load = {
         src = inputs.self.outPath + "/units/flake-parts/profiles";
       };
     };
   };
-  devshell = rec {
-    loadModules = self.loadNixOSModules.addLoadExtender {
-      load = {
-        src = inputs.self.outPath + "/units/devshell/modules";
-        type = "nixosModules";
-      };
+
+  devshellModules = self.nixosModules.addLoadExtender {
+    load = {
+      src = inputs.self.outPath + "/units/devshell/modules";
+      type = "nixosModules";
     };
-    loadProfiles = self.loadNixOSProfiles.addLoadExtender {
-      load = {
-        src = inputs.self.outPath + "/units/devshell/profiles";
-        type = "nixosProfiles";
-      };
+  };
+  devshellProfiles = self.nixosProfiles.addLoadExtender {
+    load = {
+      src = inputs.self.outPath + "/units/devshell/profiles";
+      type = "nixosProfiles";
     };
   };
 

diff --git a/lib/loadDataAll.nix b/lib/loadDataAll.nix
diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsFun/darwinModules.nix b/templates/nixos/nix/lib/exporter/pops/__hostsFun/darwinModules.nix
@@ -4,7 +4,7 @@
   inputs,
 }:
 name:
-(omnibus.pops.loadNixOSModules.addLoadExtender {
+(omnibus.pops.nixosModules.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsFun/darwinProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsFun/darwinProfiles.nix
@@ -4,7 +4,7 @@
   inputs,
 }:
 name:
-(omnibus.pops.loadNixOSModules.addLoadExtender {
+(omnibus.pops.nixosModules.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsFun/homeModules.nix b/templates/nixos/nix/lib/exporter/pops/__hostsFun/homeModules.nix
@@ -4,7 +4,7 @@
   inputs,
 }:
 name:
-(omnibus.pops.loadHomeModules.addLoadExtender {
+(omnibus.pops.homeModules.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsFun/homeProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsFun/homeProfiles.nix
@@ -4,7 +4,7 @@
   inputs,
 }:
 name:
-(omnibus.pops.loadHomeProfiles.addLoadExtender {
+(omnibus.pops.homeProfiles.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsFun/nixosModules.nix b/templates/nixos/nix/lib/exporter/pops/__hostsFun/nixosModules.nix
@@ -4,7 +4,7 @@
   inputs,
 }:
 name:
-(omnibus.pops.loadNixOSModules.addLoadExtender {
+(omnibus.pops.nixosModules.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

diff --git a/templates/nixos/nix/lib/exporter/pops/__hostsFun/nixosProfiles.nix b/templates/nixos/nix/lib/exporter/pops/__hostsFun/nixosProfiles.nix
@@ -4,7 +4,7 @@
   inputs,
 }:
 name:
-(omnibus.pops.loadNixOSProfiles.addLoadExtender {
+(omnibus.pops.nixosProfiles.addLoadExtender {
   load = {
     src =
       root.filterPopsSrc (inputs.self.outPath + "/nixos/hosts/${name}")

diff --git a/templates/nixos/nix/lib/exporter/pops/darwinModules.nix b/templates/nixos/nix/lib/exporter/pops/darwinModules.nix
@@ -1,4 +1,4 @@
-(omnibus.pops.loadNixOSModules.addLoadExtender {
+(omnibus.pops.nixosModules.addLoadExtender {
   load = {
     src = inputs.self.outPath + "/nixos/darwinModules";
     inputs = {

diff --git a/templates/nixos/nix/lib/exporter/pops/darwinProfiles.nix b/templates/nixos/nix/lib/exporter/pops/darwinProfiles.nix
@@ -1,4 +1,4 @@
-(omnibus.pops.loadNixOSModules.addLoadExtender {
+(omnibus.pops.nixosModules.addLoadExtender {
   load = {
     src = inputs.self.outPath + "/nixos/darwinProfiles";
     inputs = {

diff --git a/templates/nixos/nix/lib/exporter/pops/homeModules.nix b/templates/nixos/nix/lib/exporter/pops/homeModules.nix
@@ -1,4 +1,4 @@
-(omnibus.pops.loadHomeModules.addLoadExtender {
+(omnibus.pops.homeModules.addLoadExtender {
   load = {
     src = inputs.self.outPath + "/nixos/homeModules";
     inputs = {

diff --git a/templates/nixos/nix/lib/exporter/pops/homeProfiles.nix b/templates/nixos/nix/lib/exporter/pops/homeProfiles.nix
@@ -1,4 +1,4 @@
-(omnibus.pops.loadHomeProfiles.addLoadExtender {
+(omnibus.pops.homeProfiles.addLoadExtender {
   load = {
     src = inputs.self.outPath + "/nixos/homeProfiles";
     inputs = {

diff --git a/templates/nixos/nix/lib/exporter/pops/nixosModules.nix b/templates/nixos/nix/lib/exporter/pops/nixosModules.nix
@@ -1,4 +1,4 @@
-(omnibus.pops.loadNixOSModules.addLoadExtender {
+(omnibus.pops.nixosModules.addLoadExtender {
   load = {
     src = inputs.self.outPath + "/nixos/nixosModules";
     inputs = {

diff --git a/templates/nixos/nix/lib/exporter/pops/nixosProfiles.nix b/templates/nixos/nix/lib/exporter/pops/nixosProfiles.nix
@@ -1,4 +1,4 @@
-(omnibus.pops.loadNixOSProfiles.addLoadExtender {
+(omnibus.pops.nixosProfiles.addLoadExtender {
   load = {
     src = inputs.self.outPath + "/nixos/nixosProfiles";
     inputs = {

diff --git a/templates/nixos/nix/lib/exporter/pops/omnibus/homeModules.nix b/templates/nixos/nix/lib/exporter/pops/omnibus/homeModules.nix
@@ -1 +1 @@
-(omnibus.pops.loadHomeModules.addLoadExtender { load = { }; })
+(omnibus.pops.homeModules.addLoadExtender { load = { }; })
diff --git a/templates/nixos/nix/lib/exporter/pops/omnibus/homeProfiles.nix b/templates/nixos/nix/lib/exporter/pops/omnibus/homeProfiles.nix
@@ -1 +1 @@
-(omnibus.pops.loadHomeProfiles.addLoadExtender { load = { }; })
+(omnibus.pops.homeProfiles.addLoadExtender { load = { }; })
diff --git a/templates/nixos/nix/lib/exporter/pops/omnibus/nixosModules.nix b/templates/nixos/nix/lib/exporter/pops/omnibus/nixosModules.nix
@@ -1 +1 @@
-(omnibus.pops.loadNixOSModules.addLoadExtender { load = { }; })
+(omnibus.pops.nixosModules.addLoadExtender { load = { }; })
diff --git a/templates/nixos/nix/lib/exporter/pops/omnibus/nixosProfiles.nix b/templates/nixos/nix/lib/exporter/pops/omnibus/nixosProfiles.nix
@@ -1,4 +1,4 @@
-(omnibus.pops.loadNixOSProfiles.addLoadExtender { load = { }; }).addExporters [
+(omnibus.pops.nixosProfiles.addLoadExtender { load = { }; }).addExporters [
   (POP.extendPop flops.haumea.pops.exporter (
     self: super: {
       exports.customModules = self.outputs [ {

diff --git a/tests/data/expr.nix b/tests/data/expr.nix
@@ -1,16 +1,16 @@
 { omnibus }:
 let
   inherit (omnibus.__inputs__) nixpkgs;
-  loadDataAll =
+  dataAll =
     (omnibus.pops.lib.addLoadExtender {
       load = {
         inputs = {
           inputs.nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
         };
       };
-    }).layouts.default.loadDataAll;
+    }).layouts.default.exporter.pops.dataAll;
 in
-(loadDataAll.addLoadExtender {
+(dataAll.addLoadExtender {
   load = {
     src = ./__fixture;
   };

diff --git a/tests/devshell/expr.nix b/tests/devshell/expr.nix
@@ -7,14 +7,14 @@
 let
   inputs =
     let
-      loadInputs = omnibus.pops.loadInputs.setInitInputs ./__lock;
+      baseInputs = omnibus.pops.loadInputs.setInitInputs ./__lock;
     in
-    ((loadInputs.addInputsExtender (
+    ((baseInputs.addInputsExtender (
       POP.lib.extendPop flops.lib.flake.pops.inputsExtender (
         self: super: {
           inputs = {
-            devshell = loadInputs.outputs.devshell.legacyPackages;
-            nixpkgs = loadInputs.outputs.nixpkgs.legacyPackages;
+            devshell = baseInputs.outputs.devshell.legacyPackages;
+            nixpkgs = baseInputs.outputs.nixpkgs.legacyPackages;
           };
         }
       )
@@ -23,7 +23,7 @@ let
     ).outputs;
 
   devshellProfiles =
-    (omnibus.pops.devshell.loadProfiles.addLoadExtender {
+    (omnibus.pops.devshellProfiles.addLoadExtender {
       load.inputs = {
         inputs = {
           inherit (inputs) fenix nixpkgs;

diff --git a/tests/flake-parts/expr.nix b/tests/flake-parts/expr.nix
@@ -23,8 +23,8 @@ let
       system
     ).outputs;
 
-  flakePartsProfiles =
-    (omnibus.pops.flake-parts.loadProfiles.addLoadExtender {
+  flakeProfiles =
+    (omnibus.pops.flake-parts.profiles.addLoadExtender {
       load = {
         inputs = {
           inputs = {
@@ -45,8 +45,7 @@ let
       {
         systems = [ system ];
         imports = [ __inputs__.process-compose-flake.flakeModule ];
-        perSystem =
-          { self', ... }: { imports = [ flakePartsProfiles.sqlite-example ]; };
+        perSystem = { self', ... }: { imports = [ flakeProfiles.sqlite-example ]; };
       };
 in
 lib.mapAttrs (_: builtins.unsafeDiscardStringContext) {

diff --git a/tests/nixos/__fixture/pops/homeModules.nix b/tests/nixos/__fixture/pops/homeModules.nix
@@ -1,7 +1,7 @@
 let
   inherit (inputs) dmerge;
 in
-(omnibus.pops.loadHomeModules.addLoadExtender {
+(omnibus.pops.homeModules.addLoadExtender {
   load.inputs = {
     __misc__ = {
       inherit (super.inputs.outputs) catppuccin-bat;

diff --git a/tests/nixos/__fixture/pops/homeProfiles.nix b/tests/nixos/__fixture/pops/homeProfiles.nix
@@ -1,7 +1,7 @@
 let
   inherit (inputs) dmerge;
 in
-(omnibus.pops.loadHomeProfiles.addLoadExtender {
+(omnibus.pops.homeProfiles.addLoadExtender {
   load.inputs = super.inputs.outputs // {
     omnibus = {
       homeModules = super.homeModules.layouts.nixosModules;

diff --git a/tests/nixos/__fixture/pops/nixosModules.nix b/tests/nixos/__fixture/pops/nixosModules.nix
@@ -1,7 +1,7 @@
 let
   inherit (inputs) dmerge;
 in
-(omnibus.pops.loadNixOSModules.addLoadExtender {
+(omnibus.pops.nixosModules.addLoadExtender {
   load.inputs = super.inputs.outputs // { };
 }).addExporters
   [

diff --git a/tests/nixos/__fixture/pops/nixosProfiles.nix b/tests/nixos/__fixture/pops/nixosProfiles.nix
@@ -1,7 +1,7 @@
 let
   inherit (inputs) dmerge;
 in
-(omnibus.pops.loadNixOSProfiles.addLoadExtender {
+(omnibus.pops.nixosProfiles.addLoadExtender {
   load = {
     inputs = super.inputs.outputs // {
       omnibus = {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		(omnibus.pops.loadHomeModules.addLoadExtender { load = { }; })
		(omnibus.pops.homeModules.addLoadExtender { load = { }; })
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		(omnibus.pops.loadHomeProfiles.addLoadExtender { load = { }; })
		(omnibus.pops.homeProfiles.addLoadExtender { load = { }; })
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		(omnibus.pops.loadNixOSModules.addLoadExtender { load = { }; })
		(omnibus.pops.nixosModules.addLoadExtender { load = { }; })