X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=d9e0373503ec054d11b923c7d72c51a3b66f23b0;hp=fd7e77d2a201700756727def8b22c6896457adf9;hb=5911a72d6701e4fedac1474b5bb878cfa7cab54b;hpb=b35afc843096bbfc0c5fa1f8b2afb9d32a5f22ec

diff --git a/init.vim b/init.vim
index fd7e77d..d9e0373 100644
--- a/init.vim
+++ b/init.vim
@@ -33,6 +33,8 @@ set colorcolumn=+1
 set mouse=a
 set wildmode=longest,list:full
 
+set tabpagemax=100
+
 if has('nvim')
     set guicursor=
 end
@@ -43,8 +45,20 @@ syntax on
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some global plugin settings
 
+" 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_preferred_indent = 4
+
 " Attention: Must be run after plugsetup.vim
 " Trailing whitespace
 highlight default link BadWhitespace SpellCap
@@ -114,20 +128,20 @@ 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 ~/.mutt/tmp/*mutt-* setlocal filetype=mail
+au BufRead,BufNewFile *.muttrc setlocal filetype=muttrc
 
-au BufRead,BufNewFile *.cls set filetype=tex
+au BufRead,BufNewFile *.cls setlocal 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
 
@@ -136,7 +150,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
@@ -155,6 +169,8 @@ imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
 nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 
+" Minimum indenting for source code
+au FileType java,cpp,c,cs let g:detectindent_min_indent = 4
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
@@ -163,7 +179,7 @@ au FileType markdown call RagtagInit()
 
 let g:detectspelllang_langs = {}
 let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT']
-au BufReadPost * :DetectIndent
+"au BufReadPost * :DetectIndent
 
 au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.'
 au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'