diff --git a/modules/linux/nixos/default.nix b/modules/linux/nixos/default.nix
index 24af95b..fc77fde 100644
--- a/modules/linux/nixos/default.nix
+++ b/modules/linux/nixos/default.nix
@@ -19,6 +19,7 @@
     ./watchdog.nix
     ./general-services.nix
     ./additional-hardware
+    ./tailscale.nix
   ];
 
   crony.bluetooth.enable = lib.mkDefault true;
@@ -40,4 +41,5 @@
   crony.watchdog.disable = lib.mkDefault true;
   crony.general-services.enable = lib.mkDefault true;
   crony.additional-hardware.enable = lib.mkDefault true;
+  crony.tailscale.enable = lib.mkDefault true;
 }
diff --git a/modules/linux/nixos/tailscale.nix b/modules/linux/nixos/tailscale.nix
new file mode 100644
index 0000000..491434e
--- /dev/null
+++ b/modules/linux/nixos/tailscale.nix
@@ -0,0 +1,16 @@
+{
+  config,
+  lib,
+  ...
+}: {
+  options = {
+    crony.tailscale.enable = lib.mkEnableOption "Enable tailscale";
+  };
+
+  config = lib.mkIf config.crony.tailscale.enable {
+    services.tailscale = {
+      enable = true;
+      useRoutingFeatures = "both";
+    };
+  };
+}