Mabon and Ostara host targets.

config/hosts/mabon/meta.nix

@@ -0,0 +1,21 @@
+{ lib, config, ... }: with lib; {
+  deploy.targets.mabon = {
+    nodeNames = lib.singleton "mabon";
+    tf = {
+      resources.mabon = {
+        provider = "null";
+        type = "resource";
+        connection = {
+          port = 62954;
+          host = "192.168.1.119";
+        };
+      };
+    };
+  };
+  network.nodes.mabon = {
+    imports = lib.hostImport "mabon";
+    networking = {
+      hostName = "mabon";
+    };
+  };
+}

config/hosts/mabon/tf.nix

@@ -1,12 +0,0 @@
-{ config, hosts, ... }: {
-  config = {
-    resources.mabon = {
-      provider = "null";
-      type = "resource";
-      connection = {
-        port = 62954;
-        host = "192.168.1.119";
-      };
-    };
-  };
-}

config/hosts/ostara/meta.nix

@@ -1,6 +1,7 @@
 { lib, config, ... }: with lib; {
   config = {
-    deploy.targets.personal = {
+    deploy.targets.ostara = {
+      nodeNames = singleton "ostara";
       tf = {
         resources.ostara = {
           provider = "null";
@@ -11,11 +12,11 @@
           };
         };
       };
-      network.nodes.samhain = {
+    };
-        imports = lib.hostImport "samhain";
+    network.nodes.ostara = {
-        networking = {
+      imports = lib.hostImport "ostara";
-          hostName = "samhain";
+      networking = {
-        };
+        hostName = "ostara";
       };
     };
   };

config/hosts/ostara/tf.nix

@@ -1,12 +0,0 @@
-{ config, hosts, ... }: {
-  config = {
-    resources.ostara = {
-      provider = "null";
-      type = "resource";
-      connection = {
-        port = 62954;
-        host = "192.168.1.245";
-      };
-    };
-  };
-}

default.nix

@@ -33,6 +33,8 @@ let
       ./config/hosts/athame/meta.nix
       ./config/hosts/samhain/meta.nix
       ./config/hosts/yule/meta.nix
+      ./config/hosts/mabon/meta.nix
+      ./config/hosts/ostara/meta.nix
     ];
     specialArgs = {
       inherit sources profiles users;