various nvim/tmux updates

* make sure diffs open vertically in vim
* update tmux theme
* allow tmux to change the title of the terminal
* add .nvim/shada to gitignore ?
This commit is contained in:
Nick Nisi
2015-10-25 13:21:33 -05:00
parent 6e879a7186
commit a585e0caf6
4 changed files with 12 additions and 8 deletions

View File

@@ -111,6 +111,8 @@ set clipboard=unnamed
" faster redrawing
set ttyfast
set diffopt+=vertical
" highlight conflicts
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'