X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=tmux%2F.tmux.conf;h=20bec23cc06dda0f4b45b6f50ee8d3d964d0d04d;hb=0aa7f1fb01704411564235b8bea5e01a60e41084;hp=1d414d311af0564ff6d18b5d17ba8b8a7d961101;hpb=819d5b63962cb016bcb5b0bc58bf8bdc00aa147d;p=dotfiles.git

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 1d414d3..20bec23 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -34,19 +34,11 @@ set-window-option -g window-status-last-style "bg=cyan"
 bind-key b set-option status
 unbind-key L
 
-bind-key t display-menu \
-    music t "display-popup -KE -w 100% -R ~/bin/tmux-menu-music.sh" \
-    pass p "display-popup -KE -R ~/bin/tmux-menu-pass-session.sh" \
-    dict d "display-popup -KE -h 100% -R ~/bin/tmux-menu-dict.sh" \
-    calc c "display-popup -KE -R ~/bin/tmux-menu-calc.sh" \
-    cal l "display-popup -R \"cal -3N\"" \
-    top o "display-popup -KE -h 100% -R \"top -s 1\""
-
 bind-key u {
     capture-pane -J
     save-buffer /tmp/tmux-buffer
     delete-buffer
-    display-popup -KE -w 100% -R "urlview /tmp/tmux-buffer"
+    display-popup -E -w 100% "urlview /tmp/tmux-buffer"
 }
 
 bind-key y {
@@ -56,18 +48,24 @@ bind-key y {
     split-window 'vim -c "set listchars=" -c "match ExtraWhitespace //" /tmp/tmux-buffer'
 }
 
-bind-key o {
-    capture-pane -J
-    save-buffer /tmp/tmux-buffer
-    delete-buffer
-    display-popup -KE -w 100% -R "~/bin/tmux-path-extractor.sh"
-    paste-buffer
-    delete-buffer
-}
-
 bind-key Y {
     capture-pane -J -S - -E -
     save-buffer /tmp/tmux-buffer
     delete-buffer
     split-window 'vim -c "set listchars=" -c "match ExtraWhitespace //" /tmp/tmux-buffer'
 }
+
+bind-key t display-menu \
+    music t "display-popup -E -w 100% '~/bin/tmux-menu-music.sh'" \
+    pass p "display-popup -E '~/bin/tmux-menu-pass-session.sh'" \
+    dict d "display-popup -E -h 100% '~/bin/tmux-menu-dict.sh'" \
+    calc c "display-popup -E '~/bin/tmux-menu-calc.sh'" \
+    cal l "display-popup 'cal -3N'" \
+    top o "display-popup -E -h 100% 'top -s 1'"
+
+bind-key o display-menu \
+    find o "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh find '#{pane_current_path}'\"" \
+    buf-files f "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh buf-files '#{pane_current_path}'\"" \
+    git-files g "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh git-files '#{pane_current_path}'\"" \
+    git-branches b "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh git-branches '#{pane_current_path}'\"" \
+    git-commits c "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh git-commits '#{pane_current_path}'\""