X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/4b9a31fb825b0457cddcff1f51a616e0bf50b47e..382e25f7d8c569293f3182f10c3b15ffb93b5e90:/vim/vimrc?ds=inline

diff --git a/vim/vimrc b/vim/vimrc
index 504cbd7..a00f033 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -7,6 +7,9 @@
 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!
@@ -31,9 +34,6 @@ Plug 'kshenoy/vim-signature'
 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'
@@ -88,6 +88,18 @@ 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'
+
 call plug#end()
 
 filetype plugin indent on
@@ -557,11 +569,11 @@ 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 :Gcommit -v<CR>
+nnoremap <silent> <leader>gs :Git<CR>
+nnoremap <silent> <leader>gd :Gdiffsplit<CR>
+nnoremap <silent> <leader>gc :tab G commit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
-nnoremap <silent> <leader>gb :Gblame<cr>
+nnoremap <silent> <leader>gb :G blame<cr>
 
 augroup fugitive_gstatus
     au!
@@ -644,7 +656,7 @@ let g:tcomment#filetype#guess = 0
 
 " 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
@@ -741,9 +753,6 @@ function! YRRunAfterMaps()
 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_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1