awesome: add net_widget for chronos

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 40e3190e4c0d048818771933310e5db075a7ed01..9284bf50103126b783d1ce8fd4a3c328c124fcb9 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,13 +14,19 @@ call vundle#rc('$XDG_DATA_HOME/vim')
 
 Plugin 'gmarik/vundle'
 
 
 Plugin 'gmarik/vundle'
 

+Plugin 'airblade/vim-gitgutter'

 Plugin 'bling/vim-airline'
 Plugin 'bling/vim-airline'

+Plugin 'derekwyatt/vim-fswitch'

 Plugin 'elzr/vim-json'
 Plugin 'elzr/vim-json'

-Plugin 'rking/ag.vim'
-Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
-Plugin 'kien/ctrlp.vim'
+Plugin 'firef0x/pkgbuild.vim'
+Plugin 'junegunn/vim-easy-align'
+" Plugin 'kien/ctrlp.vim'
+" Plugin 'klen/python-mode'
+Plugin 'wilywampa/python-mode'

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

+Plugin 'raimondi/delimitmate'
+Plugin 'rking/ag.vim'

 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
 Plugin 'sjl/gundo.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
 Plugin 'sjl/gundo.vim'


@@ -31,21 +37,33 @@ Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-unimpaired'
 Plugin 'valloric/youcompleteme'
 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 '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'
 
 " seems to have problems right now... may be add later?
 " Plugin 'jalcine/cmake.vim'
 " Plugin 'powerman/vim-plugin-viewdoc'
 

-Plugin 'airblade/vim-gitgutter'
-Plugin 'Raimondi/delimitMate'
-Plugin 'SirVer/ultisnips'
-Plugin 'Lokaltog/vim-easymotion'
-Plugin 'junegunn/vim-easy-align'
+" 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 'shougo/unite.vim'

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


@@ -157,7 +175,7 @@ set foldmethod=marker           " folding type
 set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 
 " save and restore folds
 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
 
 " diff mode {{{2
 set diffopt=filler,vertical


@@ -165,19 +183,30 @@ set diffopt=filler,vertical
 " reading and writing files {{{2
 set modeline                    " read modelines
 set modelines=2                 " only check first/last 2 lines
 " 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 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 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 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
 
 " command line editing {{{2
 set history=5000                " how many command lines are remembered


@@ -198,7 +227,7 @@ set wildignore+=*.orig                           " Merge resolution files
 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 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
 
 " autocmds {{{1
 " Resize splits when the window is resized {{{2


@@ -231,18 +260,13 @@ augroup cursor_pos
                 \ endif
 augroup END
 
                 \ 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>
 map <space> <leader>
 
 " make
 " bindings {{{1
 
 " allow both <space> and / to be <leader>
 map <space> <leader>
 
 " make

+nnoremap <leader>r :make<cr>

 nnoremap <leader><cr> :make<cr>
 
 " unhighlight search
 nnoremap <leader><cr> :make<cr>
 
 " unhighlight search


@@ -252,9 +276,6 @@ nnoremap <silent> <Leader>/ :silent nohl<CR>
 nnoremap <leader>[ :tabprev<cr>
 nnoremap <leader>] :tabnext<cr>
 
 nnoremap <leader>[ :tabprev<cr>
 nnoremap <leader>] :tabnext<cr>
 

-" Wrap
-nnoremap <leader>W :set wrap!<cr>
-

 " paste from selection
 nnoremap <leader>p* :silent! set paste<CR>"*p:set nopaste<CR>
 " paste from clipboard
 " paste from selection
 nnoremap <leader>p* :silent! set paste<CR>"*p:set nopaste<CR>
 " paste from clipboard


@@ -273,15 +294,12 @@ noremap ' `
 " Select (charwise) the contents of the current line, excluding indentation.
 nnoremap vv ^vg_
 
 " Select (charwise) the contents of the current line, excluding indentation.
 nnoremap vv ^vg_
 

-" Toggle [i]nvisible characters
-nnoremap <leader>i :set list!<cr>
-

 " Unfuck my screen
 nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
 
 " Ranger
 " Unfuck my screen
 nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
 
 " Ranger

-nnoremap <leader>r :silent !ranger %:h<cr>:redraw!<cr>
-nnoremap <leader>R :silent !ranger<cr>:redraw!<cr>
+" nnoremap <leader>r :silent !ranger %:h<cr>:redraw!<cr>
+" nnoremap <leader>R :silent !ranger<cr>:redraw!<cr>

 
 " Use sane regexes.
 nnoremap / /\v
 
 " Use sane regexes.
 nnoremap / /\v


@@ -335,10 +353,7 @@ cnoremap <C-H>   <Left>
 cnoremap <C-L>   <Right>
 
 " close all folds open fold in cursor
 cnoremap <C-L>   <Right>
 
 " close all folds open fold in cursor

-nnoremap zx zMzxzz15<C-e>
-
-" edit vimrc in new tab
-nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>
+nnoremap zx zMzxzt

 
 map <F1> :ls<CR>:b<space>
 
 
 map <F1> :ls<CR>:b<space>
 


@@ -362,8 +377,7 @@ noremap <silent> <Leader>O :set paste<CR>m`O<ESC>``:set nopaste<CR>
 " Don't use Ex mode, use Q for formatting
 map Q gq
 
 " Don't use Ex mode, use Q for formatting
 map Q gq
 

-" allow undoing in insert-mode
-inoremap <C-U> <C-G>u<C-U>
+" break undo sequence before removing word

 inoremap <C-W> <C-G>u<C-W>
 
 nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>
 inoremap <C-W> <C-G>u<C-W>
 
 nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>


@@ -382,19 +396,34 @@ autocmd BufWinEnter *.* silent loadview
 " save with sudo
 cnoremap w!! w !sudo tee % > /dev/null
 
 " save with sudo
 cnoremap w!! w !sudo tee % > /dev/null
 

-" plugins {{{1
+" uppercase previous word
+inoremap <C-C> <Esc>gUiwgi
+
+" plugins options {{{1

 " ag {{{2
 let g:AgSmartCase = 1
 nnoremap <leader>ag yiw:Ag \12"<cr>
 vnoremap <leader>ag y:Ag \12"<cr>
 
 " airline {{{2
 " ag {{{2
 let g:AgSmartCase = 1
 nnoremap <leader>ag yiw:Ag \12"<cr>
 vnoremap <leader>ag y:Ag \12"<cr>
 
 " 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
 
 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'
+let g:checkattach_once = 'y'
+
+" 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>
 
 " fugitive {{{2
 nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>


@@ -405,6 +434,17 @@ nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 nnoremap <silent> <leader>gc :tab Gcommit -v<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
 
 " NERDTree {{{2
 " open/close NERDTree with \e


@@ -415,6 +455,14 @@ let NERDTreeMapActivateNode='l'
 " close vim if only NERDTree is open
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 
 " 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'
 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'


@@ -436,26 +484,70 @@ let g:tagbar_autoshowtag = 1
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 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:UltiSnipsEditSplit = 'vertical'
 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>"
+let g:UltiSnipsExpandTrigger       = "<tab>"
+let g:UltiSnipsJumpForwardTrigger  = "<tab>"
+let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
+
+" 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 "\<C-n>"
+        else
+            call UltiSnips#JumpForwards()
+            if g:ulti_jump_forwards_res == 0
+               return "\<TAB>"
+            endif
+        endif
+    endif
+    return ""
+endfunction
+au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
+let g:UltiSnipsListSnippets="<c-e>"
+
+" unite {{{2
+call unite#filters#matcher_default#use(['matcher_fuzzy'])
+call unite#custom#profile('default', 'context', {
+            \ 'start_insert': 1,
+            \ 'winheight': 20,
+            \ 'direction': 'botright'
+            \ })
+nnoremap    [unite]   <Nop>
+nmap    <leader>u [unite]
+nnoremap <silent> [unite]f :<C-u>Unite buffer file_rec<CR>
+
+" 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
 
 " 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 <leader>jd :YcmCompleter GoTo<CR>
 
 "let g:ycm_extra_conf_vim_data = ['%:p']
 nnoremap <leader>jd :YcmCompleter GoTo<CR>
 

-" vim-easy-align
+" vim-easy-align {{{2

 " start interactive EasyAlign in visual mode
 " start interactive EasyAlign in visual mode

-vnoremap <Enter> <Plug>(EasyAlign)
+vmap <Enter> <Plug>(EasyAlign)

 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0


@@ -465,6 +557,24 @@ let g:tex_flavor='latex'
 let g:Tex_DefaultTargetFormat='pdf'
 let g:Tex_MultipleCompileFormats='pdf'
 
 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 <Plug>Sneak_f
+nmap F <Plug>Sneak_F
+xmap f <Plug>Sneak_f
+xmap F <Plug>Sneak_F
+omap f <Plug>Sneak_f
+omap F <Plug>Sneak_F
+nmap t <Plug>Sneak_t
+nmap T <Plug>Sneak_T
+xmap t <Plug>Sneak_t
+xmap T <Plug>Sneak_T
+omap t <Plug>Sneak_t
+omap T <Plug>Sneak_T

 
 " functions {{{1
 
 
 " functions {{{1
 


@@ -476,6 +586,28 @@ if !exists(":DiffOrig")
                   \ | wincmd p | diffthis
 endif
 
                   \ | 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 <leader>ev :call EditConfig('vimrc')<CR>
+nmap <leader>ef :call EditConfig('ftplugin')<CR>
+nmap <leader>es :call EditConfig('syntax')<CR>
+nmap <leader>ei :call EditConfig('indent')<CR>
+nmap <leader>eu :UltiSnipsEdit<CR>
+

 " spell check {{{2
 " http://tex.stackexchange.com/a/52932
 let g:myLangList=["en_gb","en_us","de","fr"]
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932
 let g:myLangList=["en_gb","en_us","de","fr"]


@@ -502,23 +634,6 @@ function! SwitchSpell()
   echo "setlocal spelllang=" g:myLangList[b:myLang]
 endfunction
 
   echo "setlocal spelllang=" g:myLangList[b:myLang]
 endfunction
 

-nnoremap <silent> <Leader>s :call ToggleSpell()<CR>
-nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
+nnoremap <silent> coS :call SwitchSpell()<CR>

 " fix spelling with first choice
 nnoremap <Leader>f 1z=
 " 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>