diff --git a/home-manager/common/programs/core.nix b/home-manager/common/programs/core.nix
index 82f7a23..c3c1c93 100644
--- a/home-manager/common/programs/core.nix
+++ b/home-manager/common/programs/core.nix
@@ -26,18 +26,17 @@ with lib; {
       programs.tmux = {
         enable = true;
         aggressiveResize = true;
-        extraConfig = if pkgs.stdenv.isLinux then ''
-          set -g default-terminal "tmux-256color"
+        keyMode = "vi";
+        shortcut = "x";
+        terminal =
+          if pkgs.stdenv.isLinux then "tmux-256color" else "screen-256color";
+        escapeTime = 100;
+        plugins = with pkgs; [ tmuxPlugins.cpu tmuxPlugins.jump ];
+        extraConfig = ''
           set -ag terminal-overrides ",xterm-256color:RGB"
           set-option -g status-interval 1
           set-option -g automatic-rename on
-          set-option -g automatic-rename-format '#{pane_current_path}: #{pane_current_command}'
-        '' else ''
-          set -g default-terminal "screen-256color"
-          set -ag terminal-overrides ",xterm-256color:RGB"
-          set-option -g status-interval 1
-          set-option -g automatic-rename on
-          set-option -g automatic-rename-format '#{pane_current_path}: #{pane_current_command}'
+          set-option -g automatic-rename-format '#{b:pane_current_path}: #{pane_current_command}'
         '';
       };
       # Configure btop