diff --git a/docs/TODO.md b/docs/TODO.md
index b2ea07b..fc3f4ec 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -1,31 +1,30 @@
-# Todolist
-
-feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
-
-- [ ] Nixy script v2 (with nixosConfiguration's name variable)
-- [ ] Installation script
+# Todolist
+
+feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
+
+- [ ] Nixy script v2 (with nixosConfiguration's name variable)
+- [ ] Installation script
 - [ ] Themes
-  - [ ] Upload new wallpapers
-  - [ ] MacOS theme
-- [ ] Make hyprcursor work
-- [ ] Homepage (web) v2
-  - [ ] Compile the sveltejs project
-  - [ ] Different link on web/mobile (so it can open ios/android apps)
+  - [ ] Upload new wallpapers
+  - [ ] MacOS theme
+- [ ] Make hyprcursor work
+- [ ] Homepage (web) v2
+  - [ ] Compile the sveltejs project
+  - [ ] Different link on web/mobile (so it can open ios/android apps)
   - [ ] Test services ? (ping)
-  - [ ] Manifest & favicon
-- [ ] Nixvim
-  - [ ] Nerdfont pluggins to search and paste in the code
-  - [ ] Telescope shortcut for file content
-  - [ ] Markdown snippets
-  - [ ] Make whichkey better
-- [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
-  - [ ] Exclude file pattern (nodes modules, ...)
-- [ ] Nextcloud exclude file pattern (nodes modules, ...)
-- [ ] Automount USB Key (And notify-send when it's done)
-  - [ ] Usb security for laptop & server, variable in variables.nix, disable for guest
-- [ ] Bitcoin-git
-- [ ] server fetch
-- [ ] Remote push
+  - [ ] Manifest & favicon
+- [ ] Nixvim
+  - [ ] Nerdfont pluggins to search and paste in the code
+  - [ ] Telescope shortcut for file content
+  - [ ] Markdown snippets
+  - [ ] Make whichkey better
+- [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
+  - [ ] Exclude file pattern (nodes modules, ...)
+- [ ] Nextcloud exclude file pattern (nodes modules, ...)
+- [ ] Automount USB Key (And notify-send when it's done)
+  - [ ] Usb security for laptop & server, variable in variables.nix, disable for guest
+- [ ] Bitcoin-git
+- [ ] server fetch
+- [ ] Remote push
 - [ ] Ntfy auth file
 - [ ] Uptime kuma or alt
-- [ ] Tailscale variable
\ No newline at end of file
diff --git a/docs/scripts/create_guest_config.sh b/docs/scripts/create_guest_config.sh
index e934778..38237e3 100644
--- a/docs/scripts/create_guest_config.sh
+++ b/docs/scripts/create_guest_config.sh
@@ -25,4 +25,5 @@ variables=$(echo "$variables" | sed 's/hadi/your_username/')
 variables=$(echo "$variables" | sed 's/Hadi/your_username/')
 variables=$(echo "$variables" | sed 's/sops = true/sops = false/')
 variables=$(echo "$variables" | sed 's/obsidian = true/obsidian = false/')
+variables=$(echo "$variables" | sed 's/tailscale = true/tailscale = false/')
 echo "$variables" >"$GUEST_CONFIG/variables.nix"
diff --git a/home/laptop.nix b/home/laptop.nix
index 0bf67f3..1f4ac61 100644
--- a/home/laptop.nix
+++ b/home/laptop.nix
@@ -40,6 +40,7 @@
       bitwarden
       vlc
       nextcloud-client
+      tailscale
 
       # Dev
       go
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index c3a6be7..cb404a3 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -47,6 +47,7 @@
   };
 
   services = {
+    tailscale.enable = config.var.tailscale;
     xserver = {
       enable = true;
       xkb.layout = config.var.keyboardLayout;
diff --git a/hosts/modules/server/tailscale.nix b/hosts/modules/server/tailscale.nix
index 2d69cb1..bb6de6e 100644
--- a/hosts/modules/server/tailscale.nix
+++ b/hosts/modules/server/tailscale.nix
@@ -1,6 +1,6 @@
-{
+{ config, ... }: {
   services.tailscale = {
-    enable = true;
+    enable = config.var.tailscale;
     useRoutingFeatures = "both";
     authKeyFile = "/etc/tailscale/authKey";
     openFirewall = true;
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index faa3dd0..c5760b8 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -14,6 +14,7 @@
     ../modules/server/adguard.nix
     ../modules/server/ntfy-sh.nix
     ../modules/server/tailscale.nix
+    ../modules/server/kuma.nix
     # ../modules/server/unifi.nix # FIXME: unifi5 is deprecated
 
   ];
diff --git a/hosts/server/variables.nix b/hosts/server/variables.nix
index 8b74c24..b92c7d7 100644
--- a/hosts/server/variables.nix
+++ b/hosts/server/variables.nix
@@ -24,6 +24,7 @@
     autoGarbageCollector = false;
     sops = true;
     obsidian = false;
+    tailscale = true;
 
     theme = import ../themes/jack.nix; # select your theme here
   };