X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=e8dac98d6375e37a557a6cecd6515294f8259663;hp=2609899e3640fac2ae2043a0007a2a0c6d0b6a5e;hb=1b13e6bf6859f089faf9fd922e9df5c2d69e1ddc;hpb=63747432716dd8f8725bf7ffe47bc1a9a078a62f

diff --git a/init.vim b/init.vim
index 2609899..e8dac98 100644
--- a/init.vim
+++ b/init.vim
@@ -44,6 +44,8 @@ end
 
 syntax on
 
+" Load some macros
+runtime macros.vim
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some global plugin settings
@@ -58,8 +60,11 @@ 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
 let g:detectindent_preferred_indent = 4
 
 " Attention: Must be run after plugsetup.vim
@@ -102,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 = '.'
 
@@ -127,16 +136,6 @@ let g:vim_markdown_frontmatter=1
 let g:vim_markdown_math=1
 
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Some filetype settings
-
-" mutt and neomutt
-au BufRead,BufNewFile ~/.mutt/tmp/*mutt-* setlocal filetype=mail
-au BufRead,BufNewFile *.muttrc setlocal filetype=muttrc
-
-au BufRead,BufNewFile *.cls setlocal filetype=tex
-
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some filetype-specific settings
 
@@ -182,7 +181,7 @@ au FileType markdown call RagtagInit()
 
 let g:detectspelllang_langs = {}
 let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT']
-"au BufReadPost * :DetectIndent
+au BufReadPost *.java :DetectIndent
 
 au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.'
 au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'
@@ -202,7 +201,6 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/',
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-runtime macros.vim
 runtime keymaps.vim
 
 if filereadable($HOME . '/.vim/init-local.vim')