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

diff --git a/vim/vimrc b/vim/vimrc
index f9aa421..dafbea7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -39,6 +39,7 @@ Bundle 'MattesGroeger/vim-bookmarks'
 "Bundle 'kien/ctrlp.vim'
 "disable since some conflicting mapping
 Bundle 'vim-latex/vim-latex'
+Plugin 'vimperator/vimperator.vim'
 
 call vundle#end()
 filetype plugin indent on
@@ -83,6 +84,7 @@ set confirm
 set nostartofline   " don't jump to first character when paging
 set wrap
 set expandtab
+set backspace=indent,eol,start
 "set textwidth, formatoptions for chinese
 set formatoptions+=m
 set colorcolumn=+1
@@ -93,7 +95,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
@@ -118,6 +120,8 @@ endif
 " Mappings ---------------------------------------------------------------- {{{
 let mapleader = ";"
 map Q gq
+nnoremap Q <Nop>
+nnoremap gq <Nop>
 " Normal mode ------------------------------------------------------------- {{{
 nnoremap Y	y$
 nnoremap ' `
@@ -198,8 +202,9 @@ inoremap <C-U> <C-G>u<C-U>
 inoremap <C-a>	<Home>
 inoremap <C-e>	<End>
 inoremap <C-D>	<Del>
-inoremap <C-b>	<S-Left>
-inoremap <C-f>	<S-Right>
+inoremap <C-b>	<Left>
+inoremap <C-f>	<Right>
+inoremap <C-/> <Esc>ui
 imap <A-d>	<S-Right><C-w>
 " }}}
 " Command mode ------------------------------------------------------- {{{
@@ -296,12 +301,17 @@ 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
 "http://www.cnblogs.com/clivelee/p/4266559.html
 "https://github.com/Valloric/YouCompleteMe/issues/18
-let g:ycm_path_to_python_interpreter= '/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python'
+"let g:ycm_path_to_python_interpreter= '/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python'
 let g:ycm_auto_trigger = 1
 let g:ycm_seed_identifiers_with_syntax = 1
 let g:ycm_show_diagnostics_ui = 0
@@ -376,8 +386,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 --------------------------------------------------------------- {{{