From 872edc9f66a9e2d7ba8f17b2f84d7ac75cd93905 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 10 Nov 2018 17:20:21 +0100
Subject: [PATCH] switch to plug and neomake

---
 init.vim | 65 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/init.vim b/init.vim
index 2a40c0c..c7a3fdf 100644
--- a/init.vim
+++ b/init.vim
@@ -3,9 +3,10 @@
 ""
 
 " Vim environment
-let cache   = $XDG_CACHE_HOME .'/nvim'
+let data    = $XDG_DATA_HOME.'/nvim'
 let config  = $XDG_CONFIG_HOME.'/nvim'
-let plugins = cache.'/plugins'
+let cache   = $XDG_CACHE_HOME .'/nvim'
+let plugins = data.'/plugins'
 
 let &directory = cache.',~/,/tmp'
 let &backupdir = cache.',~/,/tmp'
@@ -23,27 +24,31 @@ set undofile
 "" Plugins
 ""
 
-let &rtp .= ','.plugins.'/Vundle.vim'
-call vundle#begin(plugins)
+call plug#begin(plugins)
 
-Plugin 'VundleVim/Vundle.vim'
-Plugin 'kien/ctrlp.vim'
-Plugin 'itchyny/lightline.vim'
-Plugin 'townk/vim-autoclose'
-Plugin 'tpope/vim-fugitive'
-Plugin 'travitch/hasksyn'
-Plugin 'vim-pandoc/vim-pandoc-syntax'
-Plugin 'LnL7/vim-nix'
-Plugin 'kchmck/vim-coffee-script'
-Plugin 'ngn/vim-apl'
-Plugin 'hdima/python-syntax'
-Plugin 'ervandew/supertab'
-Plugin 'majutsushi/tagbar'
-Plugin 'scrooloose/syntastic'
-Plugin 'airblade/vim-gitgutter'
-Plugin 'mbbill/undotree'
+" UI
+Plug 'kien/ctrlp.vim'
+Plug 'itchyny/lightline.vim'
+Plug 'airblade/vim-gitgutter'
+Plug 'majutsushi/tagbar',           { 'on' : 'TagbarToggle' }
+Plug 'mbbill/undotree',             { 'on' : 'UndotreeToggle' }
+Plug 'milkypostman/vim-togglelist'
 
-call vundle#end()
+" Syntax
+Plug 'travitch/hasksyn'
+Plug 'LnL7/vim-nix'
+Plug 'ngn/vim-apl'
+Plug 'vim-pandoc/vim-pandoc-syntax'
+Plug 'kchmck/vim-coffee-script'
+Plug 'hdima/python-syntax'
+
+" Misc
+Plug 'townk/vim-autoclose'
+Plug 'tpope/vim-fugitive'
+Plug 'ervandew/supertab'
+Plug 'neomake/neomake'
+
+call plug#end()
 
 
 ""
@@ -126,13 +131,17 @@ noremap O O<ESC>
 " Lightline
 runtime lightline.vim
 
-" Syntastic
-let g:syntastic_check_on_open     = 1
-let g:syntastic_enable_signs      = 1
-let g:syntastic_auto_jump         = 0
-let g:syntastic_shell             = "/bin/sh"
-let g:syntastic_python_checkers   = ["flake8"]
-let g:syntastic_python_python_exe = 'python3'
+" Neomake
+call neomake#configure#automake('nwr', 750)
+let g:neomake_warning_sign = {
+  \ 'text': 'W→',
+  \ 'texthl': 'WarningMsg',
+  \ }
+let g:neomake_error_sign = {
+  \ 'text': 'E→',
+  \ 'texthl': 'ErrorMsg',
+  \ }
+let g:neomake_highlight_lines = 1
 
 " Tagbar
 let g:tagbar_status_func = "TagbarStatusFunc"