X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/d05cd755a23b4e6ecfd417d5d5da5b146c3ab7b9..37be67a9b70096ac75448ef8a397197c8c13ae60:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 833e962..2ef5689 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -10,16 +10,16 @@ set runtimepath& " reset rtp 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 'airblade/vim-gitgutter' Plugin 'bling/vim-airline' +Plugin 'chrisbra/checkattach' 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' @@ -27,6 +27,7 @@ Plugin 'kshenoy/vim-signature' Plugin 'majutsushi/tagbar' Plugin 'octol/vim-cpp-enhanced-highlight' Plugin 'raimondi/delimitmate' +Plugin 'rdnetto/ycm-generator' Plugin 'scrooloose/syntastic' Plugin 'shougo/unite.vim' Plugin 'shougo/vimproc.vim' @@ -42,6 +43,9 @@ Plugin 'valloric/youcompleteme' Plugin 'vim-scripts/replacewithregister' Plugin 'vim-scripts/yankring.vim' +" colorschemes +Plugin 'flazz/vim-colorschemes' + " snippets Plugin 'sirver/ultisnips' Plugin 'honza/vim-snippets' @@ -55,19 +59,18 @@ Plugin 'sgur/vim-textobj-parameter' Plugin 'ompugao/ros.vim' Plugin 'ompugao/ctrlp-ros' -" seems to have problems right now... may be add later? -" Plugin 'jalcine/cmake.vim' -" Plugin 'powerman/vim-plugin-viewdoc' - " staging " find an alternative (latex-box? Automatic Latex Plugin?) -Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex' -" Plugin 'lokaltog/vim-easymotion' -Plugin 'chrisbra/checkattach' +Plugin 'vim-latex/vim-latex' Plugin 'nathanaelkane/vim-indent-guides' Plugin 'alx741/vinfo' Plugin 'vim-scripts/mediawiki.vim' Plugin 'derekwyatt/vim-protodef' +" needs editing colorscheme +" Plugin 'jeaye/color_coded' +" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp + +call vundle#end() " remove entries first set runtimepath -=$HOME/.vim @@ -82,7 +85,7 @@ filetype plugin indent on " colorscheme {{{1 syntax on -colorscheme badwolf +colorscheme badfox " options {{{1 " moving around, searching and patterns {{{2 @@ -206,7 +209,6 @@ set viewoptions=cursor " only save cursor position " diff mode {{{2 set diffopt+=filler " show filler lines set diffopt+=vertical " always vertical split -set diffopt+=iwhite " ignore white space set diffopt+=context:10 " 10 lines context between changes " reading and writing files {{{2 @@ -241,6 +243,7 @@ set directory=$XDG_CACHE_HOME/vim/swap// set history=5000 " how many command lines are remembered set wildmenu " command-line completion shows a list of matches set wildmode=longest:full,full " specifies how command line completion works +set wildignorecase " ignore case when completing file names set wildignore+=.hg,.git,.svn " Version control set wildignore+=*.aux,*.out,*.toc " LaTeX intermediate files @@ -252,14 +255,17 @@ set wildignore+=*.luac " Lua byte code 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 grepprg=ag\ --vimgrep\ $* + " 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 mode +set virtualedit+=block " let cursor move past last char in 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// @@ -321,8 +327,8 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | map " make -nnoremap r :make -nnoremap :make +nnoremap r :make! +nnoremap :make! " unhighlight search nnoremap / :silent nohl @@ -340,7 +346,7 @@ nnoremap p+ :silent! set paste"+p:set nopaste function! StripWhitespace(line1, line2, ...) " {{{2 let s_report = &report let &report=0 - let pattern = a:0 ? a:1 : '[\\]\@ :ls:b +" move between windows nnoremap w nnoremap W @@ -481,10 +488,6 @@ inoremap gUiwgi " http://git.io/v3ZeU nmap qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" -" commands {{{1 -command! Cd lcd %:h -command! Cr execute('lcd ' . FindGitDirOrHome()) - " plugins options {{{1 " airline {{{2 let g:airline#extensions#whitespace#enabled = 1 @@ -531,14 +534,34 @@ nmap cog IndentGuidesToggle nmap [og IndentGuidesEnable nmap ]og IndentGuidesDisable +" close-another-window {{{2 +nnoremap c +nnoremap cc c +nnoremap ch :CloseLeftWindow +nnoremap cl :CloseRightWindow +nnoremap cj :CloseBelowWindow +nnoremap ck :CloseAboveWindow + " python-mode {{{2 let g:pymode_rope_completion = 0 let g:pymode_rope = 0 +let g:pymode_run = 0 let g:pymode_folding = 1 let g:pymode_lint_ignore = "E221,E266,E501" +let g:pymode_lint_cwindow = 0 " don't open cwindow when linting 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' @@ -608,11 +631,11 @@ let g:unite_source_grep_max_candidates = 2000 if executable('ag') " Use ag in unite grep source. let g:unite_source_grep_command = '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_default_opts = '--smart-case --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' let g:unite_source_grep_recursive_opt = '' end -nnoremap [unite]a :Unite grep -input= -command! -nargs=1 Ag Unite grep -input= +nnoremap [unite]a :Unite grep:.:: +command! -nargs=1 Ag Unite grep:.:: " unite-file_rec {{{3 if executable('ag') @@ -620,10 +643,11 @@ if executable('ag') let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""' end nnoremap [unite]f :Unite -start-insert file_rec/async +call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta') " unite-buffer {{{3 -call unite#custom#default_action('buffer', 'goto') -nnoremap [unite]b :Unite buffer +call unite#custom#default_action('buffer', 'open') +nnoremap [unite]b :Unite buffer:- " unite-menu {{{3 let g:unite_source_menu_menus = {} @@ -659,7 +683,6 @@ 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'] -nnoremap gd :YcmCompleter GoTo " vim-easy-align {{{2 " start interactive EasyAlign in visual mode @@ -703,6 +726,13 @@ if !exists(":DiffOrig") \ | wincmd p | diffthis endif +" sort operator {{{2 +function! SortLinesOpFunc(...) + '[,']sort +endfunction +nnoremap gs :set operatorfunc=SortLinesOpFuncg@ +vnoremap gs :sort + " edit configs {{{2 function! EditConfig(what) let l:dir = split(&runtimepath,',')[0] @@ -772,5 +802,9 @@ function! FindGitDirOrHome() return '~' endif endfunction +command! Cd cd %:h +command! Cr execute('cd ' . FindGitDirOrHome()) +command! LCd lcd %:h +command! LCr execute('lcd ' . FindGitDirOrHome()) " vim:set et sw=2 ts=2 tw=78: