Plugin 'gmarik/vundle'
+Plugin 'airblade/vim-gitgutter'
Plugin 'bling/vim-airline'
Plugin 'elzr/vim-json'
-Plugin 'rking/ag.vim'
Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
+Plugin 'junegunn/vim-easy-align'
Plugin 'kien/ctrlp.vim'
Plugin 'kshenoy/vim-signature'
Plugin 'majutsushi/tagbar'
+Plugin 'rking/ag.vim'
Plugin 'scrooloose/nerdtree'
Plugin 'scrooloose/syntastic'
+Plugin 'sirver/ultisnips'
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 'jalcine/cmake.vim'
" Plugin 'powerman/vim-plugin-viewdoc'
-Plugin 'airblade/vim-gitgutter'
-Plugin 'Raimondi/delimitMate'
-Plugin 'SirVer/ultisnips'
-Plugin 'Lokaltog/vim-easymotion'
+" endwise needs to be after delimitmate
+Plugin 'raimondi/delimitmate'
+Plugin 'tpope/vim-endwise'
+Plugin 'lokaltog/vim-easymotion'
+Plugin 'chrisbra/checkattach'
+Plugin 'klen/python-mode'
+Plugin 'nathanaelkane/vim-indent-guides'
+Plugin 'vim-scripts/yankring.vim'
" remove entries first
set runtimepath -=$HOME/.vim
" 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
set virtualedit=block " let cursor move past last char in <C-V> 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
\ endif
augroup END
-" auto source vimrc when saved {{{2
-augroup source_vimrc
- au!
- autocmd bufwritepost vimrc source $MYVIMRC
-augroup END
-
" bindings {{{1
" allow both <space> and / to be <leader>
cnoremap <c-e> <end>
" proper movement when lines are wrapped
-noremap j gj
-noremap k gk
+noremap <expr> j (v:count == 0 ? 'gj' : 'j')
+noremap <expr> k (v:count == 0 ? 'gk' : 'k')
" disable arrows
noremap <Up> <NOP>
cnoremap <C-L> <Right>
" close all folds open fold in cursor
-nnoremap zx zMzxzz15<C-e>
+nnoremap zx zMzxzt
" edit vimrc in new tab
nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>
let g:airline#extensions#tabline#enabled = 1
let g:airline_powerline_fonts = 1
-" Gundo {{{2
-nnoremap <F7> :GundoToggle<CR>
+" checkattach {{{2
+let g:checkattach_filebrowser = 'ranger'
+
+" delimitmate {{{2
+let delimitMate_expand_cr = 2
+let g:delimitMate_expand_space = 1
+
+" fswitch {{{2
+nnoremap <silent> <Leader>ff :FSHere<CR>
+nnoremap <silent> <Leader>fl :FSRight<CR>
+nnoremap <silent> <Leader>fh :FSLeft<CR>
+nnoremap <silent> <Leader>fL :FSSplitRight<CR>
+nnoremap <silent> <Leader>fH :FSSplitLeft<CR>
" fugitive {{{2
nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>
nnoremap <silent> <leader>gs :Gstatus<CR>
nnoremap <silent> <leader>gd :Gdiff<CR>
nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
-nnoremap <silent> <leader>gw :Gwrite<cr>
+nnoremap <silent> <leader>ga :Gwrite<cr>
+nnoremap <silent> <leader>gb :Gblame<cr>
+
+" Gundo {{{2
+nnoremap <F7> :GundoToggle<CR>
+
+" indent-guides {{{2
+let g:indent_guides_default_mapping = 0
+let g:indent_guides_guide_size = 1
+nmap <silent> cog <Plug>IndentGuidesToggle
+nmap <silent> [og <Plug>IndentGuidesEnable
+nmap <silent> ]og <Plug>IndentGuidesDisable
" NERDTree {{{2
" open/close NERDTree with \e
" close vim if only NERDTree is open
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+" python-mode {{{2
+
+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
let g:syntastic_error_symbol='E'
" UltiSnips {{{2
let g:UltiSnipsEditSplit = 'vertical'
-let g:UltiSnipsSnippetsDir = "$XDG_CONFIG_HOME/vim/ultisnips"
+let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
+let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+let g:UltiSnipsExpandTrigger = "<C-L>"
+let g:UltiSnipsJumpForwardTrigger = "<C-L>"
+let g:UltiSnipsJumpBackwardTrigger = "<C-H>"
+
+" yankring {{{2
+nnoremap <silent> <leader>p :YRShow<cr>
+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 :<C-U>YRYankCount 'y$'<CR>
+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_extra_conf_vim_data = ['%:p']
nnoremap <leader>jd :YcmCompleter GoTo<CR>
+" vim-easy-align {{{2
+" start interactive EasyAlign in visual mode
+vmap <Enter> <Plug>(EasyAlign)
+
" vim-json {{{2
let g:vim_json_syntax_conceal = 0
nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
" fix spelling with first choice
nnoremap <Leader>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 <silent><leader>n :call g:ToggleNumber()<cr>
-nnoremap <silent><leader>N :setlocal relativenumber!<cr>
repos / dotfiles.git / blobdiff