Adding editorconfig support

[vimconf.git] / init.vim

diff --git a/init.vim b/init.vim
index 75f8c34f1c917612f5b0eaaf8848e0033497b0fe..e8dac98d6375e37a557a6cecd6515294f8259663 100644 (file)
--- a/init.vim
+++ b/init.vim
@@ -44,6 +44,8 @@ end
 
 syntax on
 
+" Load some macros
+runtime macros.vim
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some global plugin settings
@@ -58,6 +60,8 @@ endif
 
 runtime plugsetup.vim
 
+let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']
+
 " Some preferences for indent detection
 let g:detectindent_min_indent = 2
 let g:detectindent_max_indent = 4
@@ -103,8 +107,12 @@ let NERDTreeQuitOnOpen=1
 let g:neomake_c_enabled_makers = ['clangtidy', 'clangcheck']
 let g:neomake_cpp_enabled_makers = ['clangtidy', 'clangcheck']
 
-call neomake#configure#automake('w')
-"let g:neomake_logfile = '/tmp/neomake.log'
+" Taken from neomake
+if OnBattery()
+  call neomake#configure#automake('w')
+else
+  call neomake#configure#automake('nw', 1000)
+endif
 
 let g:clang_compilation_database = '.'
 
@@ -193,7 +201,6 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/',
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-runtime macros.vim
 runtime keymaps.vim
 
 if filereadable($HOME . '/.vim/init-local.vim')