X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=aa86714d76c608905b253a37d67c73fc0717a9aa;hp=20d9cb680867f700b7c6f5ee0c5b01ba369c870d;hb=a6f5b4dbb1b87a7a39b922a1a725a1706bff9c95;hpb=1efe691122790ce96466f1a05fc65de61b91c3cf

diff --git a/init.vim b/init.vim
index 20d9cb6..aa86714 100644
--- a/init.vim
+++ b/init.vim
@@ -35,23 +35,34 @@ set wildmode=longest,list:full
 
 set tabpagemax=100
 
+" Some terminals cause weired symbols due to broken cursor-shape termcodes.
 if has('nvim')
-    set guicursor=
+    "set guicursor=
+    " Workaround some broken plugins which set guicursor indiscriminately.
+    "au OptionSet guicursor noautocmd set guicursor=
 end
 
 syntax on
 
+" Load some macros
+runtime macros.vim
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some global plugin settings
 
-" Enable loading of devicons
-let g:enable_plugin_devicons = 1
+" Disable devicons on linux terminal
+if $TERM == 'linux'
+    let g:enable_plugin_devicons=0
+" Enable loading of devicons on all others
+else
+    let g:enable_plugin_devicons=1
+endif
 
 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
@@ -94,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 = '.'
 
@@ -104,7 +120,7 @@ let g:python3_host_prog = '/usr/bin/python3'
 " deoplete requires huge startuptime. Delay loading upon first InsertEnter.
 let g:deoplete#enable_at_startup = 0
 let g:deoplete#enable_smart_case = 1
-autocmd InsertEnter * call deoplete#enable()
+au InsertEnter * call deoplete#enable()
 
 "augroup pencil
   "au!
@@ -119,24 +135,14 @@ let g:vim_markdown_frontmatter=1
 let g:vim_markdown_math=1
 
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Some filetype settings
-
-" mutt and neomutt
-au BufRead,BufNewFile ~/.mutt/tmp/*mutt-* set filetype=mail
-au BufRead,BufNewFile *.muttrc set filetype=muttrc
-
-au BufRead,BufNewFile *.cls set filetype=tex
-
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some filetype-specific settings
 
 au FileType text,markdown,mail,tex,gitcommit,mediawiki,vimwiki setlocal spell
-au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki set fo+=n
+au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki setlocal fo+=n
 
-au Filetype go set shiftwidth=8 tabstop=8 noexpandtab
-au Filetype tex set shiftwidth=2 tabstop=2
+au Filetype go setlocal shiftwidth=8 tabstop=8 noexpandtab
+au Filetype tex setlocal shiftwidth=2 tabstop=2
 
 au FileType mediawiki setlocal wrap linebreak tw=0
 
@@ -145,7 +151,7 @@ au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/
 au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/
 
 " Line wrap crippled with numbers shown
-au Filetype man set nonumber
+au Filetype man setlocal nonumber
 
 " Java completion
 au FileType java setlocal omnifunc=javacomplete#Complete
@@ -174,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:.'
@@ -194,7 +200,6 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/',
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-runtime macros.vim
 runtime keymaps.vim
 
 if filereadable($HOME . '/.vim/init-local.vim')