diff --git a/matugen/files/templates/tmux-colors.conf b/matugen/files/templates/tmux-colors.conf index 0d3226a..d1cee82 100644 --- a/matugen/files/templates/tmux-colors.conf +++ b/matugen/files/templates/tmux-colors.conf @@ -57,7 +57,7 @@ SHADOW={{colors.shadow.default.hex}} set -g status-style "bg={{colors.surface.default.hex}},fg={{colors.on_surface.default.hex}}" set -g status-left "#[fg={{colors.on_primary.default.hex}},bg={{colors.primary.default.hex}},bold] #S #[default] " -# Smart status-right: changes based on mode +# Status bar right side - date and time set -g status-right "#[fg={{colors.on_surface_variant.default.hex}}]%Y-%m-%d #[fg={{colors.on_surface.default.hex}}]%H:%M #[default]" # Window status format @@ -70,9 +70,9 @@ set -g status-justify left set -g pane-border-style "fg={{colors.outline_variant.default.hex}}" set -g pane-active-border-style "fg={{colors.primary.default.hex}}" -# Message styling (for confirm dialogs like kill-pane) -set -g message-style "fg={{colors.on_primary.default.hex}},bg={{colors.primary_container.default.hex}},bold" -set -g message-command-style "fg={{colors.on_secondary.default.hex}},bg={{colors.secondary_container.default.hex}}" +# Message styling (for confirm dialogs like kill-pane) - use high contrast +set -g message-style "fg={{colors.on_surface.default.hex}},bg={{colors.primary.default.hex}},bold" +set -g message-command-style "fg={{colors.on_surface.default.hex}},bg={{colors.secondary.default.hex}}" # Mode styling (copy mode, etc.) set -g mode-style "fg={{colors.on_tertiary.default.hex}},bg={{colors.tertiary_container.default.hex}}" diff --git a/tmux/files/tmux.conf b/tmux/files/tmux.conf index d51333b..9ca0a43 100644 --- a/tmux/files/tmux.conf +++ b/tmux/files/tmux.conf @@ -93,7 +93,7 @@ bind -n M-Up select-pane -U bind -n M-Right select-pane -R # Resize panes - Ctrl+R then arrows (no prefix needed) -bind -n C-r switch-client -T resize-pane \; display-message -d 5000 "RESIZE MODE: arrows to resize, ESC/Enter to exit" +bind -n C-r switch-client -T resize-pane bind -T resize-pane Left resize-pane -L 5 \; switch-client -T resize-pane bind -T resize-pane Right resize-pane -R 5 \; switch-client -T resize-pane bind -T resize-pane Up resize-pane -U 5 \; switch-client -T resize-pane @@ -116,7 +116,7 @@ bind > swap-pane -D bind < swap-pane -U # Move panes around - Ctrl+E then arrows (no prefix needed, stays in mode) -bind -n C-e switch-client -T move-pane \; display-message -d 5000 "MOVE MODE: arrows to move pane, ESC/Enter to exit" +bind -n C-e switch-client -T move-pane bind -T move-pane Left swap-pane -s '{left-of}' \; switch-client -T move-pane bind -T move-pane Right swap-pane -s '{right-of}' \; switch-client -T move-pane bind -T move-pane Up swap-pane -s '{up-of}' \; switch-client -T move-pane @@ -154,7 +154,7 @@ bind + select-layout even-vertical bind t run-shell "tmux list-windows -F '#{window_layout}' | head -1 | grep -q 'even-horizontal' && tmux select-layout even-vertical || tmux select-layout even-horizontal" # Other layouts - Ctrl+L then h/v (no prefix) -bind -n C-l switch-client -T layout \; display-message -d 5000 "LAYOUT MODE: h=horizontal v=vertical ESC/Enter=back" +bind -n C-l switch-client -T layout bind -T layout h select-layout main-horizontal \; switch-client -T root bind -T layout v select-layout main-vertical \; switch-client -T root @@ -215,22 +215,13 @@ set -g status-right-length 100 # ----------------------------------------- # Single Status Bar at Bottom # ----------------------------------------- -set -g status 1 +set -g status on set -g status-position bottom set -g status-interval 1 set -g status-left-length 40 set -g status-right-length 150 -# Help toggle (Ctrl+H) - uses run-shell to toggle help display -bind -n C-h run-shell ' - if [ "$(tmux show -gqv @help_visible)" = "1" ]; then - tmux set -g @help_visible 0 - tmux source ~/.config/tmux/colors.conf - else - tmux set -g @help_visible 1 - tmux set -g status-right "#[bg=#014b71,fg=#cbe6ff,bold] ALT=nav ^E=move ^R=resize ^L=layout |/-=split ^S=prefix #[default]" - fi -' + # ----------------------------------------- # Other Useful Bindings