set runtimepath ^=$XDG_CONFIG_HOME/vim
set runtimepath +=$XDG_CONFIG_HOME/vim/after
+" force python3
+if has('python3') | endif
+
" plugins {{{1
" remove all autocommands
autocmd!
" This does not update vim-plug, use PlugUpgrade instead
Plug 'junegunn/vim-plug'
-Plug 'airblade/vim-gitgutter'
+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/switch.vim'
Plug 'bling/vim-airline'
Plug 'chrisbra/checkattach'
Plug 'majutsushi/tagbar'
Plug 'octol/vim-cpp-enhanced-highlight'
Plug 'raimondi/delimitmate'
-Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }
-" fix some issue with vim-clang-format not finding .clang-format
-let g:clang_format#detect_style_file = 1
-Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
-" Plug 'scrooloose/syntastic'
Plug 'sgeb/vim-diff-fold'
Plug 'shougo/unite.vim'
Plug 'shougo/vimproc.vim', {'do': 'make'}
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 'wincent/loupe'
" colorschemes
-Plug 'morhetz/gruvbox'
+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
Plug 'sirver/ultisnips'
" staging
" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
Plug 'dense-analysis/ale' " {{{2
-let g:ale_c_build_dir_names = [ 'build-Linux-x86_64' ]
let g:ale_echo_msg_format = '[%linter%] %code: %%s'
-let g:ale_c_parse_compile_commands = 1
-let g:ale_cpp_parse_compile_commands = 1
-let g:ale_cpp_gcc_options = ''
-let g:ale_cpp_clang_options = ''
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
+" }}}
+
+Plug 'aklt/plantuml-syntax'
+
+Plug 'mtth/scratch.vim' " {{{2
+ let g:scratch_no_mappings = 1
+"}}}
+
+Plug 'vim-utils/vim-man' " {{{2
+let g:man_width = 80
+"}}}
+
call plug#end()
filetype plugin indent on
" colorscheme {{{1
syntax on
set background=dark
-let g:gruvbox_contrast_dark = 'hard'
-let g:gruvbox_contrast_light = 'soft'
-colorscheme gruvbox
-" override the background to be black
-highligh Normal ctermbg=None
+colorscheme $THEME
" options {{{1
" moving around, searching and patterns {{{2
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>
" 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>
+nnoremap <silent> <leader>gs :Git<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 :G push<CR>
+nnoremap <silent> <leader>gpf :G push --force-with-lease<CR>
nnoremap <silent> <leader>ga :Gwrite<cr>
-nnoremap <silent> <leader>gb :Gblame<cr>
+nnoremap <silent> <leader>gb :G blame<cr>
augroup fugitive_gstatus
au!
" 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
end
nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>
-command! -nargs=1 Ag Unite grep:.::<args>
+command! -nargs=+ Ag Unite -input=<args> grep:.:
" 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/*']
-" ycm-clangd requires you to symlink the compile_db to the root of the project
-" 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
" vim-gtest {{{2
let g:gtest#highlight_failing_tests = 0
-nnoremap <Leader>tt :GTestRun<CR>
-nnoremap <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
-nnoremap <Leader>tu :GTestRunUnderCursor<CR>
+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
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
repos / dotfiles.git / blobdiff