X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=tmux%2F.tmux.conf;h=ed4e3ed9cab15261d7d11cdce7814061ae09f5c6;hb=f7cf80842562ed21fac059a3e1c6d489ac02bc0f;hp=00387b33fcbd9d7c10f9dc4c01c830d8296e138b;hpb=fc2427a0523a27eb31ca2d2ff7f32da82bb31734;p=dotfiles.git

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 00387b3..ed4e3ed 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
@@ -13,9 +15,11 @@ bind-key C-a send-prefix
 bind-key -n C-PgUp previous-window
 bind-key -n C-PgDn next-window
 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>"
@@ -24,13 +28,45 @@ set-option -g status-justify centre
 
 set-window-option -g automatic-rename on
 set-window-option -g window-status-format "#I:#W:#T#F"
-set-window-option -g window-status-bg green
-set-window-option -g window-status-fg black
+set-window-option -g window-status-style "bg=green fg=black"
 set-window-option -g window-status-current-format "#I:#W#F"
-set-window-option -g window-status-current-bg red
-set-window-option -g window-status-last-bg cyan
+set-window-option -g window-status-current-style "bg=red"
+set-window-option -g window-status-last-style "bg=cyan"
 
-bind-key u capture-pane -J \; save-buffer /tmp/tmux-buffer \; split-window 'urlview /tmp/tmux-buffer' \; delete-buffer
-bind-key y capture-pane -J \; save-buffer /tmp/tmux-buffer \; split-window 'vim /tmp/tmux-buffer' \; delete-buffer
 bind-key b set-option status
 unbind-key L
+
+bind-key u {
+    capture-pane -J
+    save-buffer /tmp/tmux-buffer
+    delete-buffer
+    display-popup -E -w 100% "urlview /tmp/tmux-buffer"
+}
+
+bind-key y {
+    capture-pane -J
+    save-buffer /tmp/tmux-buffer
+    delete-buffer
+    split-window 'vim -c "set listchars=" -c "match ExtraWhitespace //" /tmp/tmux-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% '~/.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}'\"" \
+    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}'\""