From 547d6dc4731b04a240048b0b95c0ea12e0d1f6bd Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Fri, 9 Jan 2026 20:36:36 -0600
Subject: lots of changes, including revamp of network services boot chain on
 mercury

---
 modules/services/nixos/tailscale.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'modules/services/nixos/tailscale.nix')

diff --git a/modules/services/nixos/tailscale.nix b/modules/services/nixos/tailscale.nix
index f39fc27..6af3c1c 100644
--- a/modules/services/nixos/tailscale.nix
+++ b/modules/services/nixos/tailscale.nix
@@ -18,5 +18,11 @@ in
       allowedUDPPorts = [config.services.tailscale.port];
     };
 
+    # don't start tailscale until after headscale starts
+    systemd.services."tailscaled" = lib.mkIf config.collinux.services.selfhost.headscale.enable {
+      wants = lib.mkForce ["network.target" "headscale.target"];
+      after = lib.mkForce ["network.target" "headscale.target"];
+    };
+
     environment.systemPackages = [pkgs.tailscale];
   }
-- 
cgit v1.3.1


From 5c4484e206087b0be5723b0f79728fdeb1af7f82 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Sun, 18 Jan 2026 07:04:18 -0600
Subject: make tailscale start at the right time

---
 modules/services/nixos/tailscale.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'modules/services/nixos/tailscale.nix')

diff --git a/modules/services/nixos/tailscale.nix b/modules/services/nixos/tailscale.nix
index 6af3c1c..50e35d3 100644
--- a/modules/services/nixos/tailscale.nix
+++ b/modules/services/nixos/tailscale.nix
@@ -19,10 +19,16 @@ in
     };
 
     # don't start tailscale until after headscale starts
-    systemd.services."tailscaled" = lib.mkIf config.collinux.services.selfhost.headscale.enable {
-      wants = lib.mkForce ["network.target" "headscale.target"];
-      after = lib.mkForce ["network.target" "headscale.target"];
-    };
+    systemd.services."tailscaled" =
+      if config.collinux.services.selfhost.headscale.enable
+      then {
+        wants = lib.mkForce ["network.target" "headscale.target"];
+        after = lib.mkForce ["network.target" "headscale.target"];
+      }
+      else {
+        wants = lib.mkForce ["network.target"];
+        after = lib.mkForce ["network.target"];
+      };
 
     environment.systemPackages = [pkgs.tailscale];
   }
-- 
cgit v1.3.1