diff --git a/neovim/default.nix b/neovim/default.nix
index 43a51e0..ec0b648 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -90,6 +90,9 @@
 
         # firenvim
         firenvim
+
+        # tmux
+        vim-tmux-navigator
       ];
 
       withNodeJs = true;
diff --git a/shell/default.nix b/shell/default.nix
index 28ebeb5..0aeb151 100644
--- a/shell/default.nix
+++ b/shell/default.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   home.packages = with pkgs; [
     devenv
     difftastic
@@ -25,6 +24,7 @@
     ./rsync.nix
     ./shell_aliases.nix
     ./starship.nix
+    ./tmux.nix
     ./tree.nix
     ./zoxide.nix
     ./zsh.nix
diff --git a/shell/tmux.nix b/shell/tmux.nix
new file mode 100644
index 0000000..3938742
--- /dev/null
+++ b/shell/tmux.nix
@@ -0,0 +1,28 @@
+{pkgs, ...}: {
+  programs = {
+    tmux = {
+      enable = true;
+      clock24 = true;
+      keyMode = "vi";
+      escapeTime = 0;
+      plugins = with pkgs.tmuxPlugins; [
+        tmux-colors-solarized
+        vim-tmux-navigator
+        {
+          plugin = power-theme;
+          extraConfig = ''
+            set -g @tmux_power_theme "colour4"
+          '';
+        }
+      ];
+      terminal = "xterm-256color";
+      extraConfig = ''
+        # Terminal overrides
+        set-option -sa terminal-overrides ",xterm-256color:Tc"
+
+        # Reload tmux config to ensure theme is applied
+        bind r source-file ~/.config/tmux/tmux.conf \; display-message "Config reloaded!"
+      '';
+    };
+  };
+}