From 9582308af9e3c53887911dfddfdfd31bd6defdf9 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandl@softwareparadies.de>
Date: Tue, 28 May 2019 17:15:39 +0200
Subject: [PATCH] Added traces and vim-tmux-navigator

---
 tmux/tmux.conf | 22 +++++++++++++++++++++-
 vim/vimrc      |  3 +++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 0a9b061..98f4631 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,5 +1,25 @@
 set-window-option -g mode-keys vi
-set -g default-terminal "screen-256color"
+set -g default-terminal "tmux-256color"
+set -g terminal-overrides ',xterm-256color:Tc'
+
+# Smart pane switching with awareness of Vim splits.
+# See: https://github.com/christoomey/vim-tmux-navigator
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
+    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+
+is_fzf="ps -o state= -o comm= -t '#{pane_tty}' \
+  | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?fzf$'"
+
+bind-key -n C-h run "($is_vim && tmux send-keys C-h) || tmux select-pane -L"
+bind-key -n C-j run "($is_vim && tmux send-keys C-j) || ($is_fzf && tmux send-keys C-j) || tmux select-pane -D"
+bind-key -n C-k run "($is_vim && tmux send-keys C-k) || ($is_fzf && tmux send-keys C-k) || tmux select-pane -U"
+bind-key -n C-l run "($is_vim && tmux send-keys C-l) || tmux select-pane -R"
+bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
+bind-key -T copy-mode-vi C-h select-pane -L
+bind-key -T copy-mode-vi C-j select-pane -D
+bind-key -T copy-mode-vi C-k select-pane -U
+bind-key -T copy-mode-vi C-l select-pane -R
+bind-key -T copy-mode-vi C-\ select-pane -l
 
 # List of plugins
 # Install TPM with
diff --git a/vim/vimrc b/vim/vimrc
index 9c9e126..fefa648 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -35,6 +35,8 @@ Plug 'tpope/vim-fugitive'
 Plug 'linuor/ucmake.vim'
 Plug 'skywind3000/asyncrun.vim'
 Plug 'mileszs/ack.vim'
+Plug 'markonm/traces.vim'
+Plug 'christoomey/vim-tmux-navigator'
 
 call plug#end()
 
@@ -63,6 +65,7 @@ let g:autotagmaxTagsFileSize = 1024 * 1024 * 128
 
 " deoplete
 let g:deoplete#enable_at_startup = 1
+autocmd CompleteDone * silent! pclose!
 call deoplete#custom#source('_', 'matchers', ['matcher_full_fuzzy'])
 inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
 inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"