refactor: update tests

.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

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.outputs.default.exporters.pops // {
+        inherit lib;
+      };
+      lib = lib.outputs.default;
 
       templates.default = {
         path = ./templates/nixos;

lib/exporters/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
@@ -74,7 +73,6 @@
 
   exporters = flops.haumea.pops.default.setInit {
     loader = with haumea; loaders.scoped;
-    src = self'.outPath + "/examples";
     inputs = {
       self' = self;
       inherit

local/flake.nix

@@ -6,7 +6,8 @@
   inputs.std-ext.url = "github:gtrunsec/std-ext";
   inputs.std-ext.inputs.org-roam-book-template.follows = "";
   inputs.call-flake.url = "github:divnix/call-flake";
-  inputs.namaka.follows = "";
+  inputs.namaka.url = "github:nix-community/namaka";
+  inputs.haumea.follows = "namaka/haumea";
 
   outputs =
     { std, self, ... }@inputs:
@@ -32,12 +33,22 @@
         ] ];
       }
       {
+        eval = inputs.haumea.lib.load {
+          src = ../tests;
+          inputs = omnibus.inputs // {
+            omnibus = omnibus;
+            lib = inputs.nixpkgs.lib // builtins;
+            inputs' = inputs;
+            trace = true;
+          };
+        };
         checks = inputs.namaka.lib.load {
           src = ../tests;
           inputs = omnibus.inputs // {
             omnibus = omnibus;
-            lib = inputs.nixpkgs.lib // omnibus.lib;
+            lib = inputs.nixpkgs.lib // builtins;
             inputs' = inputs;
+            trace = false;
           };
         };
       };

namaka.toml

@@ -1,20 +1,5 @@
 [check]
-cmd = [
-  "nix",
-  "flake",
-  "check",
-  "./local",
-  "--override-input",
-  "namaka",
-  "github:nix-community/namaka"
-]
+cmd = ["nix", "flake", "check", "./local"]
 
 [eval]
-cmd = [
-  "nix",
-  "eval",
-  "./local#checks",
-  "--override-input",
-  "namaka",
-  "github:nix-community/namaka"
-]
+cmd = ["nix", "eval", "./local#checks"]

tests/_snapshots/data

@@ -0,0 +1,2 @@
+#json
+{"env":{"nixos":{"maintainer":"gtrunsec","profile":"omnibus"}},"personal":{"ssh":{"public-key":"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDLxc7EBr1Qi4M65O1KjXZf4bOBZMQ6YeDSFYzKzFan7 Desktop-guangtao-03-02-2023"}}}

tests/_snapshots/nixos

@@ -0,0 +1,13 @@
+#pretty
+{
+  bootProfile = {
+    speedup = true;
+    systemd-boot = {
+      enable = true;
+    };
+    systemd-initrd = {
+      enable = false;
+    };
+  };
+  customBootModule = 10;
+}

tests/data/expr.nix

@@ -0,0 +1,10 @@
+{ omnibus, inputs' }:
+let
+  loadDataAll =
+    (omnibus.pops.lib.addLoadExtender {
+      inputs = {
+        nixpkgs = inputs'.nixpkgs.legacyPackages.x86_64-linux;
+      };
+    }).outputs.default.loadDataAll;
+in
+(loadDataAll.addLoadExtender { src = ./__fixture; }).outputs.default

examples/nixos/layouts.nix → tests/nixos/__fixture/layouts.nix

@@ -1,26 +1,27 @@
 let
-  outputs = lib.mapAttrs (_: v: v.outputs) (
+  exporter = lib.mapAttrs (_: v: v.outputs) (
     lib.removeAttrs super.pops [ "inputs" ]
   );
 in
 {
-  inherit outputs;
-  data = outputs.data.default;
+  system = "x86_64-linux";
+
+  inherit data exporter;
 
   nixosSuites = lib.flatten [
-    outputs.selfNixOSProfiles.default.bootstrap
+    exporter.selfNixOSProfiles.default.bootstrap
 
     # self.nixosProfiles.default.presets.boot
-    outputs.nixosModules.default.programs.git
+    exporter.nixosModules.default.programs.git
 
     # outputs.nixosModules.default.hardware.bluetooth
     # load a suite profile from audio
     # (outputs.nixosProfiles.default.audio {}).default
 
     # # --custom profiles
-    outputs.nixosProfiles.customProfiles.presets.nix
-    outputs.nixosProfiles.customProfiles.presets.boot
-    outputs.srvos.default.common.nix
+    exporter.nixosProfiles.customProfiles.presets.nix
+    # exporter.nixosProfiles.customProfiles.presets.boot
+    exporter.srvos.default.common.nix
 
     (omnibus.lib.outputs.default.mkHome
       {
@@ -37,10 +38,20 @@ in
   ];
 
   homeSuites = [
-    outputs.homeProfiles.customProfiles.presets.hyprland
-    outputs.homeProfiles.default.presets.bat
+    exporter.homeProfiles.customProfiles.presets.hyprland
+    exporter.homeProfiles.default.presets.bat
     # # The parent directory of "presets" is categorized as a list type of "suites"
-    (outputs.homeProfiles.default.shell { }).default
+    (exporter.homeProfiles.default.shell { }).default
     # super.pops.homeModules.outputs.default.wayland.windowManager.hyprland
   ];
+
+  nixosConfiguration =
+    module:
+    nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = lib.flatten [
+        self.nixosSuites
+        module
+      ];
+    };
 }

examples/nixos/pops/inputs.nix → tests/nixos/__fixture/pops/inputs.nix

@@ -13,4 +13,4 @@
     }
   )
 )).setSystem
-  "x86_64-linux"
+  root.layouts.system

tests/nixos/_pops.nix

@@ -0,0 +1,12 @@
+{
+  omnibus,
+  root,
+  inputs',
+}:
+(omnibus.pops.exporters.addLoadExtender {
+  src = ./__fixture;
+  inputs = {
+    data = root.data;
+    nixpkgs = inputs'.nixpkgs;
+  };
+})