add system clipboard support for vim+tmux

.tmux.conf

@@ -10,8 +10,9 @@ set -s escape-time 50
 setw -g mouse on
 
 # copy selection to X windows clipboard
-set -g set-clipboard on
-bind-key -T copy-mode-vi y send copy-selection-and-cancel\; run "tmux save -|xsel -b > /dev/null 2>&1"
+#set -g set-clipboard off
+bind-key -T copy-mode-vi v send -X begin-selection
+bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -i -sel clip > /dev/null"
 
 ##########################################
 # TERMINAL EMULATOR TITLES

.vimrc

@@ -5,14 +5,21 @@ colorscheme deus
 " don't clutter directories with backup files
 set nobackup
 set nowritebackup
-
 set tabstop=4
 set shiftwidth=4	" set to same as tabstop for auto-indent
+set clipboard=unnamedplus
+
+" folding
 set foldmethod=syntax
-set foldnestmax=2
-set foldlevelstart=99
-set foldcolumn=3
+set foldnestmax=1
+set foldlevelstart=0
+set foldcolumn=2
 set autoindent
+" Don't screw up folds when inserting text that might affect them, until
+" " leaving insert mode. Foldmethod is local to the window. Protect against
+" " screwing up folding when switching between windows.
+ autocmd InsertEnter * if !exists('w:last_fdm') | let w:last_fdm=&foldmethod | setlocal foldmethod=manual | endif
+ autocmd InsertLeave,WinLeave * if exists('w:last_fdm') | let &l:foldmethod=w:last_fdm | unlet w:last_fdm | endif
 
 " filename auto-completion
 set wildmode=longest,list,full