joint ips & ports open through lambda

modules/modules.nix

@@ -40,21 +40,6 @@ in
       default = "::1";
       description = "The localhost ipv6 address.";
     };
-    wgVpsIp = lib.mkOption {
-      type = lib.types.str;
-      default = "10.77.0.1";
-      description = "The ip address of my router.";
-    };
-    wgServerIp = lib.mkOption {
-      type = lib.types.str;
-      default = "10.77.0.2";
-      description = "The ip address of my router.";
-    };
-    routerIp = lib.mkOption {
-      type = lib.types.str;
-      default = "192.168.100.1";
-      description = "The ip address of my router.";
-    };
     domain = lib.mkOption {
       type = lib.types.str;
       default = "servidos.lat";
@@ -63,9 +48,13 @@ in
     ips = lib.mkOption {
       type = lib.types.attrsOf lib.types.str;
       default = {
+        router = "192.168.100.1";
         server = "192.168.100.15";
         miniserver = "192.168.1.100";
         workstation = "192.168.100.18";
+        vps = "51.222.141.104";
+        wg-vps = "10.77.0.1";
+        wg-server = "10.77.0.2";
       };
       description = "Set of IP's for all my computers.";
     };

modules/servers/homepage/service-widgets.nix

@@ -196,7 +196,7 @@
       icon = "${cfg.name}.png";
       href = cfg.url;
       widget = {
-        url = "http://${config.my.wgServerIp}:8081";
+        url = "http://${config.my.ips.wg-server}:8081";
         type = cfg.name;
         username = "{{HOMEPAGE_VAR_NEXTCLOUD_USERNAME}}";
         password = "{{HOMEPAGE_VAR_NEXTCLOUD_PASSWORD}}";

modules/servers/nextcloud.nix

@@ -111,8 +111,8 @@ in
           trusted_proxies = [
             config.my.localhost
             config.my.localhost6
-            config.my.routerIp
-            config.my.wgVpsIp
+            config.my.ips.router
+            config.my.ips.wg-vps
           ];
           trusted_domains = [
             cfg.host
@@ -165,7 +165,7 @@ in
           #vps
           listen = [
             {
-              addr = config.my.wgServerIp;
+              addr = config.my.ips.wg-server;
               port = 8081;
             }
             {

modules/servers/synapse.nix

@@ -59,7 +59,7 @@ in
               bind_addresses = [
                 config.my.localhost
                 config.my.localhost6
-                config.my.wgServerIp
+                config.my.ips.wg-server
               ];
               type = "http";
               tls = false;