From be380f2c012be14861fb9cc06b28b3a7b7d443b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Fri, 20 Oct 2023 00:37:08 +0200
Subject: [PATCH] fix: wireguard ipv6 and dns

---
 hosts/pie/ddclient.nix               |  4 ----
 hosts/pie/dhcpd.nix                  | 16 +++++++++++++++-
 hosts/pie/unbound.nix                |  8 ++++++--
 modules/wireguard-client/default.nix |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/hosts/pie/ddclient.nix b/hosts/pie/ddclient.nix
index 9a9af07..5499166 100644
--- a/hosts/pie/ddclient.nix
+++ b/hosts/pie/ddclient.nix
@@ -9,9 +9,6 @@ with lib; let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
 
-  getIP4 = with pkgs; writeShellScriptBin "getIP" ''
-    ${curl}/bin/curl -4 https://ipcheck-ds.wieistmeineip.de/callback/ | ${coreutils}/bin/tail -c +2 | ${coreutils}/bin/head -c -1 | ${jq}/bin/jq '.ip' -r
-  '';
   getIP6 = with pkgs; writeShellScriptBin "getIP" ''
     ${curl}/bin/curl -6 https://ipcheck-ds.wieistmeineip.de/callback/ | ${coreutils}/bin/tail -c +2 | ${coreutils}/bin/head -c -1 | ${jq}/bin/jq '.ip' -r
   '';
@@ -29,7 +26,6 @@ in {
     ];
     server = "ddns.hosting.de";
     username = "b12f";
-    usev4 = "cmdv4, cmdv4=${getIP4}/bin/getIP";
     usev6 = "cmdv6, cmdv6=${getIP6}/bin/getIP";
     verbose = true;
     passwordFile = "/run/agenix/dyndns.key";
diff --git a/hosts/pie/dhcpd.nix b/hosts/pie/dhcpd.nix
index af35013..0e5c045 100644
--- a/hosts/pie/dhcpd.nix
+++ b/hosts/pie/dhcpd.nix
@@ -107,7 +107,7 @@
                code = 23;
                space = "dhcp6";
                csv-format = true;
-               data = "2a02:908:5b1:e3c0:3077:4e39:7763:b5b7";
+               data = "2a02:908:5b1:e3c0:3077:4e39:7763:2";
             }
           ];
 
@@ -126,6 +126,20 @@
                 "2a02:908:5b1:e3c0:3077:4e39:7763:2"
               ];
             }
+            {
+              hostname = "chocolatebar.local";
+              hw-address = "04:d9:f5:fa:35:f5";
+              ip-addresses = [
+                "2a02:908:5b1:e3c0:3077:4e39:7763:5"
+              ];
+            }
+            {
+              hostname = "biolimo.local";
+              hw-address = "c6:f2:d1:df:ed:a4";
+              ip-addresses = [
+                "2a02:908:5b1:e3c0:3077:4e39:7763:6"
+              ];
+            }
           ];
         }
       ];
diff --git a/hosts/pie/unbound.nix b/hosts/pie/unbound.nix
index 1817118..21347c7 100644
--- a/hosts/pie/unbound.nix
+++ b/hosts/pie/unbound.nix
@@ -26,13 +26,17 @@
           "\"brwb8763f64a364.local. 10800 IN A 192.168.178.4\""
 
           "\"droppie.local. 10800 IN A 192.168.178.3\""
-          "\"droppie.local. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:b5b8\""
+          "\"droppie.local. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:3\""
+
           "\"droppie.b12f.io. 10800 IN A 10.0.1.3\""
           "\"droppie.b12f.io. 10800 IN AAAA fd00:acab:1312:acab:3::\""
           "\"backup.b12f.io. 10800 IN CNAME droppie.b12f.io\""
 
           "\"pie.local. 10800 IN A 192.168.178.2\""
-          "\"pie.local. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:b5b7\""
+          "\"pie.local. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:2\""
+
+          "\"vpn.b12f.io. 10800 IN AAAA 2a02:908:5b1:e3c0:3077:4e39:7763:2\""
+
           "\"pie.b12f.io. 10800 IN A 10.0.1.2\""
           "\"pie.b12f.io. 10800 IN AAAA fd00:acab:1312:acab:2::\""
           "\"firefly.b12f.io. 10800 IN CNAME pie.b12f.io\""
diff --git a/modules/wireguard-client/default.nix b/modules/wireguard-client/default.nix
index 0acabb2..c474c70 100644
--- a/modules/wireguard-client/default.nix
+++ b/modules/wireguard-client/default.nix
@@ -44,7 +44,7 @@ in {
               "10.0.1.0/32"
               "fd00:acab:1312:acab:0::/128"
             ];
-            endpoint = "vpn.b12f.io:51899";
+            endpoint = "[2a02:908:5b1:e3c0:3077:4e39:7763:2]:51899";
             persistentKeepalive = 25;
           }
         ];