diff --git a/home/base/shell/default.nix b/home/base/shell/default.nix
index 768e9b0..2d4d1eb 100644
--- a/home/base/shell/default.nix
+++ b/home/base/shell/default.nix
@@ -6,6 +6,7 @@
     ./starship.nix 
     ./zoxide.nix 
     ./direnv.nix 
+    ./tmux.nix
     ./zellij.nix
   ];
 }
diff --git a/home/base/shell/tmux.nix b/home/base/shell/tmux.nix
new file mode 100644
index 0000000..3c78387
--- /dev/null
+++ b/home/base/shell/tmux.nix
@@ -0,0 +1,46 @@
+{ pkgs, ... }:
+
+{
+  programs.tmux = {
+    enable = true;
+    prefix = "C-space";
+    escapeTime = 10;
+    clock24 = true;
+    keyMode = "vi";
+    mouse =  true;
+    baseIndex = 1;
+    extraConfig = ''
+      set-option -a terminal-features "''${TERM}:RGB"
+    '';
+    plugins = with pkgs; [
+      {
+        plugin = tmuxPlugins.catppuccin;
+        extraConfig = ''
+          set -g @catppuccin_window_left_separator ""
+          set -g @catppuccin_window_right_separator " "
+          set -g @catppuccin_window_middle_separator " █"
+          set -g @catppuccin_window_number_position "right"
+
+          set -g @catppuccin_window_default_fill "number"
+          set -g @catppuccin_window_default_text "#W"
+
+          set -g @catppuccin_window_current_fill "number"
+          set -g @catppuccin_window_current_text "#W"
+
+          set -g @catppuccin_status_modules_right "directory user host session"
+          set -g @catppuccin_status_left_separator  " "
+          set -g @catppuccin_status_right_separator ""
+          set -g @catppuccin_status_fill "icon"
+          set -g @catppuccin_status_connect_separator "no"
+
+          set -g @catppuccin_directory_text "#{pane_current_path}"
+
+          set -g @catppuccin_flavor 'frappe'
+        '';
+      }
+      tmuxPlugins.vim-tmux-navigator
+      tmuxPlugins.yank
+    ];
+  };
+  programs.fzf.tmux.enableShellIntegration = true;
+}
diff --git a/home/base/shell/zellij.nix b/home/base/shell/zellij.nix
index db40218..dbb7d52 100644
--- a/home/base/shell/zellij.nix
+++ b/home/base/shell/zellij.nix
@@ -3,6 +3,5 @@
 {
   programs.zellij = {
     enable = true;
-    enableFishIntegration = true;
   };
 }