diff --git a/.tmux.conf b/.tmux.conf index 104dd19..cb2aa7d 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -100,6 +100,14 @@ bind -r - resize-pane -D 3 bind -r + resize-pane -U 3 bind -r = resize-pane -U 3 +## fzf-git + +# C-b will always switch to the prefix table, so use g for branches +bind -Tfzf-git C-f send-keys C-g f +bind -Tfzf-git C-h send-keys C-g h +bind -Tfzf-git C-h send-keys C-g h +bind -Troot C-g switch-client -Tfzf-git + bind C-y run-shell -b ~/.dotfiles/bin/,tmux-copy bind r source-file ~/.tmux.conf \; display 'Reloaded tmux.conf' diff --git a/.zshrc b/.zshrc index f88220b..30d4b10 100644 --- a/.zshrc +++ b/.zshrc @@ -124,12 +124,6 @@ bindkey " " magic-space if (( $+commands[fzf] )); then z4h source ${HOMEBREW_PREFIX:+$HOMEBREW_PREFIX/opt/fzf/shell/key-bindings.zsh} - # Not sure how to do key sequences w/`z4h bindkey` - bindkey '^gg' fzf-git-branches-widget - - # ^gl doesn't work in tmux, but I need reflogs more than remotes probably? - bindkey '^gr' fzf-git-lreflogs-widget - # https://github.com/junegunn/fzf/issues/164#issuecomment-581837757 z4h bindkey fzf-cd-widget รง