fix(pops.hive): meta check

tao3k · Apr 26, 2024 · 3a2a6f7 · 3a2a6f7
1 parent 6707bdc
commit 3a2a6f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/hive/collectors/walk.nix b/src/hive/collectors/walk.nix
@@ -17,7 +17,7 @@ let
     hostName: hostConfig:
     pipe hostConfig (
       l.optionals
-        (hostConfig ? ${renamer} || (hostConfig ? meta && hostConfig.meta.${renamer}))
+        (hostConfig ? ${renamer} || (hostConfig ? meta && hostConfig.meta ? ${renamer}))
         (
           [
             (hostConfig: hostConfig.${renamer} or hostConfig.meta.${renamer})
@@ -28,7 +28,7 @@ let
           ++ extraPipe
         )
       ++ l.optionals (
-        !hostConfig ? ${renamer} && !(hostConfig ? meta && hostConfig.meta.${renamer})
+        !hostConfig ? ${renamer} && !(hostConfig ? meta && hostConfig.meta ? ${renamer})
       ) [ (_: { }) ]
     )
   ) hosts;

diff --git a/src/pops/hive.nix b/src/pops/hive.nix
@@ -80,7 +80,7 @@ in
 
       pops = { };
       exports = {
-        darwinConfiguraitons = root.hive.collectors.darwinConfigurations final.darwinConfigurationRenamer hostsArgs;
+        darwinConfigurations = root.hive.collectors.darwinConfigurations final.darwinConfigurationRenamer hostsArgs;
 
         colmenaHive = root.hive.collectors.colmenaConfigurations final.colmenaConfigurationRenamer hostsArgs;
 

diff --git a/tests/hive/expr.nix b/tests/hive/expr.nix
@@ -44,7 +44,7 @@ let
       inherit (omnibus.flake.inputs) colmena nixpkgs;
     }).setNixosConfigurationsRenamer
       "asd";
-  inherit (hivePop.exports) darwinConfiguraitons colmenaHive;
+  inherit (hivePop.exports) darwinConfigurations colmenaHive;
 in
 {
   # inherit hivePop;