X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/cf5a775d1e2cc46b00f5d16bb52b441396fa16ba..4fd50d9e4fe77fc8bd0d3c2b356b15e4b13757eb:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index e1e5a29..e59de75 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -16,40 +16,55 @@ Plugin 'gmarik/vundle' Plugin 'airblade/vim-gitgutter' Plugin 'bling/vim-airline' +Plugin 'derekwyatt/vim-fswitch' Plugin 'elzr/vim-json' -Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex' +Plugin 'firef0x/pkgbuild.vim' Plugin 'junegunn/vim-easy-align' -Plugin 'kien/ctrlp.vim' +" Plugin 'kien/ctrlp.vim' +" Plugin 'klen/python-mode' +Plugin 'wilywampa/python-mode' Plugin 'kshenoy/vim-signature' Plugin 'majutsushi/tagbar' -Plugin 'rking/ag.vim' +Plugin 'raimondi/delimitmate' +" Plugin 'rking/ag.vim' Plugin 'scrooloose/nerdtree' Plugin 'scrooloose/syntastic' -Plugin 'sirver/ultisnips' +Plugin 'shougo/vimproc.vim' +Plugin 'shougo/unite.vim' Plugin 'sjl/gundo.vim' Plugin 'tomtom/tcomment_vim' +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/yankring.vim' + +" snippets +Plugin 'sirver/ultisnips' +Plugin 'honza/vim-snippets' + +" text objects +Plugin 'kana/vim-textobj-user' +Plugin 'julian/vim-textobj-variable-segment' +Plugin 'sgur/vim-textobj-parameter' +" ros Plugin 'ompugao/ros.vim' Plugin 'ompugao/ctrlp-ros' -Plugin 'firef0x/pkgbuild.vim' -Plugin 'derekwyatt/vim-fswitch' " seems to have problems right now... may be add later? " Plugin 'jalcine/cmake.vim' " Plugin 'powerman/vim-plugin-viewdoc' -" endwise needs to be after delimitmate -Plugin 'raimondi/delimitmate' -Plugin 'tpope/vim-endwise' -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 'klen/python-mode' Plugin 'nathanaelkane/vim-indent-guides' +Plugin 'alx741/vinfo' " remove entries first set runtimepath -=$HOME/.vim @@ -85,7 +100,7 @@ set showbreak=↪ " show these chars for wrapped lines set lazyredraw " don't redraw while executing macros set list " show chars defined in 'listchars' -set listchars=tab:▸\ " list of strings used for list mode +set listchars=tab:❭\ " list of strings used for list mode set listchars+=extends:❯,precedes:❮ " Only shown when not in insert mode augroup trailing @@ -161,7 +176,7 @@ set foldmethod=marker " folding type set foldlevelstart=0 " value for 'foldlevel' when starting to edit a file " save and restore folds -set viewoptions=folds,cursor " don't save local options +set viewoptions=cursor " only save cursor position " diff mode {{{2 set diffopt=filler,vertical @@ -169,19 +184,30 @@ set diffopt=filler,vertical " reading and writing files {{{2 set modeline " read modelines set modelines=2 " only check first/last 2 lines + set writebackup " write a backup file before overwriting a file set backup " keep a backup after owerwriting a file -set backupdir=$XDG_CACHE_HOME/vim// +set backupdir=$XDG_CACHE_HOME/vim/backup// + +set backupskip+=.netrc " skip netrc +set backupskip+=/dev/shm/pass* " skip passwordstore files set undofile " persistent undo history -set undodir=$XDG_CACHE_HOME/vim// +set undodir=$XDG_CACHE_HOME/vim/undo// + +augroup undoskip + au! + au BufWritePre .netrc setlocal noundofile + au BufWritePre /dev/shm/pass* setlocal noundofile + au BufWritePre /tmp/* setlocal noundofile +augroup END set autowrite " automatically write a file when leaving a modified buffer set autoread " automatically read a file that has been modified " the swap file {{{2 set noswapfile -set directory=$XDG_CACHE_HOME/vim// +set directory=$XDG_CACHE_HOME/vim/swap// " command line editing {{{2 set history=5000 " how many command lines are remembered @@ -202,7 +228,7 @@ set wildignore+=*.orig " Merge resolution files set virtualedit=block " let cursor move past last char in mode 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 +set viewdir=$XDG_CACHE_HOME/vim/view// " autocmds {{{1 " Resize splits when the window is resized {{{2 @@ -241,6 +267,7 @@ augroup END map " make +nnoremap r :make nnoremap :make " unhighlight search @@ -250,9 +277,6 @@ nnoremap / :silent nohl nnoremap [ :tabprev nnoremap ] :tabnext -" Wrap -nnoremap W :set wrap! - " paste from selection nnoremap p* :silent! set paste"*p:set nopaste " paste from clipboard @@ -271,15 +295,12 @@ noremap ' ` " Select (charwise) the contents of the current line, excluding indentation. nnoremap vv ^vg_ -" Toggle [i]nvisible characters -nnoremap i :set list! - " Unfuck my screen nnoremap U :syntax sync fromstart:AirlineRefresh:redraw! " Ranger -nnoremap r :silent !ranger %:h:redraw! -nnoremap R :silent !ranger:redraw! +" nnoremap r :silent !ranger %:h:redraw! +" nnoremap R :silent !ranger:redraw! " Use sane regexes. nnoremap / /\v @@ -292,6 +313,8 @@ nmap # :%s:/::gn " center cursor after search and open folds nnoremap n nzzzv nnoremap N Nzzzv +nnoremap ^O ^Ozzzv +nnoremap ^I ^Izzzv " same when jumping around nnoremap g; g;zzzv @@ -335,9 +358,6 @@ cnoremap " close all folds open fold in cursor nnoremap zx zMzxzt -" edit vimrc in new tab -nmap ev :tabedit $MYVIMRC:lcd %:p:h - map :ls:b nnoremap w @@ -360,14 +380,16 @@ noremap O :set pastem`O``:set nopaste " Don't use Ex mode, use Q for formatting map Q gq -" allow undoing in insert-mode -inoremap u +" break undo sequence before removing word inoremap u -nmap b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4 -nmap B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4 -nmap M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4 -nmap m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2 +nnoremap coe :set =&expandtab ? 'noexpandtab' : 'expandtab' +nnoremap [oe :set expandtab +nnoremap ]oe :set noexpandtab + +for idt in range(1,8) + exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'' +endfor " space will toggle current fold in normal mode nnoremap za @@ -380,19 +402,18 @@ autocmd BufWinEnter *.* silent loadview " save with sudo cnoremap w!! w !sudo tee % > /dev/null -" plugins {{{1 -" ag {{{2 -let g:AgSmartCase = 1 -nnoremap ag yiw:Ag " -vnoremap ag y:Ag " +" uppercase previous word +inoremap gUiwgi +" plugins options {{{1 " airline {{{2 -let g:airline_detect_whitespace=2 +let g:airline#extensions#whitespace#enabled = 1 let g:airline#extensions#tabline#enabled = 1 let g:airline_powerline_fonts = 1 " checkattach {{{2 let g:checkattach_filebrowser = 'ranger' +let g:checkattach_once = 'y' " delimitmate {{{2 let delimitMate_expand_cr = 2 @@ -412,7 +433,7 @@ autocmd BufReadPost fugitive://* set bufhidden=delete nnoremap gs :Gstatus nnoremap gd :Gdiff -nnoremap gc :tab Gcommit -v +nnoremap gc :Gcommit -v nnoremap ga :Gwrite nnoremap gb :Gblame @@ -440,6 +461,8 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree let g:pymode_rope_completion = 0 let g:pymode_rope = 0 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 " synastic {{{2 let g:syntastic_enable_highlighting = 0 @@ -462,20 +485,99 @@ let g:tagbar_autoshowtag = 1 let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] -" UltiSnips {{{2 +" ultisnips {{{2 let g:UltiSnipsEditSplit = 'vertical' let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips") let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"] -let g:UltiSnipsExpandTrigger = "" -let g:UltiSnipsJumpForwardTrigger = "" -let g:UltiSnipsJumpBackwardTrigger = "" +let g:UltiSnipsExpandTrigger = "" +let g:UltiSnipsJumpForwardTrigger = "" +let g:UltiSnipsJumpBackwardTrigger = "" + +" UltiSnips completion function that tries to expand a snippet. If there's no +" snippet for expanding, it checks for completion window and if it's shown, +" selects first element. If there's no completion window it tries to jump to +" next placeholder. If there's no placeholder it just returns TAB key +" https://github.com/Valloric/YouCompleteMe/issues/36#issuecomment-15451411 +function! g:UltiSnips_Complete() + call UltiSnips#ExpandSnippet() + if g:ulti_expand_res == 0 + if pumvisible() + return "\" + else + call UltiSnips#JumpForwards() + if g:ulti_jump_forwards_res == 0 + return "\" + endif + endif + endif + return "" +endfunction +au InsertEnter * exec "inoremap " . g:UltiSnipsExpandTrigger . " =g:UltiSnips_Complete()" +let g:UltiSnipsListSnippets="" + +" unite {{{2 +call unite#filters#matcher_default#use(['matcher_fuzzy']) +call unite#custom#profile('default', 'context', { + \ 'winheight': 20, + \ 'direction': 'botright' + \ }) + +nnoremap [unite] +nmap u [unite] + +" unite-grep {{{3 +" seems not respected +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_recursive_opt = '' +end +nnoremap [unite]a :Unite grep -input= + +" unite-file_rec {{{3 +if executable('ag') + " Use ag in unite rec source + let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""' +end +nnoremap [unite]f :Unite -start-insert file_rec/async + +" unite-buffer {{{3 +call unite#custom#default_action('buffer', 'goto') +nnoremap [unite]b :Unite buffer + +" unite-menu {{{3 +let g:unite_source_menu_menus = {} +let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'} +let g:unite_source_menu_menus.fugitive.command_candidates = { + \ 'Gstatus gs' : 'Gstatus', + \ 'Gcommit -v gc' : 'Gcommit -v', + \ 'Glog' : 'Glog', + \} + +nnoremap gg :Unite menu:fugitive + +let g:unite_source_history_yank_enable = 1 +nnoremap [unite]p :Unite history/yank + +" yankring {{{2 +nnoremap p :YRShow +let g:yankring_history_dir = expand('$XDG_CACHE_HOME/vim') +let g:yankring_replace_n_pkey = '' +let g:yankring_replace_n_nkey = '' + +" map Y to y$ for the yank ring +function! YRRunAfterMaps() + nnoremap Y :YRYankCount 'y$' +endfunction " youcompleteme {{{2 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_autoclose_preview_window_after_insertion = 1 +let g:ycm_autoclose_preview_window_after_insertion = 0 "let g:ycm_extra_conf_vim_data = ['%:p'] nnoremap jd :YcmCompleter GoTo @@ -491,6 +593,24 @@ let g:tex_flavor='latex' let g:Tex_DefaultTargetFormat='pdf' let g:Tex_MultipleCompileFormats='pdf' +" vim-sneak {{{2 +let g:sneak#streak = 1 +let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak +let g:sneak#use_ic_scs = 1 " follow 'ignorecase' and 'smartcase' + +" sneaky f and t +nmap f Sneak_f +nmap F Sneak_F +xmap f Sneak_f +xmap F Sneak_F +omap f Sneak_f +omap F Sneak_F +nmap t Sneak_t +nmap T Sneak_T +xmap t Sneak_t +xmap T Sneak_T +omap t Sneak_t +omap T Sneak_T " functions {{{1 @@ -502,6 +622,28 @@ if !exists(":DiffOrig") \ | wincmd p | diffthis endif +" edit configs {{{2 +function! EditConfig(what) + let l:dir = split(&runtimepath,',')[0] + if a:what == 'vimrc' + let l:file = expand($MYVIMRC) + elseif ! isdirectory(globpath(l:dir, a:what)) + echoe a:what." is not valid!" + elseif empty(&filetype) + echoe 'filetype is empty!' + else + let l:file = l:dir.'/'.a:what.'/'.&filetype.'.vim' + endif + + execute ':vsplit '.file + execute ':lcd %:p:h' +endf +nmap ev :call EditConfig('vimrc') +nmap ef :call EditConfig('ftplugin') +nmap es :call EditConfig('syntax') +nmap ei :call EditConfig('indent') +nmap eu :UltiSnipsEdit:lcd %:p:h + " spell check {{{2 " http://tex.stackexchange.com/a/52932 let g:myLangList=["en_gb","en_us","de","fr"] @@ -528,23 +670,6 @@ function! SwitchSpell() echo "setlocal spelllang=" g:myLangList[b:myLang] endfunction -nnoremap s :call ToggleSpell() -nnoremap S :call SwitchSpell() +nnoremap coS :call SwitchSpell() " fix spelling with first choice nnoremap f 1z= - -" Toggle line numbers {{{2 -function! g:ToggleNumber() - if !exists("b:relanum") - let b:relanum=1 - endif - if &l:number - let b:relanum = &relativenumber - setlocal nonumber norelativenumber - else - let &l:relativenumber = b:relanum - setlocal number - endif -endfunction -nnoremap n :call g:ToggleNumber() -nnoremap N :setlocal relativenumber!