vim: use eunuch instead of my own "write as root" cabbrev

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 160aba896c5f700c515433632fd3fff90a6f61ba..8a84380f62d53128dad68f0cf32f7759ca051b35 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -10,52 +10,71 @@ set runtimepath& " reset rtp
 autocmd!
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 autocmd!
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle

-call vundle#rc('$XDG_DATA_HOME/vim')
+call vundle#begin('$XDG_DATA_HOME/vim')

 
 Plugin 'gmarik/vundle'
 
 
 Plugin 'gmarik/vundle'
 

+Plugin 'AndrewRadev/switch.vim'

 Plugin 'airblade/vim-gitgutter'
 Plugin 'airblade/vim-gitgutter'

+Plugin 'alepez/vim-gtest'

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

+Plugin 'chrisbra/checkattach'

 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
 Plugin 'junegunn/vim-easy-align'
 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
 Plugin 'junegunn/vim-easy-align'

-Plugin 'kien/ctrlp.vim'
+Plugin 'justinmk/vim-sneak'

 Plugin 'klen/python-mode'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'klen/python-mode'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'

+Plugin 'octol/vim-cpp-enhanced-highlight'

 Plugin 'raimondi/delimitmate'
 Plugin 'raimondi/delimitmate'

-Plugin 'rking/ag.vim'
-Plugin 'scrooloose/nerdtree'
+Plugin 'ram-z/vim-clang-format'
+Plugin 'ram-z/vimwiki'
+Plugin 'rdnetto/ycm-generator'

 Plugin 'scrooloose/syntastic'
 Plugin 'scrooloose/syntastic'

+Plugin 'shougo/unite.vim'
+Plugin 'shougo/vimproc.vim'

 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'

+Plugin 'tpope/vim-abolish'

 Plugin 'tpope/vim-endwise'
 Plugin 'tpope/vim-endwise'

+Plugin 'tpope/vim-eunuch'

 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'

-Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-surround'  "investigate vim-sandwich

 Plugin 'tpope/vim-unimpaired'
 Plugin 'tpope/vim-unimpaired'

+Plugin 'tweekmonster/spellrotate.vim'

 Plugin 'valloric/youcompleteme'
 Plugin 'valloric/youcompleteme'

+Plugin 'vim-scripts/mediawiki.vim'
+Plugin 'vim-scripts/replacewithregister'

 Plugin 'vim-scripts/yankring.vim'
 
 Plugin 'vim-scripts/yankring.vim'
 

+" colorschemes
+Plugin 'flazz/vim-colorschemes'
+

 " snippets
 Plugin 'sirver/ultisnips'
 Plugin 'honza/vim-snippets'
 
 " snippets
 Plugin 'sirver/ultisnips'
 Plugin 'honza/vim-snippets'
 

-" ros
-Plugin 'ompugao/ros.vim'
-Plugin 'ompugao/ctrlp-ros'
-
-" seems to have problems right now... may be add later?
-" Plugin 'jalcine/cmake.vim'
-" Plugin 'powerman/vim-plugin-viewdoc'
-
-" find an alternative
-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'
+" text objects
+Plugin 'kana/vim-textobj-user'
+Plugin 'julian/vim-textobj-variable-segment'
+Plugin 'sgur/vim-textobj-parameter'
+Plugin 'kana/vim-operator-user'
+
+" staging
+" find an alternative (latex-box? Automatic Latex Plugin?)
+Plugin 'vim-latex/vim-latex'
+Plugin 'alx741/vinfo'
+Plugin 'derekwyatt/vim-protodef'
+Plugin 'sgeb/vim-diff-fold'
+" needs editing colorscheme
+" Plugin 'jeaye/color_coded'
+" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
+Plugin 'wincent/loupe'
+
+call vundle#end()

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


@@ -70,7 +89,7 @@ filetype plugin indent on
 
 " colorscheme {{{1
 syntax on
 
 " colorscheme {{{1
 syntax on

-colorscheme badwolf
+colorscheme badfox

 
 " options {{{1
 " moving around, searching and patterns {{{2
 
 " options {{{1
 " moving around, searching and patterns {{{2


@@ -80,26 +99,31 @@ set smartcase           " override 'ignorecase' when pattern has upper case char
 set hlsearch            " highlight all matches for the last used search pattern
 
 set nostartofline       " don't move the cursor to the first non-blank char of a line
 set hlsearch            " highlight all matches for the last used search pattern
 
 set nostartofline       " don't move the cursor to the first non-blank char of a line

-set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include
+set path+=.
+set path+=include/
+set path+=../include/
+set path+=/usr/include/c++/*

 
 " displaying text {{{2
 
 " displaying text {{{2

-set scrolloff=5                 " number of screen lines to show around the cursor

 set nowrap                      " long lines wrap
 set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=↪                 " show these chars for wrapped lines
 set nowrap                      " long lines wrap
 set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=↪                 " show these chars for wrapped lines

+set breakindent                 " preserve indentation in wrapped text

 
 set lazyredraw                  " don't redraw while executing macros
 
 set list                        " show chars defined in 'listchars'
 
 set lazyredraw                  " don't redraw while executing macros
 
 set list                        " show chars defined in 'listchars'

-set listchars=tab:â\96¸\            " list of strings used for list mode
+set listchars=tab:â\9d­\            " list of strings used for list mode

 set listchars+=extends:❯,precedes:❮
 " Only shown when not in insert mode
 set listchars+=extends:❯,precedes:❮
 " Only shown when not in insert mode

+au InsertLeave * :set listchars+=trail:·

 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:·
     au InsertLeave * :set listchars+=trail:·
 augroup END
 
 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:·
     au InsertLeave * :set listchars+=trail:·
 augroup END
 

+set scrolloff=5                 " number of screen lines to show around the cursor

 set sidescroll=1                " number of collumns to scroll
 set sidescrolloff=1             " don't scroll over the listchars
 
 set sidescroll=1                " number of collumns to scroll
 set sidescrolloff=1             " don't scroll over the listchars
 


@@ -133,10 +157,18 @@ set mouse=rnv                   " list of flags for using the mouse
 set ttymouse=xterm              " type of mouse
 
 " messages and info {{{2
 set ttymouse=xterm              " type of mouse
 
 " messages and info {{{2

-set showcmd                     " Show (partial) command in status line.
-set ruler                       " show the cursor position all the time
-set confirm                     " Ask what to do when closing unsaved documents
-set shortmess=filnxtoOI         " don't show intro message
+set showcmd         " Show (partial) command in status line.
+set ruler           " show the cursor position all the time
+set confirm         " Ask what to do when closing unsaved documents
+set shortmess=      " reset option
+set shortmess+=a    " all abbreviations
+set shortmess+=o    " overwrite file-written message
+set shortmess+=O    " file-read message overrides previous
+set shortmess+=t    " truncate file message at start
+set shortmess+=T    " truncate other messages in the middle
+set shortmess+=W    " don't give 'written' or '[w]' when writing a file
+set shortmess+=A    " ignore swapfile warning
+set shortmess+=I    " no splash screen

 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode
 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode


@@ -144,11 +176,25 @@ set backspace=indent,eol,start  " allow backspacing over everything in insert mo
 set showmatch                   " Show matching brackets.
 
 set nojoinspaces                " don't use two spaces after '.' when joining a line
 set showmatch                   " Show matching brackets.
 
 set nojoinspaces                " don't use two spaces after '.' when joining a line

-set formatoptions=jcrnql
+set formatoptions+=j    " Delete comment leader when joining lines
+set formatoptions+=c    " Autowrap comments using textwidth
+set formatoptions+=r    " Insert comment leader after hitting <Enter>
+set formatoptions+=n    " Recognize numbered lists
+set formatoptions+=q    " Allow formatting of comments with "gq".
+set formatoptions+=l    " do not wrap lines that have been longer when starting insert mode already
+set formatoptions+=t    " Auto-wrap text using textwidth
+set formatoptions-=o    " Do not insert comment leader after hitting o or O in normal mode

 
 set nrformats=hex               " number formats recognized for CTRL-A and CTRL-X commands
 
 
 set nrformats=hex               " number formats recognized for CTRL-A and CTRL-X commands
 

-set complete=.,w,b,u,t
+set complete=.       " scan the current buffer ( 'wrapscan' is ignored)
+set complete+=w      " scan buffers from other windows
+set complete+=b      " scan other loaded buffers that are in the buffer list
+set complete+=u      " scan the unloaded buffers that are in the buffer list
+set complete+=t      " scan tags
+set complete+=i      " scan current and included files
+set complete+=kspell " use the currently active spell checking |spell|
+

 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview
 
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview
 


@@ -166,11 +212,16 @@ set pastetoggle=<F11>           " key sequence to toggle paste mode
 set foldmethod=marker           " folding type
 set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 
 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
+" open folds when jumping to line
+set foldopen+=jump
+
+set viewoptions=cursor          " save cursor position
+set viewoptions+=folds          " save folds

 
 " diff mode {{{2
 
 " diff mode {{{2

-set diffopt=filler,vertical
+set diffopt+=filler         " show filler lines
+set diffopt+=vertical       " always vertical split
+set diffopt+=context:10     " 10 lines context between changes

 
 " reading and writing files {{{2
 set modeline                    " read modelines
 
 " reading and writing files {{{2
 set modeline                    " read modelines


@@ -204,6 +255,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


@@ -215,12 +267,23 @@ set wildignore+=*.luac                           " Lua byte code
 set wildignore+=*.pyc                            " Python byte code
 set wildignore+=*.orig                           " Merge resolution files
 
 set wildignore+=*.pyc                            " Python byte code
 set wildignore+=*.orig                           " Merge resolution files
 

+" running make and jumping to errors {{{2
+set makeprg=make\ -w     " print changing directories
+
+set grepprg=ag\ --vimgrep\ $*
+
+" language specific {{{2
+set isfname-==    " don't treat `=` as being part of filenames
+

 " various {{{2
 " various {{{2

-set virtualedit=block           " let cursor move past last char in <C-V> mode
+set virtualedit+=block     " let cursor move past last char in <C-V> mode
+set virtualedit+=onemore   " allow the cursor to move just past the end of the line

 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/view//
 
 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/view//
 

+set sessionoptions+=unix,slash  " damn windows and it's silly ways
+

 " autocmds {{{1
 " Resize splits when the window is resized {{{2
 augroup resize
 " autocmds {{{1
 " Resize splits when the window is resized {{{2
 augroup resize


@@ -252,14 +315,32 @@ augroup cursor_pos
                 \ endif
 augroup END
 
                 \ endif
 augroup END
 

+" Check for file modifications automatically {{{2
+" (current buffer only)
+" Use :NoAutoChecktime to disable it (uses b:autochecktime)
+fun! MyAutoCheckTime()
+  " only check timestamp for normal files
+  if &buftype != '' | return | endif
+  if ! exists('b:autochecktime') || b:autochecktime
+    checktime %
+    let b:autochecktime = 1
+  endif
+endfun
+augroup MyAutoChecktime
+  au!
+  au FocusGained,BufEnter,CursorHold,InsertEnter * call MyAutoCheckTime()
+augroup END
+command! NoAutoChecktime let b:autochecktime=0
+command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
+

 " bindings {{{1
 
 " bindings {{{1
 

-" allow both <space> and / to be <leader>
+" allow both <space> and \ to be <leader>

 map <space> <leader>
 
 " make
 map <space> <leader>
 
 " make

-nnoremap <leader>r :make<cr>
-nnoremap <leader><cr> :make<cr>
+nnoremap <leader>r :make!<cr>
+nnoremap <leader><cr> :make!<cr>

 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>
 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>


@@ -268,16 +349,26 @@ 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
 nnoremap <leader>p+ :silent! set paste<CR>"+p:set nopaste<CR>
 
 " paste from selection
 nnoremap <leader>p* :silent! set paste<CR>"*p:set nopaste<CR>
 " paste from clipboard
 nnoremap <leader>p+ :silent! set paste<CR>"+p:set nopaste<CR>
 

-" Clean trailing whitespace
-nnoremap <silent> <leader>ww m':%s/\s\+$//<cr>:let @/=''<cr>``zz
+" strip trailing whitespace
+function! StripWhitespace(line1, line2, ...)  " {{{2
+  let s_report = &report
+  let &report=0
+  let pattern = a:0 ? a:1 : '\s\+$'
+  let oldview = winsaveview()
+  exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
+  if oldview != winsaveview()
+    redraw
+  endif
+  call winrestview(oldview)
+  let &report = s_report
+endfunction  " }}}2
+command! -range=% -nargs=0 -bar Untrail keepjumps call StripWhitespace(<line1>,<line2>)
+nnoremap <silent> <leader>ww :Untrail<CR>

 
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
 
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>


@@ -289,9 +380,6 @@ 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>
 
 " Unfuck my screen
 nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
 


@@ -315,6 +403,7 @@ nnoremap N Nzzzv
 nnoremap g; g;zzzv
 nnoremap g, g,zzzv
 nnoremap <c-o> <c-o>zzzv
 nnoremap g; g;zzzv
 nnoremap g, g,zzzv
 nnoremap <c-o> <c-o>zzzv

+nnoremap <c-i> <c-i>zzzv

 
 " Not using the default mappings of 'To line from top/bottom'
 noremap H ^
 
 " Not using the default mappings of 'To line from top/bottom'
 noremap H ^


@@ -323,10 +412,10 @@ vnoremap H ^
 vnoremap L g_
 
 " Heresy, emacs insert bindings
 vnoremap L g_
 
 " Heresy, emacs insert bindings

-inoremap <c-a> <esc>I
-inoremap <c-e> <esc>A
-cnoremap <c-a> <home>
-cnoremap <c-e> <end>
+inoremap <C-A> <Esc>I
+inoremap <C-E> <Esc>A
+cnoremap <C-A> <Home>
+cnoremap <C-E> <End>

 
 " proper movement when lines are wrapped
 noremap <expr> j (v:count == 0 ? 'gj' : 'j')
 
 " proper movement when lines are wrapped
 noremap <expr> j (v:count == 0 ? 'gj' : 'j')


@@ -353,20 +442,20 @@ 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>
 
 map <F1> :ls<CR>:b<space>
 

-nnoremap <C-L> <C-W>w
-nnoremap <C-H> <C-W>W
+" move between windows (skip previewwindow)
+nnoremap <silent> <C-L> <C-W>w:if &previewwindow \| wincmd w \| endif<CR>
+nnoremap <silent> <C-H> <C-W>W:if &previewwindow \| wincmd W \| endif<CR>

 
 "xterm mouse with middleclick paste
 nnoremap <MiddleMouse> i<MiddleMouse>
 vnoremap <MiddleMouse> s<MiddleMouse>
 
 " fix legacy vi inconsistency
 
 "xterm mouse with middleclick paste
 nnoremap <MiddleMouse> i<MiddleMouse>
 vnoremap <MiddleMouse> s<MiddleMouse>
 
 " fix legacy vi inconsistency

-map Y y$
+nnoremap Y y$
+" copy to clipboard
+xnoremap Y "+y

 
 " allow repeat operator on visual
 vnoremap . :normal .<CR>
 
 " allow repeat operator on visual
 vnoremap . :normal .<CR>


@@ -378,32 +467,37 @@ 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>
 
 inoremap <C-W> <C-G>u<C-W>
 

-nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>
-nmap <Leader>B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4<CR>
-nmap <Leader>M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4<CR>
-nmap <Leader>m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2<CR>
+nnoremap coe :set <C-R>=&expandtab ? 'noexpandtab' : 'expandtab'<CR><CR>
+nnoremap [oe :set expandtab<CR>
+nnoremap ]oe :set noexpandtab<CR>
+
+for idt in range(1,8)
+  exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+endfor
+
+" toggle auto format of text
+nnoremap coa :set <C-R>=&formatoptions =~ "a" ? 'formatoptions-=a' : 'formatoptions+=a'<CR><CR>
+nnoremap [oa :set formatoptions+=a<CR>
+nnoremap ]oa :set formatoptions-=a<CR>

 
 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
 " create folds around visual selection
 vnoremap <leader><Space> zf
 
 
 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
 " create folds around visual selection
 vnoremap <leader><Space> zf
 

-autocmd BufWinLeave *.* mkview
-autocmd BufWinEnter *.* silent loadview
-

 " save with sudo
 " save with sudo

-cnoremap w!! w !sudo tee % > /dev/null
+cabbrev w!! SudoWrite

 
 

-" plugins options {{{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
+
+" 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>

 
 

+" 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


@@ -421,8 +515,12 @@ let g:delimitMate_expand_space = 1
 nnoremap <silent> <Leader>ff :FSHere<CR>
 nnoremap <silent> <Leader>fl :FSRight<CR>
 nnoremap <silent> <Leader>fh :FSLeft<CR>
 nnoremap <silent> <Leader>ff :FSHere<CR>
 nnoremap <silent> <Leader>fl :FSRight<CR>
 nnoremap <silent> <Leader>fh :FSLeft<CR>

+nnoremap <silent> <Leader>fj :FSBelow<CR>
+nnoremap <silent> <Leader>fk :FSAbove<CR>

 nnoremap <silent> <Leader>fL :FSSplitRight<CR>
 nnoremap <silent> <Leader>fH :FSSplitLeft<CR>
 nnoremap <silent> <Leader>fL :FSSplitRight<CR>
 nnoremap <silent> <Leader>fH :FSSplitLeft<CR>

+nnoremap <silent> <Leader>fJ :FSSplitBelow<CR>
+nnoremap <silent> <Leader>fK :FSSplitAbove<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>


@@ -431,7 +529,7 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
 
 nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 
 nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>

-nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
+nnoremap <silent> <leader>gc :Gcommit -v<CR>

 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 


@@ -445,23 +543,43 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 

-" NERDTree {{{2
-" open/close NERDTree with \e
-nmap <Leader>e :NERDTreeToggle<CR>
-nmap <F6> :NERDTreeToggle<CR>
-" <space> to open files/dirs
-let NERDTreeMapActivateNode='l'
-" close vim if only NERDTree is open
-autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+" close-another-window {{{2
+nnoremap <silent> <C-W>c  <NOP>
+nnoremap <silent> <C-W>cc <C-W>c
+nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
+nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
+nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
+nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>

 
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
 let g:pymode_rope = 0
 
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
 let g:pymode_rope = 0

+let g:pymode_run = 0

 let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"
 let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"

+let g:pymode_lint_cwindow = 0           " don't open cwindow when linting

 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 
 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 

+" signature {{{2
+" disable '[ mappings
+
+let g:SignatureMap = {
+  \ 'GotoNextLineAlpha'  :  "",
+  \ 'GotoPrevLineAlpha'  :  "",
+  \ 'GotoNextSpotAlpha'  :  "",
+  \ 'GotoPrevSpotAlpha'  :  "",
+  \ }
+
+" switch
+let g:switch_mapping = "<Leader>s"
+
+" spellrotate
+nmap <silent> z] <Plug>(SpellRotateForward)
+nmap <silent> z[ <Plug>(SpellRotateBackward)
+vmap <silent> z] <Plug>(SpellRotateForwardV)
+vmap <silent> z[ <Plug>(SpellRotateBackwardV)
+

 " 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'


@@ -483,10 +601,15 @@ 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
+" tcomments {{{2
+let g:tcommentTextObjectInlineComment = 'gic'
+
+" ultisnips {{{2

 let g:UltiSnipsEditSplit = 'vertical'
 let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
 let g:UltiSnipsEditSplit = 'vertical'
 let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")

-let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+if has('fname_case')
+  let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+endif

 let g:UltiSnipsExpandTrigger       = "<tab>"
 let g:UltiSnipsJumpForwardTrigger  = "<tab>"
 let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
 let g:UltiSnipsExpandTrigger       = "<tab>"
 let g:UltiSnipsJumpForwardTrigger  = "<tab>"
 let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"


@@ -513,6 +636,55 @@ endfunction
 au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
 let g:UltiSnipsListSnippets="<c-e>"
 
 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'
+            \ })
+
+nnoremap [unite] <Nop>
+nmap <leader>u [unite]
+nnoremap [unite]u :UniteResume<CR>
+
+" 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 --vimgrep --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>
+command! -nargs=1 Ag Unite grep:.::<args>
+
+" unite-file_rec {{{3
+if executable('ag')
+    " Use ag in unite rec source
+    let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-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')
+nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>
+
+" 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 <Leader>gs' : 'Gstatus',
+            \ 'Gcommit -v <Leader>gc' : 'Gcommit -v',
+            \ 'Glog' : 'Glog',
+            \}
+
+nnoremap <silent> <leader>gg :<C-u>Unite menu:fugitive<CR>
+
+let g:unite_source_history_yank_enable = 1
+nnoremap <silent> [unite]p :<C-u>Unite history/yank<CR>
+

 " yankring {{{2
 nnoremap <silent> <leader>p :YRShow<cr>
 let g:yankring_history_dir = expand('$XDG_CACHE_HOME/vim')
 " yankring {{{2
 nnoremap <silent> <leader>p :YRShow<cr>
 let g:yankring_history_dir = expand('$XDG_CACHE_HOME/vim')


@@ -529,13 +701,20 @@ 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_extra_conf_vim_data = ['%:p']
-nnoremap <leader>jd :YcmCompleter GoTo<CR>
+let g:ycm_complete_in_comments = 1
+let g:ycm_complete_in_strings  = 1
+let g:ycm_autoclose_preview_window_after_insertion = 0

 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter> <Plug>(EasyAlign)
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter> <Plug>(EasyAlign)

+nmap ga <Plug>(EasyAlign)
+
+" vim-gtest {{{2
+let g:gtest#highlight_failing_tests = 0
+
+nnoremap <Leader>tt :GTestRun<CR>
+nnoremap <Leader>tu :GTestRunUnderCursor<CR>

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


@@ -564,6 +743,15 @@ xmap T <Plug>Sneak_T
 omap t <Plug>Sneak_t
 omap T <Plug>Sneak_T
 
 omap t <Plug>Sneak_t
 omap T <Plug>Sneak_T
 

+" vimviki {{{2
+let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}]
+let g:vimwiki_auto_chdir = 1
+augroup myvimwiki
+  au! BufRead            $XDG_DATA_HOME/vimwiki/index.wiki   !git -C "%:p:h" pull -q
+  au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git -C "%:p:h" pull -q
+  au! BufWritePost       $XDG_DATA_HOME/vimwiki/*.wiki       exe '!git add "<afile>";git commit -qm"' . strftime("%FT%R") . '";git push -q'
+augroup END
+

 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the
 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the


@@ -574,6 +762,35 @@ 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]
+    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>:lcd %:p:h<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"]


@@ -603,3 +820,27 @@ endfunction
 nnoremap <silent> coS :call SwitchSpell()<CR>
 " fix spelling with first choice
 nnoremap <Leader>f 1z=
 nnoremap <silent> coS :call SwitchSpell()<CR>
 " fix spelling with first choice
 nnoremap <Leader>f 1z=

+
+" gitdir or home {{{2
+" from derek wyatt:
+" http://git.io/v3GAV
+function! FindGitDirOrHome()
+  let filedir = expand('%:p:h')
+  if isdirectory(filedir)
+    let cmd = 'bash -c "(cd ' . filedir . '; git rev-parse --show-toplevel 2>/dev/null)"'
+    let gitdir = system(cmd)
+    if strlen(gitdir) == 0
+      return '~'
+    else
+      return gitdir[:-2]
+    endif
+  else
+    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: