X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=blobdiff_plain;f=tmux%2F.tmux.conf;h=a3b7c072404a60a3cc224bddef7108d4a4c24868;hp=cc8037a223ecbebcca53617fabd6c273e4eccea4;hb=48338303d760027e62bab963fa11a940bc0d97eb;hpb=0ed71c021aa9204b43b1189a38f37e833dfa3dd6

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index cc8037a..a3b7c07 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -17,6 +17,7 @@ bind-key -n S-PgUp copy-mode -u
 bind '"' split-window -c "#{pane_current_path}"
 bind % split-window -h -c "#{pane_current_path}"
 bind c new-window -c "#{pane_current_path}"
+bind ] paste-buffer -p
 
 set-option -g status-style "bg=black,fg=white"
 set-option -g status-left "#S>"
@@ -45,7 +46,7 @@ bind-key u {
     capture-pane -J
     save-buffer /tmp/tmux-buffer
     delete-buffer
-    display-popup -EK -w 100% -R "urlview /tmp/tmux-buffer"
+    display-popup -KE -w 100% -R "urlview /tmp/tmux-buffer"
 }
 
 bind-key y {
@@ -55,6 +56,13 @@ bind-key y {
     split-window 'vim -c "set listchars=" -c "match ExtraWhitespace //" /tmp/tmux-buffer'
 }
 
+bind-key o display-menu \
+    find o "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh find '#{pane_current_path}'\"" \
+    buf-files f "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh buf-files '#{pane_current_path}'\"" \
+    git-files g "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh git-files '#{pane_current_path}'\"" \
+    git-branches b "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh git-branches '#{pane_current_path}'\"" \
+    git-commits c "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh git-commits '#{pane_current_path}'\""
+
 bind-key Y {
     capture-pane -J -S - -E -
     save-buffer /tmp/tmux-buffer