From 4558136f86de0c56d1f2af7b93db6f9e7cb73067 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Fri, 20 Sep 2024 23:09:28 -0400
Subject: [PATCH] chore(headscale): bump from working rev to 0.23.0

---
 devices/cluster/modules/headscale/default.nix |   4 ++--
 flake.lock                                    | Bin 55866 -> 55833 bytes
 flake.nix                                     | Bin 9533 -> 9500 bytes
 inputs.nix                                    |   5 +++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/devices/cluster/modules/headscale/default.nix b/devices/cluster/modules/headscale/default.nix
index 8cf381b0..ee93f60e 100644
--- a/devices/cluster/modules/headscale/default.nix
+++ b/devices/cluster/modules/headscale/default.nix
@@ -52,7 +52,7 @@ in {
       private_key_path = "/var/lib/headscale/private.key";
       noise.private_key_path = "/var/lib/headscale/noise_private.key";
 
-      dns_config = let
+      dns = let
         caddyIp =
           if hostName == "thingone"
           then "100.64.0.8"
@@ -60,7 +60,7 @@ in {
       in {
         magic_dns = false;
         override_local_dns = true;
-        nameservers = [caddyIp];
+        nameservers.global = [caddyIp];
       };
 
       log = {
diff --git a/flake.lock b/flake.lock
index 38d7582f8203c0c009c32db2785fb16c1b3e5d60..6ac6408e5fd69d2be5022564ebdbb68024d0d110 100644
GIT binary patch
delta 149
zcmV;G0BZlbv;&#61F$AF1U5D_IFs)?AS*R=Y;IOgaBeGTN@00;NNQAYVoy&qYf?#W
zPgze!dN6QhIdFGsSXyjCMU#;j7L$uLI4ChNVK*{mIAk?6GGS&mIAbtlGB_}1GGR7j
zV`DfpI5asoF*#x~G-H!Nrc9HJH5CkIB03-<b}%k7GcGWbQA!n)s5KOmJv1e=$2N1L
DizhHY

delta 177
zcmbQag?ZN&<_&75Y{n+0=B9>|KMKidM-`>JTX;w11XzaW8D|8RC+8b^hC3Ri=H?V;
z7CT#J`=^>%q=tDLmR1E$o+u$Ux!cr2-N48wEy>6vImOb*z}VEp+`z=rEXC9y#lkEp
j%_7+{HPzfC$uQM?a^rM~$rDmcNY>+^D!F;7S;=AmpOH8A

diff --git a/flake.nix b/flake.nix
index 383856270bf670623dfccb3d597f2f36c18d310a..c851d7009dafd3a2e54dcb9f3af561975320b31e 100644
GIT binary patch
delta 33
pcmdn%HOFhiKQ5j$1zQEBG6Ov$V?Be(pShGLYw^o$&f>l-2>`}f3jF{8

delta 68
zcmbQ^wbyIIKd#B5+!Fdlsbvbb3Q7h>Mrlb#Cdnz5Mh3>FCguhvmS!oY1}PS1Nof|z
YmZ_=cCP{{==BbkddDJ$0abJ=I0Mg_XUjP6A

diff --git a/inputs.nix b/inputs.nix
index d3d1ab97..5b11ca73 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -56,11 +56,12 @@ let
       repo = "nixos-pcsd";
     };
 
+    # FIXME: use nixpkgs once this reaches unstable
+    # https://github.com/NixOS/nixpkgs/pull/340054
     headscale = mkDep {
       owner = "juanfont";
       repo = "headscale";
-      # Keep at working rev while away from servers
-      rev = "022fb24cd92035470496d50d86bf8c9ee74b1e7e";
+      ref = "v0.23.0";
     };
 
     caddy-plugins = mkDep {