feat: WIP add nixos example

tao3k · Oct 6, 2023 · b597059 · b597059
1 parent 8d318d0
commit b597059
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/flake.nix b/flake.nix
@@ -26,35 +26,25 @@
           self' = self;
           home-manager = omnibus.pops.loadInputs.outputs.home-manager;
           haumea = haumea.lib;
+          dmerge = inputs.flops.inputs.dmerge;
           POP = POP.lib;
-          inherit omnibus flops;
+          flops = flops.lib;
+          inherit omnibus;
         };
       };
 
       nixosConfigurations =
-        (self.exporters.addLoadExtender {
+        (self.pops.exporters.addLoadExtender {
           src = ./nixos/nixosConfigurations;
           inputs = {
             nixpkgs = omnibus.pops.loadInputs.outputs.nixpkgs;
-            exporters = self.exporters.outputs.default;
+            exporters = self.pops.exporters.outputs.default;
           };
         }).outputs.default;
     in
     {
       inherit (lib.outputs.default.exporters) pops;
       inherit nixosConfigurations lib;
-      exporters = flops.lib.haumea.pops.default.setInit {
-        loader = with haumea.lib; loaders.scoped;
-        src = ./examples;
-        inputs = {
-          lib = flops.inputs.nixlib.lib // builtins;
-          flops = flops.lib;
-          haumea = flops.inputs.haumea.lib;
-          dmerge = flops.inputs.dmerge;
-          POP = POP.lib;
-          inherit omnibus;
-        };
-      };
 
       templates.default = {
         path = ./templates/nixos;

diff --git a/lib/exporters/pops.nix b/lib/exporters/pops.nix
@@ -1,18 +1,16 @@
 {
   dotfiles = self'.outPath + "/dotfiles";
-  # FIXME: needs to fix the logic of loadInputs path
-  # self'.outPath + "";
-  loadInputs = flops.lib.flake.pops.default.setInitInputs (
+  loadInputs = flops.flake.pops.default.setInitInputs (
     self'.outPath + "/local/lock"
   );
-  loadData = flops.lib.haumea.pops.default.setInit {
+  loadData = flops.haumea.pops.default.setInit {
     src = self'.outPath + "/examples/__data";
     loader = with haumea; [
       matchers.json
       matchers.toml
     ];
   };
-  loadNixOSModules = flops.lib.haumea.pops.default.setInit {
+  loadNixOSModules = flops.haumea.pops.default.setInit {
     src = self'.outPath + "/nixos/nixosModules";
     type = "nixosModules";
     inputs = {
@@ -21,7 +19,7 @@
       omnibus = self;
     };
   };
-  loadHomeModules = flops.lib.haumea.pops.default.setInit {
+  loadHomeModules = flops.haumea.pops.default.setInit {
     src = self'.outPath + "/nixos/homeModules";
     type = "nixosModules";
     inputs = {
@@ -38,7 +36,7 @@
     src = self'.outPath + "/nixos/nixosProfiles";
     type = "nixosProfiles";
   };
-  srvos = flops.lib.haumea.pops.default.setInit {
+  srvos = flops.haumea.pops.default.setInit {
     src = builtins.unsafeDiscardStringContext (
       self.loadInputs.outputs.srvos + "/nixos"
     );
@@ -73,4 +71,20 @@
       };
     };
   };
+
+  exporters = flops.haumea.pops.default.setInit {
+    loader = with haumea; loaders.scoped;
+    src = self'.outPath + "/examples";
+    inputs = {
+      self' = self;
+      inherit
+        omnibus
+        POP
+        haumea
+        flops
+        lib
+        dmerge
+      ;
+    };
+  };
 }
diff --git a/templates/nixos/flake.nix b/templates/nixos/flake.nix
@@ -47,7 +47,7 @@
     in
     {
       lib =
-        (inputs.omnibus.exporters.addLoadExtender {
+        (inputs.omnibus.pops.exporters.addLoadExtender {
           src = ./nix/lib;
           inputs = {
             self' = self;

diff --git a/templates/nixos/nix/lib/exporters.nix b/templates/nixos/nix/lib/exporters.nix
@@ -8,7 +8,7 @@ let
 in
 {
   hosts =
-    (inputs.omnibus.exporters.addLoadExtender {
+    (inputs.omnibus.pops.exporters.addLoadExtender {
       src = self'.outPath + "/nixos/hosts";
       inputs = inputs // {
         self'.lib = super;