From 67a5a3170d01b3d988493ad88dfa5de404158e8f Mon Sep 17 00:00:00 2001 From: Mike O'Driscoll Date: Tue, 28 Oct 2025 16:57:26 -0400 Subject: [PATCH] Test, will squash --- flake.nix | 9 +++++++++ nixos/tailscaled-module.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 82ea1a12b..83a51b951 100644 --- a/flake.nix +++ b/flake.nix @@ -145,6 +145,15 @@ nixosModules = { tailscale = import ./nixos/tailscaled-module.nix self; + # Module that disables upstream and uses this one + override = { + config, + pkgs, + ... + }: { + imports = [(import ./nixos/tailscaled-module.nix self)]; + disabledModules = ["services/networking/tailscale.nix"]; + }; default = self.nixosModules.tailscale; }; diff --git a/nixos/tailscaled-module.nix b/nixos/tailscaled-module.nix index 1f9f62585..d8c873f38 100644 --- a/nixos/tailscaled-module.nix +++ b/nixos/tailscaled-module.nix @@ -17,7 +17,7 @@ self: { in { # Tailscale config options options.services.tailscale = { - enable = mkEnabledOption "Enable Tailscale service"; + enable = mkEnableOption "Enable Tailscale service"; package = mkOption { type = types.package;