X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=tmux%2F.tmux.conf;h=64ba0b59039ae7d60379158d3c04cb783cce392a;hb=0e026879717deecd27b7797736321a6bdce03505;hp=da27feaaa8cff4940d200007d09b330acf541f77;hpb=f3dc6d0d24f814b8aadf7e6b73e3c188e2dfa883;p=dotfiles.git

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index da27fea..64ba0b5 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -5,6 +5,8 @@ set-option -g escape-time 1
 set-option -g repeat-time 0
 set-option -g history-limit 20000
 set-option -g renumber-windows on
+set-option -g terminal-features[0] "screen*:title:clipboard:ccolour:cstyle"
+set-option -gU terminal-features[1]
 
 set-option -g prefix C-a
 unbind-key C-b
@@ -34,19 +36,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,16 +50,26 @@ bind-key y {
     split-window 'vim -c "set listchars=" -c "match ExtraWhitespace //" /tmp/tmux-buffer'
 }
 
-bind-key o display-menu \
-    find d "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.sh find '#{pane_current_path}'\"" \
-    buf-files f "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.sh buf-files '#{pane_current_path}'\"" \
-    git-files g "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.sh git-files '#{pane_current_path}'\"" \
-    git-branches b "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.sh git-branches '#{pane_current_path}'\"" \
-    git-commits c "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.sh git-commits '#{pane_current_path}'\""
-
 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% '~/.tmux/bin/menu-music.sh'" \
+    pass p "display-popup -E '~/.tmux/bin/menu-pass-session.sh'" \
+    dict d "display-popup -E -h 100% '~/.tmux/bin/menu-dict.sh'" \
+    calc c "display-popup -E '~/.tmux/bin/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% \"~/.tmux/bin/fzf.zsh find '#{pane_current_path}'\"" \
+    procs p "display-popup -E -w 100% -h 100% \"~/.tmux/bin/fzf.zsh procs '#{pane_current_path}'\"" \
+    git-files g "display-popup -E -w 100% \"~/.tmux/bin/fzf.zsh git-files '#{pane_current_path}'\"" \
+    git-branches b "display-popup -E -w 100% \"~/.tmux/bin/fzf.zsh git-branches '#{pane_current_path}'\"" \
+    git-commits c "display-popup -E -w 100% \"~/.tmux/bin/fzf.zsh git-commits '#{pane_current_path}'\""
+
+source-file ~/.tmux/rc/select-command-output