diff --git a/modules/networking.nix b/modules/networking.nix
index e844045..914e922 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -39,12 +39,6 @@ delib.module {
       # dnsovertls = "trues";
     };
 
-    services.tailscale = {
-      enable = true;
-      openFirewall = true;
-      useRoutingFeatures = "client";
-    };
-
     # services.mullvad-vpn.enable = true;
     # services.mullvad-vpn.package = pkgs.mullvad-vpn;
 
diff --git a/modules/tailscale.nix b/modules/tailscale.nix
new file mode 100644
index 0000000..f193dee
--- /dev/null
+++ b/modules/tailscale.nix
@@ -0,0 +1,14 @@
+{delib, ...}:
+delib.module {
+  name = "tailscale";
+
+  options = delib.singleEnableOption true;
+
+  nixos.ifEnabled.services.tailscale = {
+    enable = true;
+    openFirewall = true;
+    useRoutingFeatures = "client";
+  };
+
+  # home.ifEnabled.services.tailscale-systray.enable = true;
+}