diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix
index d2cebe1..cb2dded 100644
--- a/hosts/Dimaga/default.nix
+++ b/hosts/Dimaga/default.nix
@@ -91,8 +91,6 @@ in
     # https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree
     allowUnfree = true;
 
-    apps.tmux.enable = true;
-
     # Enable Secure Boot support.
     bootloader = {
       enable = true;
diff --git a/hosts/Pihole/default.nix b/hosts/Pihole/default.nix
index ddc9768..ca46602 100644
--- a/hosts/Pihole/default.nix
+++ b/hosts/Pihole/default.nix
@@ -15,7 +15,6 @@ in
   networking.hostName = hostName;
 
   aux.system = {
-    apps.tmux.enable = true;
     bootloader.enable = false; # Bootloader configured in hardware-configuration.nix
     packages = with pkgs; [
       libraspberrypi
diff --git a/modules/apps/tmux.nix b/modules/apps/tmux.nix
deleted file mode 100644
index 36442bc..0000000
--- a/modules/apps/tmux.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.aux.system.apps.tmux;
-in
-{
-  options = {
-    aux.system.apps.tmux.enable = lib.mkEnableOption "Enables tmux - terminal multiplexer";
-  };
-
-  config = lib.mkIf cfg.enable {
-    programs.tmux = {
-      enable = true;
-      newSession = true;
-      clock24 = true;
-      extraConfig = ''
-        set -g terminal-overrides 'xterm*:smcup@:rmcup@'
-      '';
-    };
-  };
-}
diff --git a/modules/common.nix b/modules/common.nix
index ae0a910..0a02172 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -16,6 +16,7 @@
       packages = with pkgs; [
         fastfetch # Show a neat system statistics screen when opening a terminal
         nh # Nix Helper: https://github.com/viperML/nh
+        zellij # Terminal multiplexer
       ];
     };