chore: clarify the outputs

tao3k · Oct 17, 2023 · bf6d0e2 · bf6d0e2
1 parent d37cbf2
commit bf6d0e2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/templates/nixos/flake.lock b/templates/nixos/flake.lock
diff --git a/templates/nixos/nix/lib/exporter/flakeOutputs.nix b/templates/nixos/nix/lib/exporter/flakeOutputs.nix
@@ -22,10 +22,10 @@ in
   local = eachSystem (
     system:
     let
-      inputs' = (super.inputs.setSystem system).outputs;
+      inputs' = (super.pops.flake.setSystem system).inputs;
       dataAll =
         (super.pops.omnibus.lib.addLoadExtender { load.inputs.inputs = inputs'; })
-        .layouts.default.exporter.pops.loadDataAll;
+        .layouts.default.exporter.pops.dataAll;
     in
     {
       data =
@@ -37,7 +37,7 @@ in
   packages = eachSystem (
     system:
     let
-      inputs = (super.inputs.setSystem system).outputs;
+      inputs = (super.pops.flake.setSystem system).inputs;
     in
     (
       (flops.haumea.pops.default.setInit {

diff --git a/templates/nixos/nixos/hosts/nixos/layouts.nix b/templates/nixos/nixos/hosts/nixos/layouts.nix
@@ -1,22 +1,22 @@
 let
   outputs = inputs.self;
-  self' = inputs.self.hosts.nixos;
 in
+# self' = inputs.self.hosts.nixos;
 {
   system = "x86_64-linux";
 
-  data = outputs.data.default;
+  data = outputs.local.${self.system}.data;
 
   nixosSuites = lib.flatten [
-    self'.nixosProfiles.bootstrap
+    outputs.hosts.nixos.nixosProfiles.bootstrap
 
     outputs.nixosProfiles.presets.boot
     # outputs.nixosModules.default.programs.git
 
     # # # --custom profiles
-    # outputs.nixosProfiles.customProfiles.presets.nix
-    # outputs.nixosProfiles.customProfiles.presets.boot
-    # outputs.nixosModules.customModules.boot
+    # outputs.pops.nixosProfiles.layouts.customProfiles.presets.nix
+    # outputs.pops.nixosProfiles.layouts.customProfiles.presets.boot
+    # outputs.pops.nixosModules.layouts.customModules.boot
 
     # outputs.srvos.default.common.nix
     (outputs.omnibus.lib.mkHome
@@ -35,9 +35,8 @@ in
 
   homeSuites = [
     outputs.homeProfiles.presets.emacs
-    # outputs.homeProfiles.default.presets.bat
+    # outputs.homeProfiles.presets.bat
     # # # The parent directory of "presets" is categorized as a list type of "suites"
-    # (outputs.homeProfiles.default.shell { }).default
-    # super.pops.homeModules.layouts.default.wayland.windowManager.hyprland
+    # (outputs.homeProfiles.shell { }).default
   ];
 }