mutt: unset signature to silence warning at startup

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 211a64bd0a88225ee7d51e78ff2d7511621f5214..534116d2eac0f115dba86901c76423d61dfce521 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -34,8 +34,6 @@ Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
-Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
-" Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'
 Plug 'shougo/vimproc.vim', {'do': 'make'}
@@ -88,6 +86,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
@@ -559,7 +569,7 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
 
 nnoremap <silent> <leader>gs :Git<CR>
 nnoremap <silent> <leader>gd :Gdiffsplit<CR>
-nnoremap <silent> <leader>gc :G commit -v<CR>
+nnoremap <silent> <leader>gc :tab G commit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :G blame<cr>
 
@@ -644,7 +654,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
@@ -742,6 +752,7 @@ endfunction
 
 " youcompleteme {{{2
 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
@@ -782,15 +793,6 @@ xmap 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