From a53995840e0c4f75e0376181d2421996a06f863b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Wed, 19 Feb 2025 03:40:26 +0200
Subject: [PATCH] Transition to new opnsense setup

---
 machine-confs/helium.nix  | 15 ++++-----------
 machine-confs/lithium.nix | 15 ++++-----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/machine-confs/helium.nix b/machine-confs/helium.nix
index 9dfcd7e..f8c333b 100644
--- a/machine-confs/helium.nix
+++ b/machine-confs/helium.nix
@@ -6,12 +6,9 @@
     wg-quick.interfaces = {
       wg0 = {
         autostart = true;
-        address = [
-          "fd08:d473:bcca:f0::2/64"
-          "2001:14ba:a08c:2df0::2/64"
-        ];
+        address = [ "2001:14ba:a090:39f0::2/64" ];
         dns = [
-          "fd08:d473:bcca::1"
+          "2001:14ba:a090:39f0::1"
           "vsinerva.fi"
         ];
         privateKeyFile = "/root/wireguard-keys/privatekey-home";
@@ -21,11 +18,7 @@
           {
             publicKey = "f9QoYPxyaxylUcOI9cE9fE9DJoEX4c6GUtr4p+rsd34=";
             presharedKeyFile = "/root/wireguard-keys/psk-home";
-            allowedIPs = [
-              "fd08:d473:bcca::/64"
-              "fd08:d473:bcca:f0::/64"
-              "::/0"
-            ];
+            allowedIPs = [ "::/0" ];
             endpoint = "wg.vsinerva.fi:51820";
           }
         ];
@@ -57,7 +50,7 @@
   };
   services.clatd = {
     enable = true;
-    settings.clat-v6-addr = "2001:14ba:a08c:2df0::f2";
+    settings.clat-v6-addr = "2001:14ba:a090:39f0::c2";
   };
   systemd.services.clatd.wants = [ "wg-quick-wg0.service" ];
 
diff --git a/machine-confs/lithium.nix b/machine-confs/lithium.nix
index 9494a93..521ada0 100644
--- a/machine-confs/lithium.nix
+++ b/machine-confs/lithium.nix
@@ -6,12 +6,9 @@
     wg-quick.interfaces = {
       wg0 = {
         autostart = true;
-        address = [
-          "fd08:d473:bcca:f0::3/64"
-          "2001:14ba:a08c:2df0::3/64"
-        ];
+        address = [ "2001:14ba:a090:39f0::3/64" ];
         dns = [
-          "fd08:d473:bcca::1"
+          "2001:14ba:a090:39f0::1"
           "vsinerva.fi"
         ];
         privateKeyFile = "/root/wireguard-keys/privatekey-home";
@@ -21,11 +18,7 @@
           {
             publicKey = "f9QoYPxyaxylUcOI9cE9fE9DJoEX4c6GUtr4p+rsd34=";
             presharedKeyFile = "/root/wireguard-keys/psk-home";
-            allowedIPs = [
-              "fd08:d473:bcca::/64"
-              "fd08:d473:bcca:f0::/64"
-              "::/0"
-            ];
+            allowedIPs = [ "::/0" ];
             endpoint = "wg.vsinerva.fi:51820";
           }
         ];
@@ -39,7 +32,7 @@
   };
   services.clatd = {
     enable = true;
-    settings.clat-v6-addr = "2001:14ba:a08c:2df0::f3";
+    settings.clat-v6-addr = "2001:14ba:a090:39f0::c3";
   };
   systemd.services.clatd.wants = [ "wg-quick-wg0.service" ];