task | configure to be able to colmena and regular nixos-rebuild

hosts/eve/colmena.nix

@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    tags = ["workstation" "intel"];
+  };
+}

hosts/eve/default.nix

@@ -19,7 +19,4 @@
     ../../home/work
   ];
   networking.hostName = "eve";
-  deployment = {
-    tags = ["workstation" "intel"];
-  };
 }

hosts/fred/colmena.nix

@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    tags = ["server" "intel"];
+  };
+}

hosts/fred/default.nix

@@ -15,7 +15,4 @@
     ./podman.nix
   ];
   networking.hostName = "fred";
-  deployment = {
-    tags = ["server" "intel"];
-  };
 }

hosts/loki/colmena.nix

@@ -9,7 +9,6 @@
   imports = [
     ./default.nix
   ];
-  networking.hostName = "loki";
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
   deployment = {
     tags = ["workstation" "intel"];

hosts/loki/default.nix

@@ -20,8 +20,4 @@
     ../../home/work
   ];
   networking.hostName = "loki";
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
-  deployment = {
-    tags = ["workstation" "intel"];
-  };
 }

hosts/pi1/colmena.nix

@@ -0,0 +1,16 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    targetHost = "nixos";
+    tags = ["arm"];
+  };
+}

hosts/pi1/default.nix

@@ -14,8 +14,4 @@
     ../themes.nix
   ];
   networking.hostName = "pi1";
-  deployment = {
-    targetHost = "nixos";
-    tags = ["arm"];
-  };
 }

hosts/smaug/colmena.nix

@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    tags = ["workstation" "intel"];
+  };
+}

hosts/smaug/default.nix

@@ -18,7 +18,4 @@
     ../../home/work
   ];
   networking.hostName = "smaug";
-  deployment = {
-    tags = ["workstation" "intel"];
-  };
 }

hosts/t2/colmena.nix

@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./default.nix
+  ];
+  deployment = {
+    tags = ["arm"];
+  };
+}

hosts/t2/default.nix

@@ -15,7 +15,4 @@
     ../wm
   ];
   networking.hostName = "t2";
-  deployment = {
-    tags = ["arm"];
-  };
 }