refactor: update flops

tao3k · Oct 8, 2023 · 516c0ca · 516c0ca
1 parent b695ff0
commit 516c0ca
Show file tree

Hide file tree

Showing 46 changed files with 387 additions and 238 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -16,7 +16,7 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build Example/nixos
-        run: nix -Lv build .#nixosConfigurations.nixos.config.system.build.toplevel --dry-run
+        run: nix -Lv build ./local#eval.nixos.expr.nixosConfiguration.config.system.build.toplevel --dry-run
 
       - name: Run Eval check
         run: nix -Lv eval ./local#checks --override-input namaka github:nix-community/namaka

diff --git a/examples/nixos/layouts.nix b/examples/nixos/layouts.nix
diff --git a/examples/nixos/pops/data.nix b/examples/nixos/pops/data.nix
diff --git a/examples/nixos/pops/selfNixOSProfiles.nix b/examples/nixos/pops/selfNixOSProfiles.nix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -32,19 +32,12 @@
           inherit omnibus;
         };
       };
-
-      nixosConfigurations =
-        (self.pops.exporters.addLoadExtender {
-          src = ./nixos/nixosConfigurations;
-          inputs = {
-            nixpkgs = omnibus.pops.loadInputs.outputs.nixpkgs;
-            exporters = self.pops.exporters.outputs.default;
-          };
-        }).outputs.default;
     in
     {
-      inherit (lib.outputs.default.exporters) pops;
-      inherit nixosConfigurations lib;
+      pops = lib.layouts.default.exporter.pops // {
+        inherit lib;
+      };
+      lib = lib.layouts.default;
 
       templates.default = {
         path = ./templates/nixos;

diff --git a/lib/exporters/pops.nix → lib/exporter/pops.nix b/lib/exporters/pops.nix → lib/exporter/pops.nix
@@ -4,7 +4,6 @@
     self'.outPath + "/local/lock"
   );
   loadData = flops.haumea.pops.default.setInit {
-    src = self'.outPath + "/examples/__data";
     loader = with haumea; [
       matchers.json
       matchers.toml
@@ -28,13 +27,17 @@
     };
   };
   loadHomeProfiles = self.loadHomeModules.addLoadExtender {
-    src = self'.outPath + "/nixos/homeProfiles";
-    loader = haumea.loaders.scoped;
-    type = "nixosProfiles";
+    load = {
+      src = self'.outPath + "/nixos/homeProfiles";
+      loader = haumea.loaders.scoped;
+      type = "nixosProfiles";
+    };
   };
   loadNixOSProfiles = self.loadNixOSModules.addLoadExtender {
-    src = self'.outPath + "/nixos/nixosProfiles";
-    type = "nixosProfiles";
+    load = {
+      src = self'.outPath + "/nixos/nixosProfiles";
+      type = "nixosProfiles";
+    };
   };
   srvos = flops.haumea.pops.default.setInit {
     src = builtins.unsafeDiscardStringContext (
@@ -47,34 +50,39 @@
   evalModules = {
     flake-parts = {
       loadModules = self.loadNixOSModules.addLoadExtender {
-        src = self'.outPath + "/evalModules/flake-parts/modules";
+        load.src = self'.outPath + "/evalModules/flake-parts/modules";
       };
       loadProfiles = self.loadNixOSProfiles.addLoadExtender {
-        src = self'.outPath + "/evalModules/flake-parts/profiles";
-        inputs = {
-          omnibus.evalModules.flake-parts.modules =
-            self.evalModules.flake-parts.modules.outputs.default;
+        load = {
+          src = self'.outPath + "/evalModules/flake-parts/profiles";
+          inputs = {
+            omnibus.evalModules.flake-parts.modules =
+              self.evalModules.flake-parts.modules.layouts.default;
+          };
         };
       };
     };
     devshell = rec {
       loadModules = self.loadNixOSModules.addLoadExtender {
-        src = self'.outPath + "/evalModules/devshell/modules";
-        type = "nixosModules";
+        load = {
+          src = self'.outPath + "/evalModules/devshell/modules";
+          type = "nixosModules";
+        };
       };
       loadProfiles = self.loadNixOSProfiles.addLoadExtender {
-        src = self'.outPath + "/evalModules/devshell/profiles";
-        type = "nixosProfiles";
-        inputs = {
-          omnibus.devshellModules = loadModules.outputs.default;
+        load = {
+          src = self'.outPath + "/evalModules/devshell/profiles";
+          type = "nixosProfiles";
+          inputs = {
+            omnibus.devshellModules = loadModules.layouts.default;
+          };
         };
       };
     };
   };
 
-  exporters = flops.haumea.pops.default.setInit {
+  exporter = flops.haumea.pops.default.setInit {
     loader = with haumea; loaders.scoped;
-    src = self'.outPath + "/examples";
     inputs = {
       self' = self;
       inherit

diff --git a/lib/loadDataAll.nix b/lib/loadDataAll.nix
@@ -1,8 +1,10 @@
 (omnibus.pops.loadData.addLoadExtender {
-  loader = with haumea; [
-    (matchers.regex "^(.+)\\.(yaml|yml)$" (
-      _: _: path:
-      super.readYAML path
-    ))
-  ];
+  load = {
+    loader = with haumea; [
+      (matchers.regex "^(.+)\\.(yaml|yml)$" (
+        _: _: path:
+        super.readYAML path
+      ))
+    ];
+  };
 })