awesome: fix battery_widget

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index cbcc9ac4114189b4360c9cde459149ed775bc488..3905add6679e51019a9de68c88649a77f46c7e17 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -16,45 +16,55 @@ Plugin 'gmarik/vundle'
 
 Plugin 'airblade/vim-gitgutter'
 Plugin 'bling/vim-airline'
 
 Plugin 'airblade/vim-gitgutter'
 Plugin 'bling/vim-airline'

+Plugin 'derekwyatt/vim-fswitch'

 Plugin 'elzr/vim-json'
 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 '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 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'

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

 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
 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 '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'
 
 
 " 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'
 
 " 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'
 

-" 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 'chrisbra/checkattach'

-Plugin 'klen/python-mode'

 Plugin 'nathanaelkane/vim-indent-guides'
 Plugin 'nathanaelkane/vim-indent-guides'

-Plugin 'vim-scripts/yankring.vim'
+Plugin 'alx741/vinfo'
+Plugin 'shougo/vimproc.vim'
+Plugin 'shougo/unite.vim'

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


@@ -166,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 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


@@ -257,6 +267,7 @@ augroup END
 map <space> <leader>
 
 " make
 map <space> <leader>
 
 " make

+nnoremap <leader>r :make<cr>

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


@@ -266,9 +277,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


@@ -287,15 +295,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


@@ -351,9 +356,6 @@ cnoremap <C-L>   <Right>
 " close all folds open fold in cursor
 nnoremap zx zMzxzt
 
 " close all folds open fold in cursor
 nnoremap zx zMzxzt
 

-" edit vimrc in new tab
-nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>
-

 map <F1> :ls<CR>:b<space>
 
 nnoremap <C-L> <C-W>w
 map <F1> :ls<CR>:b<space>
 
 nnoremap <C-L> <C-W>w


@@ -376,8 +378,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>


@@ -396,12 +397,10 @@ 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
-" ag {{{2
-let g:AgSmartCase = 1
-nnoremap <leader>ag yiw:Ag \12"<cr>
-vnoremap <leader>ag y:Ag \12"<cr>
+" uppercase previous word
+inoremap <C-C> <Esc>gUiwgi

 
 

+" plugins options {{{1

 " airline {{{2
 let g:airline#extensions#whitespace#enabled = 1
 let g:airline#extensions#tabline#enabled = 1
 " airline {{{2
 let g:airline#extensions#whitespace#enabled = 1
 let g:airline#extensions#tabline#enabled = 1


@@ -409,6 +408,7 @@ let g:airline_powerline_fonts = 1
 
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'

+let g:checkattach_once = 'y'

 
 " delimitmate {{{2
 let delimitMate_expand_cr = 2
 
 " delimitmate {{{2
 let delimitMate_expand_cr = 2


@@ -480,13 +480,60 @@ 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', {
+            \ 'winheight': 20,
+            \ 'direction': 'botright'
+            \ })
+
+" seems not respected
+let g:unite_source_grep_max_candidates = 2000
+if executable('ag')
+    " Use ag in unite rec source
+    let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
+    " 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] <Nop>
+nmap <leader>u [unite]
+nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
+call unite#custom#default_action('buffer', 'goto')
+nnoremap <silent> [unite]b :<C-u>Unite buffer<CR>
+nnoremap <silent> [unite]a :<C-u>Unite grep -input=\12\17<CR>

 
 " yankring {{{2
 nnoremap <silent> <leader>p :YRShow<cr>
 
 " yankring {{{2
 nnoremap <silent> <leader>p :YRShow<cr>


@@ -504,7 +551,7 @@ 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_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>
 


@@ -520,6 +567,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
 


@@ -531,6 +596,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"]


@@ -557,7 +644,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=