From e22262f771cf8c5aace9c3689c99f947acf41404 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Tue, 6 Jul 2021 01:14:44 +0100
Subject: [PATCH] Mabon and Ostara host targets.

---
 config/hosts/mabon/meta.nix  | 21 +++++++++++++++++++++
 config/hosts/mabon/tf.nix    | 12 ------------
 config/hosts/ostara/meta.nix | 13 +++++++------
 config/hosts/ostara/tf.nix   | 12 ------------
 default.nix                  |  2 ++
 5 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 config/hosts/mabon/tf.nix
 delete mode 100644 config/hosts/ostara/tf.nix

diff --git a/config/hosts/mabon/meta.nix b/config/hosts/mabon/meta.nix
index e69de29b..f3ce909e 100644
--- a/config/hosts/mabon/meta.nix
+++ b/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";
+    };
+  };
+}
diff --git a/config/hosts/mabon/tf.nix b/config/hosts/mabon/tf.nix
deleted file mode 100644
index fc692061..00000000
--- a/config/hosts/mabon/tf.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, hosts, ... }: {
-  config = {
-    resources.mabon = {
-      provider = "null";
-      type = "resource";
-      connection = {
-        port = 62954;
-        host = "192.168.1.119";
-      };
-    };
-  };
-}
diff --git a/config/hosts/ostara/meta.nix b/config/hosts/ostara/meta.nix
index d53a7ef9..14abe350 100644
--- a/config/hosts/ostara/meta.nix
+++ b/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";
-        networking = {
-          hostName = "samhain";
-        };
+    };
+    network.nodes.ostara = {
+      imports = lib.hostImport "ostara";
+      networking = {
+        hostName = "ostara";
       };
     };
   };
diff --git a/config/hosts/ostara/tf.nix b/config/hosts/ostara/tf.nix
deleted file mode 100644
index 0669f51c..00000000
--- a/config/hosts/ostara/tf.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, hosts, ... }: {
-  config = {
-    resources.ostara = {
-      provider = "null";
-      type = "resource";
-      connection = {
-        port = 62954;
-        host = "192.168.1.245";
-      };
-    };
-  };
-}
diff --git a/default.nix b/default.nix
index 030135c9..d394fc40 100644
--- a/default.nix
+++ b/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;