remove firefox from installer

[dotfiles.git] / base / .vimrc

diff --git a/base/.vimrc b/base/.vimrc
index 7469238bcfb515655220309c0c3f7c140f56deed..0affbd2bdf321b0f24137fe3d03ad8f38aeae3e7 100644 (file)
--- a/base/.vimrc
+++ b/base/.vimrc
@@ -1,18 +1,18 @@
-if v:progname =~? "evim"
-  finish
-endif
 source $VIMRUNTIME/defaults.vim
 
 packadd matchit
 
+set modeline "!!!
+
 set backup
-set backupdir=$HOME/tmp/vim//
+set backupdir=$HOME/var/tmp/vim//
 set undofile
-set undodir=$HOME/tmp/vim//
+set undodir=$HOME/var/tmp/vim//
 
 set autoindent
 set colorcolumn=80
 highlight ColorColumn term=NONE ctermbg=0
+" filetype should be on from defaults.vim
 autocmd FileType python     setlocal tabstop=4 shiftwidth=4 expandtab
 autocmd FileType markdown   setlocal tabstop=4 shiftwidth=4 expandtab
 autocmd FileType javascript setlocal tabstop=2 shiftwidth=2 expandtab
@@ -30,5 +30,11 @@ autocmd InsertEnter * setlocal norelativenumber
 autocmd InsertLeave * setlocal   relativenumber
 autocmd FocusLost   * setlocal norelativenumber
 autocmd FocusGained * setlocal   relativenumber
+highlight WhiteSpaceBol ctermfg=DarkBlue
+highlight WhiteSpaceMol ctermfg=Black
+match WhiteSpaceMol / /
+2match WhiteSpaceBol /\(^ \+\)\|\( \+$\)/
+
+let g:Modeliner_format='ft= fenc= et ts= sts= sw= tw='
 
-" vim:sts=4:sw=4:et:tw=79
+" vim: set et fenc=utf-8 ft=vim sts=4 sw=4 ts=8 tw=79 :