From cb7e82f8d04a40a0d6d66689691914728e3a25a0 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Fri, 4 Oct 2024 06:48:59 -0500
Subject: [PATCH] task | configure to be able to colmena and regular
 nixos-rebuild

---
 hosts/eve/colmena.nix   | 15 +++++++++++++++
 hosts/eve/default.nix   |  3 ---
 hosts/fred/colmena.nix  | 15 +++++++++++++++
 hosts/fred/default.nix  |  3 ---
 hosts/loki/colmena.nix  |  1 -
 hosts/loki/default.nix  |  4 ----
 hosts/pi1/colmena.nix   | 16 ++++++++++++++++
 hosts/pi1/default.nix   |  4 ----
 hosts/smaug/colmena.nix | 15 +++++++++++++++
 hosts/smaug/default.nix |  3 ---
 hosts/t2/colmena.nix    | 15 +++++++++++++++
 hosts/t2/default.nix    |  3 ---
 12 files changed, 76 insertions(+), 21 deletions(-)
 create mode 100644 hosts/eve/colmena.nix
 create mode 100644 hosts/fred/colmena.nix
 create mode 100644 hosts/pi1/colmena.nix
 create mode 100644 hosts/smaug/colmena.nix
 create mode 100644 hosts/t2/colmena.nix

diff --git a/hosts/eve/colmena.nix b/hosts/eve/colmena.nix
new file mode 100644
index 0000000..8af2647
--- /dev/null
+++ b/hosts/eve/colmena.nix
@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    tags = ["workstation" "intel"];
+  };
+}
diff --git a/hosts/eve/default.nix b/hosts/eve/default.nix
index 93ea2e7..1a9407f 100644
--- a/hosts/eve/default.nix
+++ b/hosts/eve/default.nix
@@ -19,7 +19,4 @@
     ../../home/work
   ];
   networking.hostName = "eve";
-  deployment = {
-    tags = ["workstation" "intel"];
-  };
 }
diff --git a/hosts/fred/colmena.nix b/hosts/fred/colmena.nix
new file mode 100644
index 0000000..f42a576
--- /dev/null
+++ b/hosts/fred/colmena.nix
@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    tags = ["server" "intel"];
+  };
+}
diff --git a/hosts/fred/default.nix b/hosts/fred/default.nix
index 4ee30e9..7395ccb 100644
--- a/hosts/fred/default.nix
+++ b/hosts/fred/default.nix
@@ -15,7 +15,4 @@
     ./podman.nix
   ];
   networking.hostName = "fred";
-  deployment = {
-    tags = ["server" "intel"];
-  };
 }
diff --git a/hosts/loki/colmena.nix b/hosts/loki/colmena.nix
index e791e4a..32c0088 100644
--- a/hosts/loki/colmena.nix
+++ b/hosts/loki/colmena.nix
@@ -9,7 +9,6 @@
   imports = [
     ./default.nix
   ];
-  networking.hostName = "loki";
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
   deployment = {
     tags = ["workstation" "intel"];
diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix
index 63cbe99..ba523e3 100644
--- a/hosts/loki/default.nix
+++ b/hosts/loki/default.nix
@@ -20,8 +20,4 @@
     ../../home/work
   ];
   networking.hostName = "loki";
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
-  deployment = {
-    tags = ["workstation" "intel"];
-  };
 }
diff --git a/hosts/pi1/colmena.nix b/hosts/pi1/colmena.nix
new file mode 100644
index 0000000..871d67b
--- /dev/null
+++ b/hosts/pi1/colmena.nix
@@ -0,0 +1,16 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    targetHost = "nixos";
+    tags = ["arm"];
+  };
+}
diff --git a/hosts/pi1/default.nix b/hosts/pi1/default.nix
index 5e34e0b..3b9fe33 100644
--- a/hosts/pi1/default.nix
+++ b/hosts/pi1/default.nix
@@ -14,8 +14,4 @@
     ../themes.nix
   ];
   networking.hostName = "pi1";
-  deployment = {
-    targetHost = "nixos";
-    tags = ["arm"];
-  };
 }
diff --git a/hosts/smaug/colmena.nix b/hosts/smaug/colmena.nix
new file mode 100644
index 0000000..8af2647
--- /dev/null
+++ b/hosts/smaug/colmena.nix
@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    tags = ["workstation" "intel"];
+  };
+}
diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix
index 29e9c7e..d327143 100644
--- a/hosts/smaug/default.nix
+++ b/hosts/smaug/default.nix
@@ -18,7 +18,4 @@
     ../../home/work
   ];
   networking.hostName = "smaug";
-  deployment = {
-    tags = ["workstation" "intel"];
-  };
 }
diff --git a/hosts/t2/colmena.nix b/hosts/t2/colmena.nix
new file mode 100644
index 0000000..7f6ef12
--- /dev/null
+++ b/hosts/t2/colmena.nix
@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    tags = ["arm"];
+  };
+}
diff --git a/hosts/t2/default.nix b/hosts/t2/default.nix
index 59ca564..be6a2be 100644
--- a/hosts/t2/default.nix
+++ b/hosts/t2/default.nix
@@ -15,7 +15,4 @@
     ../wm
   ];
   networking.hostName = "t2";
-  deployment = {
-    tags = ["arm"];
-  };
 }