projects
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zsh - fix issue in emacs tramp mode
[dotfiles.git]
/
vim
/
vimrc
diff --git
a/vim/vimrc
b/vim/vimrc
index
f9aa421
..
1dd023a
100644
(file)
--- a/
vim/vimrc
+++ b/
vim/vimrc
@@
-93,7
+93,7
@@
if has("gui_running")
set macmeta "" Macvim only
colorscheme molokai
set guioptions+=c
set macmeta "" Macvim only
colorscheme molokai
set guioptions+=c
- set guifont=S
auce\ Code\ Powerline
\ Light:h11
+ set guifont=S
ource\ Code\ Pro
\ Light:h11
highlight Cursor guifg=white guibg=green
set guicursor=a:blinkon0
set guioptions=eac
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,
" 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
"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 ---------------------------------------------------------------- {{{
"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 --------------------------------------------------------------- {{{
nmap <Leader>N :NERDTreeFind<CR>
" }}}
" AutoClose --------------------------------------------------------------- {{{