From 82362958dbfa1f4597c0e673dc7eb6e0cbb9c0aa Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 22 Jan 2024 23:47:36 +0000
Subject: [PATCH] refactor flaken.nix hive handling

---
 flake.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3191f4c..c6bbc6b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -145,13 +145,14 @@
 
         # this makes nixos-anywhere work
         flake.nixosConfigurations =
-          (inputs.colmena.lib.makeHive self.outputs.colmena).nodes
-          // (
-            let
-              router0-dmz0 = (inputs.get-flake ./nix/os/devices/router0-dmz0).nixosConfigurations;
-              steveej-x13s = (inputs.get-flake ./nix/os/devices/steveej-x13s).nixosConfigurations;
-              retro = (inputs.get-flake ./nix/os/devices/retro).nixosConfigurations;
-            in
+          let
+            colmenaHive = (inputs.colmena.lib.makeHive self.outputs.colmena).nodes;
+            router0-dmz0 = (inputs.get-flake ./nix/os/devices/router0-dmz0).nixosConfigurations;
+            retro = (inputs.get-flake ./nix/os/devices/retro).nixosConfigurations;
+          in
+          (
+            colmenaHive //
+
             {
               router0-dmz0 = router0-dmz0.native;
 
@@ -162,7 +163,7 @@
               # nixos-install --flake .\#retro_cross
               retro_cross = retro.cross;
 
-              steveej-x13s_cross = steveej-x13s.cross;
+              steveej-x13s_cross = (inputs.get-flake ./nix/os/devices/steveej-x13s).nixosConfigurations.cross;
             }
           );