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                                    | 8 ++++----
 flake.nix                                     | 2 +-
 inputs.nix                                    | 5 +++--
 4 files changed, 10 insertions(+), 9 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 38d7582f..6ac6408e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -513,17 +513,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1723457519,
-        "narHash": "sha256-ZrgG8KZlP9Wn3hQwco2IWA2emlqisC9kOe48eVK1uzQ=",
+        "lastModified": 1726648988,
+        "narHash": "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE=",
         "owner": "juanfont",
         "repo": "headscale",
-        "rev": "022fb24cd92035470496d50d86bf8c9ee74b1e7e",
+        "rev": "10a72e8d542af68c0c280f2a6ccc84849719b24c",
         "type": "github"
       },
       "original": {
         "owner": "juanfont",
+        "ref": "v0.23.0",
         "repo": "headscale",
-        "rev": "022fb24cd92035470496d50d86bf8c9ee74b1e7e",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 38385627..c851d700 100644
--- a/flake.nix
+++ b/flake.nix
@@ -119,8 +119,8 @@
         nixpkgs.follows = "nixpkgs";
       };
       owner = "juanfont";
+      ref = "v0.23.0";
       repo = "headscale";
-      rev = "022fb24cd92035470496d50d86bf8c9ee74b1e7e";
       type = "github";
     };
     home-manager = {
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 {