" 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#begin('$XDG_DATA_HOME/vim')
-
-Plugin 'gmarik/vundle'
-
-Plugin 'AndrewRadev/switch.vim'
-Plugin 'airblade/vim-gitgutter'
-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 'justinmk/vim-sneak'
-Plugin 'klen/python-mode'
-Plugin 'kshenoy/vim-signature'
-Plugin 'majutsushi/tagbar'
-Plugin 'octol/vim-cpp-enhanced-highlight'
-Plugin 'raimondi/delimitmate'
-Plugin 'rdnetto/ycm-generator'
-Plugin 'scrooloose/syntastic'
-Plugin 'shougo/unite.vim'
-Plugin 'shougo/vimproc.vim'
-Plugin 'sjl/gundo.vim'
-Plugin 'tomtom/tcomment_vim'
-Plugin 'tpope/vim-abolish'
-Plugin 'tpope/vim-endwise'
-Plugin 'tpope/vim-eunuch'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-surround' "investigate vim-sandwich
-Plugin 'tpope/vim-unimpaired'
-Plugin 'tweekmonster/spellrotate.vim'
-Plugin 'valloric/youcompleteme'
-Plugin 'vim-scripts/mediawiki.vim'
-Plugin 'vim-scripts/replacewithregister'
-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'
+Plug 'bling/vim-airline'
+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-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
-Plugin 'flazz/vim-colorschemes'
+Plug 'morhetz/gruvbox' " {{{2
+let g:gruvbox_contrast_dark = 'hard'
+let g:gruvbox_contrast_light = 'soft'
+
+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
+
+"}}}
" snippets
-Plugin 'sirver/ultisnips'
-Plugin 'honza/vim-snippets'
+Plug 'sirver/ultisnips'
+Plug 'honza/vim-snippets'
" text objects
-Plugin 'kana/vim-textobj-user'
-Plugin 'julian/vim-textobj-variable-segment'
-Plugin 'sgur/vim-textobj-parameter'
-Plugin 'kana/vim-operator-user'
-
-" ros
-Plugin 'ompugao/ros.vim'
-Plugin 'ompugao/ctrlp-ros'
+Plug 'kana/vim-textobj-user'
+Plug 'julian/vim-textobj-variable-segment'
+Plug 'sgur/vim-textobj-parameter'
+Plug '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'
-" needs editing colorscheme
-" Plugin 'jeaye/color_coded'
" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
-Plugin 'wincent/loupe'
-Plugin 'Ram-Z/vimwiki'
-call vundle#end()
+Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
+Plug 'vim-scripts/syntaxrange'
-" 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
+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
+"}}}
+
+Plug 'vim-utils/vim-man' " {{{2
+let g:man_width = 80
+"}}}
+
+call plug#end()
filetype plugin indent on
" colorscheme {{{1
syntax on
-colorscheme badfox
+set background=dark
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+set termguicolors
+colorscheme $THEME
+"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
set listchars=tab:❭\ " list of strings used for list mode
set listchars+=extends:❯,precedes:❮
" Only shown when not in insert mode
-au InsertLeave * :set listchars+=trail:·
+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
" open folds when jumping to line
set foldopen+=jump
-" save and restore folds
-set viewoptions=cursor " only save cursor position
+set viewoptions=cursor " save cursor position
+set viewoptions+=folds " save folds
" diff mode {{{2
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
command! NoAutoChecktime let b:autochecktime=0
command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
+augroup terminal
+ au!
+ au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
+augroup END
+
" bindings {{{1
" 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>
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>
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>
map <F1> :ls<CR>:b<space>
" 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>
+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>
nnoremap ]oe :set noexpandtab<CR>
for idt in range(1,8)
- exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+ exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
endfor
" toggle auto format of text
" create folds around visual selection
vnoremap <leader><Space> zf
-autocmd BufWinLeave *.* mkview
-autocmd BufWinEnter *.* silent loadview
-
" save with sudo
-cabbrev w!! w !sudo tee % > /dev/null
+cabbrev w!! SudoWrite
" uppercase previous word
inoremap <C-C> <Esc>gUiwgi
" 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}'])
+
" checkattach {{{2
let g:checkattach_filebrowser = 'ranger'
let g:checkattach_once = 'y'
" 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 :Gcommit -v<CR>
+function! GitToggle()
+ if buflisted(bufname('.git/index'))
+ bdelete .git/index
+ 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
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
let g:tagbar_iconchars = ['+', '-']
" tcomments {{{2
-let g:tcommentTextObjectInlineComment = 'gic'
+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 = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
if has('fname_case')
let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
endif
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_recursive_opt = ''
end
nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
-command! -nargs=1 Ag Unite grep:.::<args>
+nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>
+command! -nargs=+ Ag Unite grep:.::<args>
" unite-file_rec {{{3
if executable('ag')
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'}
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']
+
+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)
nmap ga <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
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 pull
- au! BufRead $XDG_DATA_HOME/vimwiki/diary/*.wiki !git pull
- au! BufWritePost $XDG_DATA_HOME/vimwiki/*.wiki exe '!git add "<afile>";git commit -m"' . strftime("%FT%R") . '";git push'
-augroup END
-
" functions {{{1
" Convenient command to see the difference between the current buffer and the
vnoremap <silent> gs :sort<cr>
" edit configs {{{2
-function! EditConfig(what)
+function! EditConfig(what, ext = '.vim')
let l:dir = split(&runtimepath,',')[0]
if a:what == 'vimrc'
let l:file = expand($MYVIMRC)
elseif empty(&filetype)
echoe 'filetype is empty!'
else
- let l:file = l:dir.'/'.a:what.'/'.&filetype.'.vim'
+ let l:file = l:dir.'/'.a:what.'/'.&filetype.a:ext
endif
execute ':vsplit '.file
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>
+nmap <leader>eu :call EditConfig('ultisnips', '.snippets')<CR>
" spell check {{{2
" http://tex.stackexchange.com/a/52932
endif
endfunction
command! Cd cd %:h
-command! Cr execute('cd ' . FindGitDirOrHome())
+command! Cdr execute('cd ' . FindGitDirOrHome())
command! LCd lcd %:h
-command! LCr execute('lcd ' . FindGitDirOrHome())
+command! LCdr execute('lcd ' . FindGitDirOrHome())
" vim:set et sw=2 ts=2 tw=78:
repos / dotfiles.git / blobdiff