vim - only load youcompleteme on osx

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 2c1cdfb..1dd023a 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -13,7 +13,8 @@ Bundle 'vim-scripts/FuzzyFinder'
 Bundle 'vim-scripts/L9'
 Bundle 'Valloric/YouCompleteMe'
 Bundle 'octol/vim-cpp-enhanced-highlight'
-Bundle 'bling/vim-airline'
+Bundle 'vim-airline/vim-airline'
+Bundle 'vim-airline/vim-airline-themes'
 Bundle 'payneseu/nerdtree'
 Bundle 'Townk/vim-autoclose'
 Bundle 'majutsushi/tagbar'
@@ -92,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
@@ -166,7 +167,8 @@ nnoremap \e\19 :tabprevious<CR>
 "nmap <A-SPACE>        :b#<CR>
 "nmap <Leader>d        :bd<CR>
 "" keymappig for register operations
-nnoremap <Leader>r     :registers<CR>
+""TODO check if this already mapping
+"nnoremap <Leader>r    :registers<CR>
 "noremap <Leader>x     :<C-p>
 nnoremap <Leader>a :
 
@@ -294,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
@@ -374,6 +381,8 @@ endfunction
 "endif
 " }}}
 " NerdTree ---------------------------------------------------------------- {{{
+" Fix keymapping conflict
+nmap <unique> <Leader>, <Plug>MarkClear
 nmap <Leader>n :NERDTreeToggle<CR>
 nmap <Leader>N :NERDTreeFind<CR>
 " }}}