X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=vim%2Fvimrc;h=1dd023a41f546d524e971aebcea8afd2a946a062;hb=22f28f7c2a5db5aa66de01e75d614ba18e60642b;hp=f9aa421b2e4b5a3a99b9cdeb2464a147dd46932b;hpb=023f6ced31b85b3b1ccdf6b9cf02b2fd578a3da6;p=dotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index f9aa421..1dd023a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -93,7 +93,7 @@ if has("gui_running")
 	set macmeta  "" Macvim only
 	colorscheme molokai
 	set guioptions+=c
-	set guifont=Sauce\ Code\ Powerline\ Light:h11
+	set guifont=Source\ Code\ Pro\ Light:h11
 	highlight Cursor guifg=white guibg=green
 	set guicursor=a:blinkon0
 	set guioptions=eac
@@ -296,6 +296,11 @@ nnoremap <silent> sr     :FufRenewCache<CR>
 " YouCompleteMe ----------------------------------------------------------- {{{
 "syntax on, must before the YCM,
 
+" Load YouCompleteMe only on OSX
+if !has("osx")
+    let g:loaded_youcompleteme = 1
+endif
+
 "let g:ycm_collect_identifiers_from_tags_files = 1
 let g:ycm_global_ycm_extra_conf = '~/.vim/bundle/YouCompleteMe/third_party/ycmd/cpp/ycm/.ycm_extra_conf.py'
 " this is fix youcompleteme python error
@@ -376,8 +381,9 @@ endfunction
 "endif
 " }}}
 " NerdTree ---------------------------------------------------------------- {{{
-" TODO check if this is already using in plugins
-"nmap <Leader>n	:NERDTreeToggle<CR>
+" Fix keymapping conflict
+nmap <unique> <Leader>, <Plug>MarkClear
+nmap <Leader>n	:NERDTreeToggle<CR>
 nmap <Leader>N	:NERDTreeFind<CR>
 " }}}
 " AutoClose --------------------------------------------------------------- {{{