From ffc03d2b46ac97cab228765920b3d13798a21f6e Mon Sep 17 00:00:00 2001
From: Marin <supermarin@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:13:43 -0400
Subject: [PATCH] tailscaled: after NetworkManager-wait-online

The wait will only be enabled on machines with NetworkManager enabled.

Closes #180175

(cherry picked from commit 0d822ccdbc1042e2983221138e5b4291bf80d062)
---
 nixos/modules/services/networking/tailscale.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index a690dc610e825..1b017dc30a2a7 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -88,6 +88,7 @@ in {
     environment.systemPackages = [ cfg.package ]; # for the CLI
     systemd.packages = [ cfg.package ];
     systemd.services.tailscaled = {
+      after = lib.mkIf (config.networking.networkmanager.enable) [ "NetworkManager-wait-online.service" ];
       wantedBy = [ "multi-user.target" ];
       path = [
         pkgs.procps     # for collecting running services (opt-in feature)