X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/e9f19f21938eba4062c06b671ea73730504850a6..c36e537c1f2678a92d150e7a5c4e23b502fededf:/vim/vimrc?ds=inline
diff --git a/vim/vimrc b/vim/vimrc
index 8725572..c487252 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,81 +1,168 @@
-" My vimrc.
-"
-" Author: Samir Benmendil <samir.benmendil[at]gmail[dot]com>
-"
+" runtimepath {{{1
+set runtimepath ^=$XDG_CONFIG_HOME/vim
+set runtimepath +=$XDG_CONFIG_HOME/vim/after
+
+" force python3
+if has('python3') | endif
" plugins {{{1
-filetype off
-set runtimepath& " reset rtp
" remove all autocommands
autocmd!
-set runtimepath+=$XDG_DATA_HOME/vim/vundle
-call vundle#rc('$XDG_DATA_HOME/vim')
-
-Plugin 'gmarik/vundle'
-
-Plugin 'airblade/vim-gitgutter'
-Plugin 'bling/vim-airline'
-Plugin 'derekwyatt/vim-fswitch'
-Plugin 'elzr/vim-json'
-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 'raimondi/delimitmate'
-Plugin 'rking/ag.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 'vim-scripts/yankring.vim'
+call plug#begin('$XDG_DATA_HOME/vim')
+" This does not update vim-plug, use PlugUpgrade instead
+Plug 'junegunn/vim-plug'
+
+Plug 'airblade/vim-gitgutter' " {{{
+" prefer other signs such as ycm diags
+let g:gitgutter_sign_priority = 1
+" don't clobber other signs
+let g:gitgutter_sign_allow_clobber = 0
+"}}}
+Plug 'alepez/vim-gtest'
+Plug 'alx741/vinfo'
+Plug 'andrewradev/sideways.vim' " {{{2
+nnoremap <silent> ,h :SidewaysLeft<CR>:delmarks z<CR>
+nnoremap <silent> ,l :SidewaysRight<CR>:delmarks z<CR>
+"}}}
+Plug 'andrewradev/switch.vim'
+if !has('nvim')
+ Plug 'bling/vim-airline' "{{{2
+ let g:airline#extensions#whitespace#enabled = 1
+ let g:airline#extensions#tabline#enabled = 1
+ let g:airline#extensions#searchcount#enabled = 0
+ let g:airline_powerline_fonts = 1
+
+ let g:asyncrun_status = "stopped"
+ " let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
+ "}}}
+endif
+
+Plug 'chrisbra/checkattach'
+Plug 'derekwyatt/vim-fswitch'
+Plug 'elzr/vim-json'
+Plug 'firef0x/pkgbuild.vim'
+Plug 'junegunn/vim-easy-align'
+Plug 'justinmk/vim-sneak'
+Plug 'klen/python-mode'
+Plug 'kshenoy/vim-signature'
+Plug 'majutsushi/tagbar'
+Plug 'octol/vim-cpp-enhanced-highlight'
+Plug 'raimondi/delimitmate'
+Plug 'sgeb/vim-diff-fold'
+Plug 'skywind3000/asyncrun.vim' " {{{2
+command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
+let g:asyncrun_open = 10
+"}}}
+Plug 'shougo/unite.vim'
+Plug 'shougo/vimproc.vim', {'do': 'make'}
+Plug 'sjl/gundo.vim'
+Plug 'thinca/vim-qfreplace'
+Plug 'tomtom/tcomment_vim'
+Plug 'tpope/vim-abolish'
+Plug 'tpope/vim-characterize'
+Plug 'tpope/vim-endwise'
+Plug 'tpope/vim-eunuch'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-scriptease'
+Plug 'tpope/vim-speeddating'
+Plug 'tpope/vim-surround' "investigate vim-sandwich
+Plug 'tpope/vim-unimpaired'
+Plug 'tweekmonster/spellrotate.vim'
+Plug 'valloric/youcompleteme', { 'do': './install.py --clangd-completer --clang-completer' }
+Plug 'vim-scripts/mediawiki.vim'
+Plug 'vim-scripts/replacewithregister'
+Plug 'vim-scripts/yankring.vim'
+Plug 'wincent/loupe'
+
+" colorschemes
+Plug 'morhetz/gruvbox' " {{{2
+let g:gruvbox_contrast_dark = 'hard'
+let g:gruvbox_contrast_light = 'soft'
+
+if !has('nvim')
+ Plug 'arcticicestudio/nord-vim' " {{{2
+ let g:nord_bold = 1
+ let g:nord_italic = 1
+ let g:nord_italic_comments = 1
+ let g:nord_underline = 1
+ let g:nord_uniform_status_lines = 0
+ let g:nord_uniform_diff_background = 0
+ let g:nord_cursor_line_number_background = 0
+ let g:nord_bold_vertical_split_line = 0
+endif
+
+"}}}
" 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'
-
-Plugin 'kana/vim-textobj-user'
-Plugin 'julian/vim-textobj-variable-segment'
-Plugin 'sgur/vim-textobj-parameter'
-
-" remove entries first
-set runtimepath -=$HOME/.vim
-set runtimepath -=$HOME/.vim/after
-set runtimepath -=$XDG_CONFIG_HOME/vim
-set runtimepath -=$XDG_CONFIG_HOME/vim/after
-" then prepend and append them
-set runtimepath ^=$XDG_CONFIG_HOME/vim
-set runtimepath +=$XDG_CONFIG_HOME/vim/after
+Plug 'sirver/ultisnips'
+Plug 'honza/vim-snippets'
+
+" text objects
+Plug 'kana/vim-textobj-user'
+Plug 'julian/vim-textobj-variable-segment'
+Plug 'sgur/vim-textobj-parameter'
+Plug 'kana/vim-operator-user'
+
+" staging
+" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
+Plug 'imsnif/kdl.vim'
+
+Plug 'puremourning/vimspector'
+Plug 'ilyachur/cmake4vim'
+Plug 'ilyachur/gtest-vim'
+
+Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
+Plug 'vim-scripts/syntaxrange'
+
+let g:org_agenda_files = ['~/org/*.org']
+
+Plug 'neovimhaskell/haskell-vim' " {{{2
+let g:haskell_enable_quantification = 1 " to enable highlighting of `forall`
+let g:haskell_enable_recursivedo = 1 " to enable highlighting of `mdo` and `rec`
+let g:haskell_enable_arrowsyntax = 1 " to enable highlighting of `proc`
+let g:haskell_enable_pattern_synonyms = 1 " to enable highlighting of `pattern`
+let g:haskell_enable_typeroles = 1 " to enable highlighting of type roles
+let g:haskell_enable_static_pointers = 1 " to enable highlighting of `static`
+let g:haskell_backpack = 1 " to enable highlighting of backpack keywords
+
+let g:haskell_indent_before_where = 2
+" }}}
+
+Plug 'aklt/plantuml-syntax'
+
+Plug 'mtth/scratch.vim' " {{{2
+ let g:scratch_no_mappings = 1
+ let g:scratch_autohide = 0
+"}}}
+
+let g:man_hardwrap = 80
+if !has('nvim')
+ Plug 'vim-utils/vim-man' " {{{2
+ let g:man_width = 80
+"}}}
+endif
+
+Plug 'jenterkin/vim-autosource' " {{{2
+ let g:autosource_hashdir = $XDG_CACHE_HOME . '/vim/vim-autosource'
+ let g:autosource_conf_names = ['.vimrc', '.vimrc.lua']
+"}}}
+call plug#end()
filetype plugin indent on
+syntax on
" colorscheme {{{1
-syntax on
-colorscheme badwolf
+set background=dark
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+set termguicolors
+if !has('nvim')
+ colorscheme $THEME
+endif
+"TODO see how I can integrate this into a theme that customises upstream Nord
+hi debugPC term=reverse ctermbg=8
" options {{{1
" moving around, searching and patterns {{{2
@@ -85,28 +172,36 @@ 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 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
-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 breakindent " preserve indentation in wrapped text
set lazyredraw " don't redraw while executing macros
set list " show chars defined in 'listchars'
-set listchars=tab:â¸\ " list of strings used for list mode
+set listchars=tab:â\ " list of strings used for list mode
set listchars+=extends:â¯,precedes:â®
+set listchars+=nbsp:â£
" Only shown when not in insert mode
+set listchars+=trail:·
augroup trailing
au!
- au InsertEnter * :set listchars-=trail:·
- au InsertLeave * :set listchars+=trail:·
+ au FileType qf setlocal listchars-=trail:·
+ 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 display+=lastline " display as much as possible of last line
set fillchars=diff:⣿,vert:â
@@ -135,13 +230,23 @@ set ttyfast
" using the mouse {{{2
set mouse=rnv " list of flags for using the mouse
-set ttymouse=xterm " type of mouse
+if !has('nvim')
+ set ttymouse=xterm " type of mouse
+endif
" 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
@@ -149,11 +254,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 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-=octal " don't inc/dec octal numbers with ^[AX]
+
+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|
-set nrformats=hex " number formats recognized for CTRL-A and CTRL-X commands
-
-set complete=.,w,b,u,t
" whether to use a popup menu for Insert mode completion
set completeopt=longest,menuone,preview
@@ -171,11 +290,18 @@ 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
-" save and restore folds
-set viewoptions=cursor " only save cursor position
+" open folds when jumping to line
+set foldopen+=jump
+
+set viewoptions=cursor " save cursor position
+set viewoptions+=folds " save folds
" 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
+set diffopt+=internal
+set diffopt+=algorithm:patience
" reading and writing files {{{2
set modeline " read modelines
@@ -189,7 +315,9 @@ set backupskip+=.netrc " skip netrc
set backupskip+=/dev/shm/pass* " skip passwordstore files
set undofile " persistent undo history
-set undodir=$XDG_CACHE_HOME/vim/undo//
+if !has('nvim')
+ set undodir=$XDG_CACHE_HOME/vim/undo//
+endif
augroup undoskip
au!
@@ -209,6 +337,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 wildignorecase " ignore case when completing file names
set wildignore+=.hg,.git,.svn " Version control
set wildignore+=*.aux,*.out,*.toc " LaTeX intermediate files
@@ -220,12 +349,31 @@ set wildignore+=*.luac " Lua byte code
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
-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 virtualedit+=onemore " allow the cursor to move just past the end of the line
+if !has('nvim')
+ " viminfo defaults but save file in .cache
+ set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo
+else
+ " shada is the replacement format for viminfo
+ " this setting is probably not needed as it's most likely the default
+ " the default path is in XDG_DATA_HOME, which is fine
+ set shada='100,<50,s10,h
+endif
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
@@ -257,14 +405,49 @@ augroup cursor_pos
\ 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
-" allow both <space> and / to be <leader>
+" allow both <space> and \ to be <leader>
map <space> <leader>
" make
-nnoremap <leader>r :make<cr>
-nnoremap <leader><cr> :make<cr>
+function! MakeWithOpt()
+ " TODO only do this if makeprg matches make
+ " if &makeprg =~ "make"
+ let l:make_dir = ""
+ if exists("b:make_dir")
+ let l:make_dir = "-C ".b:make_dir
+ elseif exists("t:make_dir")
+ let l:make_dir = "-C ".t:make_dir
+ elseif exists("g:make_dir")
+ let l:make_dir = "-C ".g:make_dir
+ endif
+
+ let l:make_targets = ""
+ if exists("g:make_targets")
+ let l:make_targets = g:make_targets
+ endif
+ execute "Make ".l:make_dir." ".l:make_targets
+endf
+nnoremap <silent> <leader>r :call MakeWithOpt()<cr>
" unhighlight search
nnoremap <silent> <Leader>/ :silent nohl<CR>
@@ -278,8 +461,21 @@ 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>
@@ -292,7 +488,11 @@ noremap ' `
nnoremap vv ^vg_
" Unfuck my screen
-nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
+nnoremap U
+ \ :syntax sync fromstart<cr>
+ \ :AirlineRefresh<cr>
+ \ :call popup_clear(1)<cr>
+ \ :redraw!<cr>
" Ranger
" nnoremap <leader>r :silent !ranger %:h<cr>:redraw!<cr>
@@ -314,6 +514,7 @@ nnoremap N Nzzzv
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 ^
@@ -322,14 +523,14 @@ vnoremap H ^
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')
-noremap <expr> k (v:count == 0 ? 'gk' : 'k')
+noremap <silent><expr> j (v:count == 0 ? 'gj' : 'j')
+noremap <silent><expr> k (v:count == 0 ? 'gk' : 'k')
" disable arrows
noremap <Up> <NOP>
@@ -352,20 +553,22 @@ cnoremap <C-L> <Right>
" 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
-nnoremap <C-H> <C-W>W
+" move between windows (skip previewwindow)
+nnoremap <silent> <C-L> <C-W>w<C-W>:if &previewwindow \| wincmd w \| endif<CR>
+nnoremap <silent> <C-H> <C-W>W<C-W>:if &previewwindow \| wincmd W \| endif<CR>
+tnoremap <silent> <C-L> <C-W>w<C-W>:if &previewwindow \| wincmd w \| endif<CR>
+tnoremap <silent> <C-H> <C-W>W<C-W>:if &previewwindow \| wincmd W \| endif<CR>
"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>
@@ -380,40 +583,46 @@ map Q gq
" 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>
-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
-autocmd BufWinLeave *.* mkview
-autocmd BufWinEnter *.* silent loadview
-
" save with sudo
-cnoremap w!! w !sudo tee % > /dev/null
+cabbrev w!! SudoWrite
" uppercase previous word
inoremap <C-C> <Esc>gUiwgi
-" plugins options {{{1
-" ag {{{2
-let g:AgSmartCase = 1
-nnoremap <leader>ag yiw:Ag "<cr>
-vnoremap <leader>ag y:Ag "<cr>
-
-" airline {{{2
-let g:airline#extensions#whitespace#enabled = 1
-let g:airline#extensions#tabline#enabled = 1
-let g:airline_powerline_fonts = 1
+" 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
" checkattach {{{2
let g:checkattach_filebrowser = 'ranger'
let g:checkattach_once = 'y'
+" 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>
+
" delimitmate {{{2
let delimitMate_expand_cr = 2
let g:delimitMate_expand_space = 1
@@ -422,22 +631,54 @@ 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>fj :FSBelow<CR>
+nnoremap <silent> <Leader>fk :FSAbove<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>
" delete fugitive buffers when closed
autocmd BufReadPost fugitive://* set bufhidden=delete
-nnoremap <silent> <leader>gs :Gstatus<CR>
-nnoremap <silent> <leader>gd :Gdiff<CR>
-nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
+function! GitToggle()
+ let l:status_buffer = bufname('^fugitive:///*/.git{/worktrees/*,}//$')
+ if buflisted(l:status_buffer)
+ execute 'bdelete '.l:status_buffer
+ else
+ Git
+ 16wincmd_
+ endif
+endfunction
+command! GitToggle :call GitToggle()
+command! GToggle GitToggle
+nnoremap <silent> <leader>gs :GitToggle<CR>
+
+nnoremap <silent> <leader>gd :Gdiffsplit<CR>
+nnoremap <silent> <leader>gc :echohl WarningMsg \| echo "use \<leader>gcc instead" \| echohl None<CR>
+nnoremap <silent> <leader>gcc :tab G commit -v<CR>
+nnoremap <silent> <leader>gca :tab G commit -v --amend<CR>
+nnoremap <leader>gcf :tab G commit -v --fixup=
+nnoremap <silent> <leader>gp :echohl WarningMsg \| echo "use \<leader>gpp instead" \| echohl None<CR>
+nnoremap <silent> <leader>gpp :Git push \| copen<CR>
+nnoremap <silent> <leader>gpf :Git push --force-with-lease \| copen<CR>
+nnoremap <silent> <leader>gll :Git pull<CR>
+nnoremap <silent> <leader>gru :Git rebase --interactive @{upstream}<CR>
+nnoremap <silent> <leader>grp :Git rebase --interactive @{push}<CR>
nnoremap <silent> <leader>ga :Gwrite<cr>
-nnoremap <silent> <leader>gb :Gblame<cr>
+nnoremap <silent> <leader>gb :G blame<cr>
+
+augroup fugitive_gstatus
+ au!
+ autocmd User FugitiveIndex setlocal winfixheight
+ autocmd User FugitiveIndex nmap <buffer> <leader><space> =
+augroup end
" Gundo {{{2
nnoremap <F7> :GundoToggle<CR>
+let g:gundo_prefer_python3 = 1
" indent-guides {{{2
let g:indent_guides_default_mapping = 0
@@ -446,23 +687,38 @@ nmap <silent> cog <Plug>IndentGuidesToggle
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
-
" 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_lint_cwindow = 0 " don't open cwindow when linting
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"
+let g:switch_custom_definitions = [
+ \ ['yes', 'no']
+ \ ]
+
+" 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'
@@ -472,6 +728,8 @@ let g:syntastic_style_warning_symbol='S'
let g:syntastic_always_populate_loc_list=1
nmap <silent> <leader>y :SyntasticCheck<cr>
+let g:syntastic_cpp_clang_tidy_post_args = "-p build*"
+
if ! &diff
let g:syntastic_check_on_open=1
endif
@@ -484,10 +742,17 @@ let g:tagbar_autoshowtag = 1
let g:tagbar_width = 25
let g:tagbar_iconchars = ['+', '-']
-" UltiSnips {{{2
+" tcomments {{{2
+let g:tcomment_textobject_inlinecomment = 'gic'
+let g:tcomment#filetype#guess = 0
+"let g:tcomment#options = {'whitespace' : 'no'}
+
+" ultisnips {{{2
let g:UltiSnipsEditSplit = 'vertical'
-let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
-let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
+if has('fname_case')
+ let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+endif
let g:UltiSnipsExpandTrigger = "<tab>"
let g:UltiSnipsJumpForwardTrigger = "<tab>"
let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
@@ -514,6 +779,61 @@ 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'
+ \ })
+
+nnoremap [unite] <Nop>
+nmap <leader>u [unite]
+nnoremap [unite]u :UniteResume<CR>
+nnoremap <silent> [u :UnitePrevious<CR>
+nnoremap <silent> ]u :UniteNext<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:.::<CR>
+nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:<CR>
+command! -nargs=+ 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-jumplist {{{3
+nnoremap <silent> [unite]j :<C-u>Unite output:jumps:<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')
@@ -526,26 +846,41 @@ function! YRRunAfterMaps()
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_clangd_binary_path = 'clangd' " use clangd in path
+let g:ycm_clangd_args = ['--clang-tidy']
let g:ycm_extra_conf_vim_data = ['getcwd()']
let g:ycm_add_preview_to_completeopt = 1
+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']
-nnoremap <leader>jd :YcmCompleter GoTo<CR>
+
+let g:ycm_language_server =
+ \ [
+ \ {
+ \ 'name': 'haskell',
+ \ 'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
+ \ 'filetypes': [ 'haskell', 'lhaskell' ]
+ \ },
+ \ ]
" vim-easy-align {{{2
" start interactive EasyAlign in visual mode
-vmap <Enter> <Plug>(EasyAlign)
+vmap <Enter> <Esc>:echohl WarningMsg \| echo "EasyAlign mapped to <leader>a now" \| echohl None<CR>
+vmap <leader>a <Plug>(EasyAlign)
+nmap <leader>a <Plug>(EasyAlign)
+
+" vim-gtest {{{2
+let g:gtest#highlight_failing_tests = 0
+
+nnoremap <silent> <Leader>tt :GTestRun<CR>
+nnoremap <Leader>tc :GTestCase<space>
+nnoremap <Leader>tn :GTestName<space>
+nnoremap <silent> <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
+nnoremap <silent> <Leader>tu :GTestRunUnderCursor<CR>
" vim-json {{{2
let g:vim_json_syntax_conceal = 0
-" vim-latex {{{2
-let g:tex_flavor='latex'
-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
@@ -575,6 +910,35 @@ if !exists(":DiffOrig")
\ | 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, ext = '.vim')
+ 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.a:ext
+ 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 :call EditConfig('ultisnips', '.snippets')<CR>
+
" spell check {{{2
" http://tex.stackexchange.com/a/52932
let g:myLangList=["en_gb","en_us","de","fr"]
@@ -604,3 +968,27 @@ endfunction
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! Cdr execute('cd ' . FindGitDirOrHome())
+command! LCd lcd %:h
+command! LCdr execute('lcd ' . FindGitDirOrHome())
+
+" vim:set et sw=2 ts=2 tw=78: