feat: use a host attribute to make the config less verbose/complex

machines/agentjones.nix

@@ -17,6 +17,10 @@ Notes:    Used to have Agent Smith as a partner but it died (Ironically)
   name = "agentjones";
   ip_pub = "193.1.99.72";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ./hardware/RM001.nix
@@ -46,10 +50,7 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   # keep the wired usb connection alive (front panel)

machines/cadie.nix

@@ -18,6 +18,10 @@ Notes:
   name = "cadie";
   ip_pub = "193.1.99.77";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/nextcloud.nix
@@ -46,18 +50,12 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet_nextcloud = {
     enable = true;
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   # this was causing a conflict for some reason

machines/earth.nix

@@ -18,6 +18,10 @@ Notes:
   name = "earth";
   ip_pub = "193.1.99.79";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/skynet.ie.nix
@@ -47,16 +51,10 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 }

machines/galatea.nix

@@ -19,6 +19,10 @@ Notes:
   name = "galatea";
   ip_pub = "193.1.99.111";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/ulfm.nix
@@ -47,17 +51,11 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet_ulfm = {
     enable = true;
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 }

machines/gir.nix

@@ -18,7 +18,10 @@ Notes:
   name = "gir";
   ip_pub = "193.1.99.76";
   hostname = "${name}.skynet.ie";
-  #hostname  = ip_pub;
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/email.nix
@@ -48,19 +51,13 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   # we use this to pass in teh relevent infomation to the
   services.skynet_email = {
     enable = true;
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
     domain = "skynet.ie";
   };
 }

machines/glados.nix

@@ -19,6 +19,10 @@ Notes:    Each user has roughly 20gb os storage
   name = "glados";
   ip_pub = "193.1.99.75";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/gitlab.nix
@@ -47,17 +51,11 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet_gitlab = {
     enable = true;
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 }

machines/kitt.nix

@@ -19,7 +19,10 @@ Notes:
   name = "kitt";
   ip_pub = "193.1.99.74";
   hostname = "${name}.skynet.ie";
-  #hostname  = ip_pub;
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/ldap/server.nix
@@ -54,18 +57,12 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet_ldap = {
     enable = true;
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.discord_bot = {
@@ -75,27 +72,18 @@ in {
   services.skynet_vaultwarden = {
     enable = true;
 
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
   services.skynet.prometheus = {
     server = {
       enable = true;
-      host = {
+      host = host;
-        ip = ip_pub;
-        name = name;
-      };
     };
   };
 
   services.skynet.grafana = {
     enable = true;
 
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 }

machines/marvin.nix

@@ -17,6 +17,10 @@ Notes:
   name = "marvin";
   ip_pub = "193.1.99.81";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 
   groups = [
     "skynet-admins-linux"
@@ -64,10 +68,7 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   # Put test services below this

machines/neuromancer.nix

@@ -18,6 +18,10 @@ Notes:
   name = "neuromancer";
   ip_pub = "193.1.99.80";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ./hardware/RM007.nix
@@ -60,9 +64,6 @@ in {
 
   services.skynet.backup = {
     server.enable = true;
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 }

machines/optimus.nix

@@ -19,6 +19,10 @@ Notes:
   name = "optimus";
   ip_pub = "193.1.99.112";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/games.nix
@@ -47,17 +51,11 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet_games = {
     enable = true;
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 }

machines/skynet.nix

@@ -21,6 +21,10 @@ Notes:    Does not host offical sites
   # for internal network connectivity
   ip_int = "193.1.99.82";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/skynet_users.nix
@@ -49,15 +53,9 @@ in {
     }
   ];
 
-  services.skynet.backup.host = {
+  services.skynet.backup.host = host;
-    ip = ip_pub;
-    name = name;
-  };
 
   services.skynet_users = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 }

machines/vendetta.nix

@@ -18,6 +18,10 @@ Notes:    Using the server that used to be called Earth
   name = "vendetta";
   ip_pub = "193.1.99.120";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ./hardware/RM002.nix
@@ -46,10 +50,7 @@ in {
   };
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet.dns = {

machines/vigil.nix

@@ -17,6 +17,10 @@ Notes:
   name = "vigil";
   ip_pub = "193.1.99.109";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
   ];
@@ -30,10 +34,7 @@ in {
   };
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet.dns = {

machines/wheatly.nix

@@ -18,6 +18,10 @@ Notes:
   name = "wheatly";
   ip_pub = "193.1.99.78";
   hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/gitlab_runner.nix
@@ -46,10 +50,7 @@ in {
   ];
 
   services.skynet.backup = {
-    host = {
+    host = host;
-      ip = ip_pub;
-      name = name;
-    };
   };
 
   services.skynet_gitlab_runner = {