tmux + vim fixes

tmux.conf

@@ -45,7 +45,6 @@ bind-key -r C-k resize-pane -U
 bind-key -r C-h resize-pane -L
 bind-key -r C-l resize-pane -R
 
-
 # Smart pane switching with awareness of vim splits
 is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
 bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
@@ -68,10 +67,13 @@ bind -t vi-copy    C-WheelDownPane halfpage-down
 set -g base-index 1
 setw -g pane-base-index 1
 
+# Disable assume-paste-time, so that iTerm2's "Send Hex Codes" feature works
+# with tmux 2.1. This is backwards-compatible with earlier versions of tmux
+set-option -g assume-paste-time 0
+
 # How long should we show any messages?
 set -g display-time 2000
 
-
 # statusbar colors solarized dark
 set -g status-bg black
 set -g status-fg yellow

vim/config/bundles.vim

@@ -9,6 +9,7 @@ NeoBundle 'Shougo/vimproc.vim', {
     \    }
     \ }
 
+" use the bundled matchit instead of one from github
 NeoBundle 'matchit.zip', {
     \ 'on_map' : ['%', 'g%']
     \ }
@@ -40,7 +41,10 @@ NeoBundle 'tpope/vim-repeat'
 NeoBundle 'tpope/vim-surround'
 NeoBundle 'tpope/vim-unimpaired'
 NeoBundle 'tpope/vim-vinegar'
-NeoBundle 'matchit.zip'
 NeoBundle 'webgefrickel/vim-snippets'
 NeoBundle 'wellle/tmux-complete.vim'
 
+" TODO, remove when fixed with newer macvim version
+" use an old version of netrw, fixes split bug
+NeoBundle 'vim-scripts/netrw.vim'
+

vim/config/gui.vim

@@ -3,7 +3,7 @@
 
 if has('gui_running')
   set guifont=Hack:h12 " a nice font here
-  set linespace=-2     " hack is nice, but very wide...
+  set linespace=0     " hack is nice, but very wide...
   set guioptions-=T    " no toolbar
   set guioptions-=L    " no left scrollbar
   set guioptions-=r    " no right scrollbar

vim/config/plugins/sneak.vim

@@ -1,10 +1,10 @@
 " Vim sneak
 "======================================================================
 
-let g:sneak#use_ic_scs = 1
-let g:sneak#map_netrw = 0
-let g:sneak#streak = 1
-nmap <Bslash> <Plug>SneakNext
-nmap \| <Plug>SneakPrevious
-xmap <Bslash> <Plug>VSneakNext
-xmap \| <Plug>VSneakPrevious
+" let g:sneak#use_ic_scs = 1
+" let g:sneak#map_netrw = 0
+" let g:sneak#streak = 1
+" nmap <Bslash> <Plug>SneakNext
+" nmap \| <Plug>SneakPrevious
+" xmap <Bslash> <Plug>VSneakNext
+" xmap \| <Plug>VSneakPrevious

vim/config/plugins/syntastic.vim

@@ -5,7 +5,7 @@
 " and no checking for scss.css because of CSS3 and SASS-Variable
 let g:syntastic_auto_jump = 0
 let g:syntastic_scss_scss_lint_exec = '/Users/webgefrickel/.rbenv/shims/scss-lint'
-let g:syntastic_scss_checkers = ['scss_lint']
+let g:syntastic_scss_checkers = ['scss-lint']
 let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_json_checkers = ['jsonlint']
 let g:syntastic_mode_map = {

vim/config/tmux.vim

@@ -1,10 +0,0 @@
-" mac terminal-vim play nicely with tmux
-"======================================================================
-
-if &term =~ '^screen'
-  " tmux will send xterm-style keys when its xterm-keys option is on
-  execute "set <xUp>=\e[1;*A"
-  execute "set <xDown>=\e[1;*B"
-  execute "set <xRight>=\e[1;*C"
-  execute "set <xLeft>=\e[1;*D"
-endif

vimrc

@@ -24,7 +24,6 @@ source ~/.vim/config/search.vim
 source ~/.vim/config/whitespace.vim
 source ~/.vim/config/autocommands.vim
 source ~/.vim/config/gui.vim
-source ~/.vim/config/tmux.vim
 source ~/.vim/config/colorscheme.vim
 source ~/.vim/config/keymappings.vim
 source ~/.vim/config/leaderkeys.vim