summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMike O'Driscoll <mike@unusedbytes.ca>2025-10-28 16:57:26 -0400
committerMike O'Driscoll <mike@unusedbytes.ca>2025-10-28 16:57:26 -0400
commit67a5a3170d01b3d988493ad88dfa5de404158e8f (patch)
tree260b134ce9a7ab3e0d4f190ef94f81132cf140bd
parent7e28275cfbae6f34250998347d0f0f887715ef6d (diff)
downloadtailscale-mikeodr/add-nixos-modules.tar.xz
tailscale-mikeodr/add-nixos-modules.zip
Test, will squashmikeodr/add-nixos-modules
-rw-r--r--flake.nix9
-rw-r--r--nixos/tailscaled-module.nix2
2 files changed, 10 insertions, 1 deletions
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;