X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=aa86714d76c608905b253a37d67c73fc0717a9aa;hp=a14e564944123c94897a0b61e9a5a9f8f155618c;hb=a6f5b4dbb1b87a7a39b922a1a725a1706bff9c95;hpb=27c4074e11eafdfbf0f031748a5f2ee8dbf5d06c

diff --git a/init.vim b/init.vim
index a14e564..aa86714 100644
--- a/init.vim
+++ b/init.vim
@@ -44,6 +44,8 @@ end
 
 syntax on
 
+" Load some macros
+runtime macros.vim
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some global plugin settings
@@ -60,6 +62,7 @@ runtime plugsetup.vim
 
 " 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 +105,13 @@ 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 +135,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=neomuttrc
-
-au BufRead,BufNewFile *.cls setlocal filetype=tex
-
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some filetype-specific settings
 
@@ -182,7 +180,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 +200,6 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/',
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-runtime macros.vim
 runtime keymaps.vim
 
 if filereadable($HOME . '/.vim/init-local.vim')