diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix
index 1b95fd5..c8a542e 100644
--- a/nixcfgs/hosts/zephyrus/default.nix
+++ b/nixcfgs/hosts/zephyrus/default.nix
@@ -45,7 +45,8 @@
 
     # services
     ../../modules/nixos/services/docker.nix
-    ../../modules/nixos/services/exp.nix
+    ../../modules/nixos/services/syncthing.nix
+    ../../modules/nixos/services/tailscale.nix
   ];
 
   # Hostname
diff --git a/nixcfgs/modules/home/do-not-track.nix b/nixcfgs/modules/home/do-not-track.nix
index 476e411..e9188a8 100644
--- a/nixcfgs/modules/home/do-not-track.nix
+++ b/nixcfgs/modules/home/do-not-track.nix
@@ -1,15 +1,4 @@
 {...}: {
   # See: https://consoledonottrack.com/
-  home.sessionVariables = {
-    DO_NOT_TRACK = "1";
-    GATSBY_TELEMETRY_DISABLED = "1";
-    HOMEBREW_NO_ANALYTICS = "1";
-    STNOUPGRADE = "1";
-    DOTNET_CLI_TELEMETRY_OPTOUT = "1";
-    SAM_CLI_TELEMETRY = "0";
-    AZURE_CORE_COLLECT_TELEMETRY = "0";
-    GEMINI_TELEMETRY_ENABLED = "false";
-    SCARF_NO_ANALYTICS = "true";
-    ANONYMIZED_TELEMETRY = "false";
-  };
+  home.sessionVariables = import ../lib/do-not-track-vars.nix;
 }
diff --git a/nixcfgs/modules/lib/do-not-track-vars.nix b/nixcfgs/modules/lib/do-not-track-vars.nix
new file mode 100644
index 0000000..390c15f
--- /dev/null
+++ b/nixcfgs/modules/lib/do-not-track-vars.nix
@@ -0,0 +1,14 @@
+# Shared telemetry opt-out variables
+# See: https://consoledonottrack.com/
+{
+  DO_NOT_TRACK = "1";
+  GATSBY_TELEMETRY_DISABLED = "1";
+  HOMEBREW_NO_ANALYTICS = "1";
+  STNOUPGRADE = "1";
+  DOTNET_CLI_TELEMETRY_OPTOUT = "1";
+  SAM_CLI_TELEMETRY = "0";
+  AZURE_CORE_COLLECT_TELEMETRY = "0";
+  GEMINI_TELEMETRY_ENABLED = "false";
+  SCARF_NO_ANALYTICS = "true";
+  ANONYMIZED_TELEMETRY = "false";
+}
diff --git a/nixcfgs/modules/nixos/core/do-not-track.nix b/nixcfgs/modules/nixos/core/do-not-track.nix
index edee396..87e92dd 100644
--- a/nixcfgs/modules/nixos/core/do-not-track.nix
+++ b/nixcfgs/modules/nixos/core/do-not-track.nix
@@ -1,15 +1,4 @@
 {...}: {
   # See: https://consoledonottrack.com/
-  environment.variables = {
-    DO_NOT_TRACK = "1";
-    GATSBY_TELEMETRY_DISABLED = "1";
-    HOMEBREW_NO_ANALYTICS = "1";
-    STNOUPGRADE = "1";
-    DOTNET_CLI_TELEMETRY_OPTOUT = "1";
-    SAM_CLI_TELEMETRY = "0";
-    AZURE_CORE_COLLECT_TELEMETRY = "0";
-    GEMINI_TELEMETRY_ENABLED = "false";
-    SCARF_NO_ANALYTICS = "true";
-    ANONYMIZED_TELEMETRY = "false";
-  };
+  environment.variables = import ../../lib/do-not-track-vars.nix;
 }
diff --git a/nixcfgs/modules/nixos/services/exp.nix b/nixcfgs/modules/nixos/services/syncthing.nix
similarity index 56%
rename from nixcfgs/modules/nixos/services/exp.nix
rename to nixcfgs/modules/nixos/services/syncthing.nix
index ad7a3b7..b1af04b 100644
--- a/nixcfgs/modules/nixos/services/exp.nix
+++ b/nixcfgs/modules/nixos/services/syncthing.nix
@@ -1,4 +1,3 @@
 {...}: {
   services.syncthing.enable = true;
-  services.tailscale.enable = true;
 }
diff --git a/nixcfgs/modules/nixos/services/tailscale.nix b/nixcfgs/modules/nixos/services/tailscale.nix
new file mode 100644
index 0000000..ef50609
--- /dev/null
+++ b/nixcfgs/modules/nixos/services/tailscale.nix
@@ -0,0 +1,3 @@
+{...}: {
+  services.tailscale.enable = true;
+}
diff --git a/nixcfgs/users/js0ny/config.nix b/nixcfgs/users/js0ny/config.nix
deleted file mode 100644
index a19f3af..0000000
--- a/nixcfgs/users/js0ny/config.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  my = {
-    desktop = {
-      preferredApps = {
-        shell = pkgs.zsh;
-        interactiveShell = pkgs.fish;
-        terminal = {
-          package = pkgs.kitty;
-          execArg = "-e";
-        };
-      };
-    };
-  };
-}
diff --git a/nixcfgs/users/js0ny/default.nix b/nixcfgs/users/js0ny/default.nix
index 806d934..3388102 100644
--- a/nixcfgs/users/js0ny/default.nix
+++ b/nixcfgs/users/js0ny/default.nix
@@ -9,7 +9,6 @@ in {
   imports = [
     ../../modules/home/options.nix
     ../../modules/home/do-not-track.nix
-    # ./config.nix
   ];
   home.username = username;
   home.homeDirectory =
diff --git a/nixcfgs/users/js0ny/zen.nix b/nixcfgs/users/js0ny/zen.nix
index a02c0b6..6edf216 100644
--- a/nixcfgs/users/js0ny/zen.nix
+++ b/nixcfgs/users/js0ny/zen.nix
@@ -38,7 +38,6 @@
     ./programs/darwin/alt-tab.nix
     ./programs/darwin/iina.nix
 
-    ../../modules/home/do-not-track.nix
     ../../modules/home/darwin.nix
 
     ../../modules/home/programs/lsd.nix
diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix
index 96a16e7..a5709b3 100644
--- a/nixcfgs/users/js0ny/zephyrus.nix
+++ b/nixcfgs/users/js0ny/zephyrus.nix
@@ -91,8 +91,6 @@ in {
     ./programs/desktop/gnome/copyous.nix
     ./programs/desktop/wayland-wm/niri
 
-    ../../modules/home/do-not-track.nix
-
     # General Program config
     ../../modules/home/programs/eza.nix
     # ../../modules/home/programs/winboat.nix