From e787aca39e59fcbe757f18661223c07b56779fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=BF=20corey?= <corey@x64.co>
Date: Sat, 11 Apr 2026 22:46:11 -0700
Subject: [PATCH] fix(spore): revert to canonical golink with OAuth support

---
 flake.lock                       | 11 +++++------
 flake.nix                        |  2 +-
 hosts/spore/services/default.nix | 11 +----------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 27ffaa3c..b31ed9b8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -286,16 +286,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1765523342,
-        "narHash": "sha256-x1KyVQHnHNSBeuLYtRGUqjVtwv4AZMd2RPhtTPXrR4I=",
-        "owner": "apoxy-dev",
+        "lastModified": 1775592125,
+        "narHash": "sha256-6kVGyNf5X7H7h/Vf8ge18YQPxRzljTlwPRpLdIPjndY=",
+        "owner": "tailscale",
         "repo": "golink",
-        "rev": "17e583241673aa51935ca9e0d559f91a63144d48",
+        "rev": "0c619de1671d3d8c8157ec2584115cdac41cc501",
         "type": "github"
       },
       "original": {
-        "owner": "apoxy-dev",
-        "ref": "dilyevsky/tsnet-1.90-upgrade",
+        "owner": "tailscale",
         "repo": "golink",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index ce801591..2b597c93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     golink = {
-      url = "github:apoxy-dev/golink/dilyevsky/tsnet-1.90-upgrade";
+      url = "github:tailscale/golink";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.systems.follows = "systems";
     };
diff --git a/hosts/spore/services/default.nix b/hosts/spore/services/default.nix
index e21d5a00..f6ee210e 100644
--- a/hosts/spore/services/default.nix
+++ b/hosts/spore/services/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   imports = [
     ./alloy.nix
     ./grafana.nix
@@ -31,11 +27,6 @@
   services.golink = {
     enable = true;
     tailscaleAuthKeyFile = config.age.secrets.tailscale-auth-key.path;
-    package = pkgs.buildGo125Module {
-      pname = "golink";
-      inherit (pkgs.golink) version src ldflags;
-      vendorHash = "sha256-M3Qm25KF6gWtp3K1SigLucgrIJ+5KokMq+Bp7XXaE+o=";
-    };
   };
 
   services.openssh.enable = true;