From d0333dd329dc578c0c8862d1b9dc99c2aed349bd Mon Sep 17 00:00:00 2001
From: guangtao <gtrunsec@hardenedlinux.org>
Date: Tue, 17 Oct 2023 00:30:41 -0700
Subject: [PATCH] chore: clarify the outputs

---
 templates/nixos/flake.lock                      |  6 +++---
 .../nixos/nix/lib/exporter/flakeOutputs.nix     |  4 ++--
 templates/nixos/nixos/hosts/nixos/layouts.nix   | 17 ++++++++---------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/templates/nixos/flake.lock b/templates/nixos/flake.lock
index 6487926..a9d995f 100644
--- a/templates/nixos/flake.lock
+++ b/templates/nixos/flake.lock
@@ -403,11 +403,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697524438,
-        "narHash": "sha256-6tNE9XlJOMriM+bideQwXWDTK57ppAp7jTWChnEngBk=",
+        "lastModified": 1697527137,
+        "narHash": "sha256-dtoK7XELC939mhO7BRAZA7t0gaJW/M3KXpoybs+SrM0=",
         "owner": "gtrunsec",
         "repo": "omnibus",
-        "rev": "90b76ff1b6bf1cdc1c431e1947b230d8fa7dc34e",
+        "rev": "d37cbf233c7f84ade00dc9a96dee596043cd2ccd",
         "type": "github"
       },
       "original": {
diff --git a/templates/nixos/nix/lib/exporter/flakeOutputs.nix b/templates/nixos/nix/lib/exporter/flakeOutputs.nix
index cb274ea..37ba4d5 100644
--- a/templates/nixos/nix/lib/exporter/flakeOutputs.nix
+++ b/templates/nixos/nix/lib/exporter/flakeOutputs.nix
@@ -22,7 +22,7 @@ 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;
@@ -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
index 897f6a1..d5c62d5 100644
--- 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
   ];
 }