diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index ae2836b..fbe428a 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -75,8 +75,8 @@ bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel bind c new-window -c "#{pane_current_path}" bind e run "tmux split -h /usr/bin/nvim" -bind o display-popup -w 80% -h 80% -E /usr/bin/opencode -bind g display-popup -w 80% -h 80% -E /usr/bin/lazygit +#bind o display-popup -w 80% -h 80% -E /usr/bin/opencode +#bind g display-popup -w 80% -h 80% -E /usr/bin/lazygit # split windows like vim # vim's definition of a horizontal/vertical split is reversed from tmux's @@ -106,6 +106,7 @@ bind P pipe-pane -o "cat >>~/#W.log" \; display "Toggled logging to ~/#W.log" # join pane bind-key C-h choose-window 'join-pane -h -s "%%"' bind-key C-v choose-window 'join-pane -s "%%"' +bind-key C-x break-pane bind -r h select-pane -L bind -r j select-pane -D @@ -141,18 +142,27 @@ set -g status-position top # List of plugins set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' -set -g @plugin 'tmux-plugins/tmux-copycat' -set -g @plugin 'christoomey/vim-tmux-navigator' -set -g @plugin 'sainnhe/tmux-fzf' -set -g @plugin 'joshmedeski/tmux-fzf-url' -set -g @plugin 'aserowy/tmux.nvim' -set -g @plugin 'vieitesss/agent-radar' -source-file ~/.config/tmux/theme +# prefix + ctrl-f - simple file search +# prefix + ctrl-g - jumping over git status files (best used after git status command) +# prefix + alt-h - jumping over SHA-1/SHA-256 hashes (best used after git log command) +# prefix + ctrl-u - url search (http, ftp and git urls) +# prefix + ctrl-d - number search (mnemonic d, as digit) +# prefix + alt-i - ip address search +set -g @plugin 'tmux-plugins/tmux-copycat' + +set -g @plugin 'christoomey/vim-tmux-navigator' +# prefix + F +set -g @plugin 'sainnhe/tmux-fzf' +# prefix + u +set -g @plugin 'joshmedeski/tmux-fzf-url' +# prefix + a +set -g @plugin 'vieitesss/agent-radar' # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run '~/.config/tmux/plugins/tpm/tpm' + +source-file ~/.config/tmux/theme diff --git a/default/themed/tmux.tpl b/default/themed/tmux.tpl index 4deea17..234410d 100644 --- a/default/themed/tmux.tpl +++ b/default/themed/tmux.tpl @@ -25,16 +25,16 @@ set -g @prefix_highlight_fg "${color_highlight_fg}" set -g @prefix_highlight_bg "${color_highlight_bg}" # Status bar settings -set -g status-style "bg=${color_status_bg},fg=${color_status_fg}" +set -g status-style "bg=${color_bg0},fg=${color_fg0}" set -g status "on" set -g status-bg "${color_bg0}" set -g status-justify "left" -set -g status-left-length "100" +#set -g status-left-length "100" set -g status-right-length "100" # Messages -set -g message-style "fg=${color_selected_fg},bg=${color_selected_bg},align=centre" -set -g message-command-style "fg=${color_selected_fg},bg=${color_selected_bg},align=centre" +set -g message-style "fg=${color_selected_fg},bg=${color_selected_bg}" +set -g message-command-style "fg=${color_selected_fg},bg=${color_selected_bg}" # Panes set -g pane-border-style "fg=${pane_border_fg}" @@ -54,9 +54,10 @@ set -g window-status-format "#[fg=${color_highlight_fg},bg=${color_highlight_bg} # Statusline - right side set -g status-right "#[fg=${color_fg1},bg=${color_bg0},nobold,nounderscore,noitalics]%Y-%m-%d %H:%M #[fg=${color_fg0},bg=${color_highlight_fg},nobold,nounderscore,noitalics] #[fg=${color_fg0},bg=${color_bg1}] #(echo '#{pane_current_path}' | rev | cut -d'/' -f-2 | rev) #[fg=${color_fg0},bg=${color_current_fg},nobold,nounderscore,noitalics] #[fg=${color_fg0},bg=${color_bg1}] #S " -# Statusline - left side (empty) -set -g status-left "" - # Modes set -g clock-mode-colour "${color_status_fg}" set -g mode-style "fg=${color_highlight_fg} bg=${color_bg1} bold" + +# Statusline - left side (empty) +set -g status-left "" + diff --git a/installer/tmux.sh b/installer/tmux.sh index 704f3f5..04eb9ec 100755 --- a/installer/tmux.sh +++ b/installer/tmux.sh @@ -7,7 +7,7 @@ fi ${DOTFILES_DIR}/sync-config config/tmux THEME_DIR="${HOME}/.config/omarchy/current/theme" -ln -snf ${THEME_DIR}/current/theme/tmux ${HOME}/.config/tmux/theme +ln -snf ${THEME_DIR}/tmux ${HOME}/.config/tmux/theme # setup tmux if [[ ! -d ~/.config/tmux/plugins/tpm ]]; then