vim: unindent terminating `)`

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 25fa46045b05c4e4a33e152ddd4c8166ae5cdf65..c3fe2daea73723816c6d6b74091d80c6bc0f5e1a 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -247,6 +247,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 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
 
 set wildignore+=.hg,.git,.svn                    " Version control
 set wildignore+=*.aux,*.out,*.toc                " LaTeX intermediate files


@@ -491,12 +492,6 @@ inoremap <C-C> <Esc>gUiwgi
 " http://git.io/v3ZeU
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
 " http://git.io/v3ZeU
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 

-" commands {{{1
-command! Cd cd %:h
-command! Cr execute('cd ' . FindGitDirOrHome())
-command! LCd lcd %:h
-command! LCr execute('lcd ' . FindGitDirOrHome())
-

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


@@ -640,11 +635,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'
 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 <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
     let g:unite_source_grep_recursive_opt = ''
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>

-command! -nargs=1 Ag Unite grep -input=<args>
+command! -nargs=1 Ag Unite grep:.::<args>

 
 " unite-file_rec {{{3
 if executable('ag')
 
 " unite-file_rec {{{3
 if executable('ag')


@@ -652,6 +647,7 @@ if executable('ag')
     let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
 end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
     let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
 end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>

+call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')

 
 " unite-buffer {{{3
 call unite#custom#default_action('buffer', 'open')
 
 " unite-buffer {{{3
 call unite#custom#default_action('buffer', 'open')


@@ -691,7 +687,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']
 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<CR>

 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode


@@ -735,6 +730,13 @@ if !exists(":DiffOrig")
                   \ | wincmd p | diffthis
 endif
 
                   \ | wincmd p | diffthis
 endif
 

+" sort operator {{{2
+function! SortLinesOpFunc(...)
+  '[,']sort
+endfunction
+nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
+vnoremap <silent> gs :sort<cr>
+

 " edit configs  {{{2
 function! EditConfig(what)
     let l:dir = split(&runtimepath,',')[0]
 " edit configs  {{{2
 function! EditConfig(what)
     let l:dir = split(&runtimepath,',')[0]


@@ -804,5 +806,9 @@ function! FindGitDirOrHome()
     return '~'
   endif
 endfunction
     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:
 
 " vim:set et sw=2 ts=2 tw=78: