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

diff --git a/init.vim b/init.vim
index 20d9cb6..d9e0373 100644
--- a/init.vim
+++ b/init.vim
@@ -45,8 +45,13 @@ syntax on
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " 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
 
@@ -123,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
 
@@ -145,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