diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 670fc4d..9a79a1b 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -15,6 +15,7 @@
     ./programs/signal
     ./programs/ssh
     ./programs/telegram
+    ./programs/tmux
     ./programs/vagrant-wsl
     ./programs/work-desktop
     ./programs/yt-dlp
diff --git a/modules/programs/tmux/default.nix b/home-manager/modules/programs/tmux/default.nix
similarity index 99%
rename from modules/programs/tmux/default.nix
rename to home-manager/modules/programs/tmux/default.nix
index 96fefd4..9cc7164 100644
--- a/modules/programs/tmux/default.nix
+++ b/home-manager/modules/programs/tmux/default.nix
@@ -74,3 +74,4 @@ in
     };
   };
 }
+
diff --git a/home-manager/modules/services/desktop-base/default.nix b/home-manager/modules/services/desktop-base/default.nix
index 097dff5..e224d11 100644
--- a/home-manager/modules/services/desktop-base/default.nix
+++ b/home-manager/modules/services/desktop-base/default.nix
@@ -19,6 +19,7 @@ in
       az-signal.enable = true;
       az-ssh.enable = true;
       az-telegram.enable = true;
+      az-tmux.enable = true;
       bash = {
         shellAliases = {
           management-server = "mosh ${config.home.username}@10.7.89.150 -- tmux new -A -s 0";
diff --git a/home-manager/profiles/management.nix b/home-manager/profiles/management.nix
index e8dedb6..9c9e89f 100644
--- a/home-manager/profiles/management.nix
+++ b/home-manager/profiles/management.nix
@@ -15,6 +15,7 @@
     az-emacs.enable = true;
     az-open-port.enable = true;
     az-ssh.enable = true;
+    az-tmux.enable = true;
   };
 
 }
diff --git a/home-manager/profiles/work-wsl.nix b/home-manager/profiles/work-wsl.nix
index ae87468..25aa130 100644
--- a/home-manager/profiles/work-wsl.nix
+++ b/home-manager/profiles/work-wsl.nix
@@ -48,6 +48,7 @@
     az-git = {
       userEmail = "zweili@contria.com";
     };
+    az-tmux.enable = true;
     az-vagrant-wsl.enable = true;
     bash = {
       bashrcExtra = ''
diff --git a/modules/default.nix b/modules/default.nix
index 4844463..026eb30 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -18,7 +18,6 @@
     ./programs/restic-management
     ./programs/scripts
     ./programs/steam
-    ./programs/tmux
     ./services/common-x86
     ./services/data-share
     ./services/docker
diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix
index 46180c5..b8246f3 100644
--- a/modules/profiles/desktop/default.nix
+++ b/modules/profiles/desktop/default.nix
@@ -72,7 +72,6 @@ in
       az-idevices.enable = true;
       az-nix-direnv.enable = true;
       az-scripts.enable = true;
-      az-tmux.enable = true;
     };
 
     xdg = {
diff --git a/systems/loki-test/default.nix b/systems/loki-test/default.nix
index 17a6b68..143865e 100644
--- a/systems/loki-test/default.nix
+++ b/systems/loki-test/default.nix
@@ -9,5 +9,4 @@
   };
 
   services.az-docker.enable = true;
-  programs.az-tmux.enable = true;
 }
diff --git a/systems/management/default.nix b/systems/management/default.nix
index 4014545..6cd602f 100644
--- a/systems/management/default.nix
+++ b/systems/management/default.nix
@@ -32,7 +32,6 @@
     az-hunspell.enable = true;
     az-nix-direnv.enable = true;
     az-restic-management.enable = true;
-    az-tmux.enable = true;
   };
 
 }
diff --git a/systems/mobile/default.nix b/systems/mobile/default.nix
index 6bf5d65..ac204c0 100644
--- a/systems/mobile/default.nix
+++ b/systems/mobile/default.nix
@@ -10,6 +10,5 @@
 
   programs = {
     az-nix-direnv.enable = true;
-    az-tmux.enable = true;
   };
 }
diff --git a/systems/staubfinger/default.nix b/systems/staubfinger/default.nix
index 0cbcc5b..30453ef 100644
--- a/systems/staubfinger/default.nix
+++ b/systems/staubfinger/default.nix
@@ -48,7 +48,6 @@
     az-lockscreen.enable = true;
     az-makemkv.enable = true;
     az-restic-management.enable = true;
-    az-tmux.enable = true;
   };
   services = {
     az-docker.enable = true;
diff --git a/systems/test-raspi/default.nix b/systems/test-raspi/default.nix
index 208b7cf..ac278da 100644
--- a/systems/test-raspi/default.nix
+++ b/systems/test-raspi/default.nix
@@ -11,6 +11,5 @@
   services.az-docker.enable = true;
   programs = {
     az-nix-direnv.enable = true;
-    az-tmux.enable = true;
   };
 }