awesome/theme: add missing awful import

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 211a64bd0a88225ee7d51e78ff2d7511621f5214..a00f033a51f1afc81b8644902736b4f8a2f0341f 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -88,6 +88,18 @@ Plug 'vim-scripts/syntaxrange'
 
 let g:org_agenda_files = ['~/org/*.org']
 
 
 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
 call plug#end()
 
 filetype plugin indent on


@@ -559,7 +571,7 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
 
 nnoremap <silent> <leader>gs :Git<CR>
 nnoremap <silent> <leader>gd :Gdiffsplit<CR>
 
 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>
 
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :G blame<cr>
 


@@ -644,7 +656,7 @@ let g:tcomment#filetype#guess = 0
 
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 
 " 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
 if has('fname_case')
   let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
 endif