vim: don't shadow '[ '] mappings

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 5a271cb86229d480bb200d30c72ef9faf362d8b7..2817a017e878e5401533e4ff85647096aab149ae 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -20,26 +20,30 @@ Plugin 'derekwyatt/vim-fswitch'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
 Plugin 'junegunn/vim-easy-align'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
 Plugin 'junegunn/vim-easy-align'

-" Plugin 'kien/ctrlp.vim'
-" Plugin 'klen/python-mode'
-Plugin 'wilywampa/python-mode'
+Plugin 'justinmk/vim-sneak'
+Plugin 'klen/python-mode'

 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'

+Plugin 'octol/vim-cpp-enhanced-highlight'

 Plugin 'raimondi/delimitmate'
 Plugin 'raimondi/delimitmate'

-" Plugin 'rking/ag.vim'

 Plugin 'scrooloose/syntastic'
 Plugin 'scrooloose/syntastic'

-Plugin 'shougo/vimproc.vim'

 Plugin 'shougo/unite.vim'
 Plugin 'shougo/unite.vim'

+Plugin 'shougo/vimproc.vim'

 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'

+Plugin 'tpope/vim-abolish'

 Plugin 'tpope/vim-endwise'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-unimpaired'
 Plugin 'valloric/youcompleteme'
 Plugin 'tpope/vim-endwise'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-unimpaired'
 Plugin 'valloric/youcompleteme'

+Plugin 'vim-scripts/replacewithregister'

 Plugin 'vim-scripts/yankring.vim'
 
 Plugin 'vim-scripts/yankring.vim'
 

+" colorschemes
+Plugin 'flazz/vim-colorschemes'
+

 " snippets
 Plugin 'sirver/ultisnips'
 Plugin 'honza/vim-snippets'
 " snippets
 Plugin 'sirver/ultisnips'
 Plugin 'honza/vim-snippets'


@@ -61,15 +65,14 @@ Plugin 'ompugao/ctrlp-ros'
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
 " Plugin 'lokaltog/vim-easymotion'
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
 " Plugin 'lokaltog/vim-easymotion'

-Plugin 'justinmk/vim-sneak'

 Plugin 'chrisbra/checkattach'
 Plugin 'nathanaelkane/vim-indent-guides'
 Plugin 'alx741/vinfo'
 Plugin 'chrisbra/checkattach'
 Plugin 'nathanaelkane/vim-indent-guides'
 Plugin 'alx741/vinfo'

-Plugin 'octol/vim-cpp-enhanced-highlight'

 Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'vim-scripts/mediawiki.vim'

-Plugin 'vim-scripts/replacewithregister'
-Plugin 'tpope/vim-abolish'

 Plugin 'derekwyatt/vim-protodef'
 Plugin 'derekwyatt/vim-protodef'

+Plugin 'rdnetto/ycm-generator'
+" needs editing colorscheme
+" Plugin 'jeaye/color_coded'

 
 " remove entries first
 set runtimepath -=$HOME/.vim
 
 " remove entries first
 set runtimepath -=$HOME/.vim


@@ -84,12 +87,9 @@ filetype plugin indent on
 
 " colorscheme {{{1
 syntax on
 
 " colorscheme {{{1
 syntax on

-colorscheme badwolf
+colorscheme badfox

 
 " options {{{1
 
 " options {{{1

-" put $ and the end of text to be replaced with 'cw' and the likes
-set cpoptions+=$
-

 " moving around, searching and patterns {{{2
 set incsearch           " show match for partly typed search command
 set ignorecase          " ignore case when using a search pattern
 " moving around, searching and patterns {{{2
 set incsearch           " show match for partly typed search command
 set ignorecase          " ignore case when using a search pattern


@@ -257,11 +257,17 @@ set wildignore+=*.luac                           " Lua byte code
 set wildignore+=*.pyc                            " Python byte code
 set wildignore+=*.orig                           " Merge resolution files
 
 set wildignore+=*.pyc                            " Python byte code
 set wildignore+=*.orig                           " Merge resolution files
 

+" running make and jumping to errors {{{2
+set makeprg=make\ -w     " print changing directories
+
+set grepprg=ag\ --vimgrep\ $*
+

 " language specific {{{2
 set isfname-==    " don't treat `=` as being part of filenames
 
 " various {{{2
 " language specific {{{2
 set isfname-==    " don't treat `=` as being part of filenames
 
 " various {{{2

-set virtualedit=all             " let cursor move past last char in <C-V> mode
+set virtualedit+=block     " let cursor move past last char in <C-V> mode
+set virtualedit+=onemore   " allow the cursor to move just past the end of the line

 set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
 
 set viewdir=$XDG_CACHE_HOME/vim/view//
 set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
 
 set viewdir=$XDG_CACHE_HOME/vim/view//


@@ -323,8 +329,8 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 map <space> <leader>
 
 " make
 map <space> <leader>
 
 " make

-nnoremap <leader>r :make<cr>
-nnoremap <leader><cr> :make<cr>
+nnoremap <leader>r :make!<cr>
+nnoremap <leader><cr> :make!<cr>

 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>
 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>


@@ -436,7 +442,9 @@ nnoremap <MiddleMouse> i<MiddleMouse>
 vnoremap <MiddleMouse> s<MiddleMouse>
 
 " fix legacy vi inconsistency
 vnoremap <MiddleMouse> s<MiddleMouse>
 
 " fix legacy vi inconsistency

-map Y y$
+nnoremap Y y$
+" copy to clipboard
+xnoremap Y "+y

 
 " allow repeat operator on visual
 vnoremap . :normal .<CR>
 
 " allow repeat operator on visual
 vnoremap . :normal .<CR>


@@ -459,6 +467,11 @@ for idt in range(1,8)
   exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
 endfor
 
   exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
 endfor
 

+" toggle auto format of text
+nnoremap coa :set <C-R>=&formatoptions =~ "a" ? 'formatoptions-=a' : 'formatoptions+=a'<CR><CR>
+nnoremap [oa :set formatoptions+=a<CR>
+nnoremap ]oa :set formatoptions-=a<CR>
+

 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
 " create folds around visual selection
 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
 " create folds around visual selection


@@ -477,8 +490,10 @@ inoremap <C-C> <Esc>gUiwgi
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
 " commands {{{1
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
 " commands {{{1

-command! Cd lcd %:h
-command! Cr execute('lcd ' . FindGitDirOrHome())
+command! Cd cd %:h
+command! Cr execute('cd ' . FindGitDirOrHome())
+command! LCd lcd %:h
+command! LCr execute('lcd ' . FindGitDirOrHome())

 
 " plugins options {{{1
 " airline {{{2
 
 " plugins options {{{1
 " airline {{{2


@@ -534,6 +549,16 @@ let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"
 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 
 let g:pymode_lint_ignore = "E221,E266,E501"
 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 

+" signature {{{2
+" disable '[ mappings
+
+let g:SignatureMap = {
+  \ 'GotoNextLineAlpha'  :  "",
+  \ 'GotoPrevLineAlpha'  :  "",
+  \ 'GotoNextSpotAlpha'  :  "",
+  \ 'GotoPrevSpotAlpha'  :  "",
+  \ }
+

 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'
 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'


@@ -558,7 +583,9 @@ let g:tagbar_iconchars = ['+', '-']
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")

-let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+if has('fname_case')
+  let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+endif

 let g:UltiSnipsExpandTrigger       = "<tab>"
 let g:UltiSnipsJumpForwardTrigger  = "<tab>"
 let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
 let g:UltiSnipsExpandTrigger       = "<tab>"
 let g:UltiSnipsJumpForwardTrigger  = "<tab>"
 let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"


@@ -604,7 +631,7 @@ if executable('ag')
     let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
     let g:unite_source_grep_recursive_opt = ''
 end
     let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
     let g:unite_source_grep_recursive_opt = ''
 end

-nnoremap <silent> [unite]a :<C-u>Unite grep -input=\12\17<CR>
+nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>

 command! -nargs=1 Ag Unite grep -input=<args>
 
 " unite-file_rec {{{3
 command! -nargs=1 Ag Unite grep -input=<args>
 
 " unite-file_rec {{{3


@@ -648,9 +675,11 @@ let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1
 let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1

+let g:ycm_complete_in_comments = 1
+let g:ycm_complete_in_strings  = 1

 let g:ycm_autoclose_preview_window_after_insertion = 0
 "let g:ycm_extra_conf_vim_data = ['%:p']
 let g:ycm_autoclose_preview_window_after_insertion = 0
 "let g:ycm_extra_conf_vim_data = ['%:p']

-nnoremap <leader>jd :YcmCompleter GoTo<CR>
+nnoremap gd :YcmCompleter GoTo<CR>

 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode