vim: lazyload bundles

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 833e962d530f8228f2f10043dae35f128f658de4..6467ffa3197722ee58c242359c9e80d0b00dae90 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -10,7 +10,7 @@ set runtimepath& " reset rtp
 autocmd!
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 autocmd!
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle

-call vundle#rc('$XDG_DATA_HOME/vim')
+call vundle#begin('$XDG_DATA_HOME/vim')

 
 Plugin 'gmarik/vundle'
 
 
 Plugin 'gmarik/vundle'
 


@@ -19,7 +19,6 @@ Plugin 'bling/vim-airline'
 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'

-Plugin 'flazz/vim-colorschemes'

 Plugin 'junegunn/vim-easy-align'
 Plugin 'justinmk/vim-sneak'
 Plugin 'klen/python-mode'
 Plugin 'junegunn/vim-easy-align'
 Plugin 'justinmk/vim-sneak'
 Plugin 'klen/python-mode'


@@ -42,6 +41,9 @@ Plugin 'valloric/youcompleteme'
 Plugin 'vim-scripts/replacewithregister'
 Plugin 'vim-scripts/yankring.vim'
 
 Plugin 'vim-scripts/replacewithregister'
 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'


@@ -68,6 +70,11 @@ Plugin 'nathanaelkane/vim-indent-guides'
 Plugin 'alx741/vinfo'
 Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'derekwyatt/vim-protodef'
 Plugin 'alx741/vinfo'
 Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'derekwyatt/vim-protodef'

+Plugin 'rdnetto/ycm-generator'
+" needs editing colorscheme
+" Plugin 'jeaye/color_coded'
+
+call vundle#end()

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


@@ -82,7 +89,7 @@ filetype plugin indent on
 
 " colorscheme {{{1
 syntax on
 
 " colorscheme {{{1
 syntax on

-colorscheme badwolf
+colorscheme badfox

 
 " options {{{1
 " moving around, searching and patterns {{{2
 
 " options {{{1
 " moving around, searching and patterns {{{2


@@ -252,14 +259,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
+" running make and jumping to errors {{{2

 set makeprg=make\ -w     " print changing directories
 
 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//


@@ -321,8 +331,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>


@@ -482,8 +492,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


@@ -539,6 +551,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'


@@ -611,7 +633,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


@@ -622,8 +644,8 @@ end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
 
 " unite-buffer {{{3
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
 
 " unite-buffer {{{3

-call unite#custom#default_action('buffer', 'goto')
-nnoremap <silent> [unite]b :<C-u>Unite buffer<CR>
+call unite#custom#default_action('buffer', 'open')
+nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>

 
 " unite-menu {{{3
 let g:unite_source_menu_menus = {}
 
 " unite-menu {{{3
 let g:unite_source_menu_menus = {}