Restructure values file to separate hosts from services

values.nix

@@ -1,25 +1,29 @@
 # Feel free to change the structure of this file
-
-rec {
-  gateway = "129.241.210.129";
-
-
-  jokum = {
-    ipv4 = "129.241.210.169";
-    ipv6 = "2001:700:300:1900::169";
-  };
-  matrix = {
-    ipv4 = jokum.ipv4;
-    ipv6 = jokum.ipv6;
-  };
-  # Also on jokum
-  turn = {
-    ipv4 = "129.241.210.213";
-    ipv6 = "2001:700:300:1900::213";
+let
+  pvv-ipv4 = suffix: "129.241.210.${toString suffix}";
+  pvv-ipv6 = suffix: "2001:700:300:1900::${toString suffix}";
+in rec {
+  services = {
+    matrix = {
+      ipv4 = hosts.jokum.ipv4;
+      ipv6 = hosts.jokum.ipv6;
+    };
+    # Also on jokum
+    turn = {
+      ipv4 = pvv-ipv4 213;
+      ipv6 = pvv-ipv6 213;
+    };
   };
 
-  ildkule = {
-    ipv4 = "129.241.210.187";
-    ipv6 = "2001:700:300:1900::1:187";
+  hosts = {
+    gateway = pvv-ipv4 129;
+    jokum = {
+      ipv4 = pvv-ipv4 169;
+      ipv6 = pvv-ipv6 169; 
+    };
+    ildkule = {
+      ipv4 = pvv-ipv4 187;
+      ipv6 = pvv-ipv6 "1:187";
+    };
   };
 }