firefox/user.js, new fonts, fontconfig, modeliner

[dotfiles.git] / base / .vimrc

diff --git a/base/.vimrc b/base/.vimrc
index c3cff3fdaed1d4a052f32b22addf6f48a99b4b54..fb3c4d40262169c9084c068a3276f78a06b2f3f6 100644 (file)
--- a/base/.vimrc
+++ b/base/.vimrc
@@ -1,10 +1,9 @@
-if v:progname =~? "evim"
-  finish
-endif

 source $VIMRUNTIME/defaults.vim
 
 packadd matchit
 
 source $VIMRUNTIME/defaults.vim
 
 packadd matchit
 

+set modeline "!!!
+

 set backup
 set backupdir=$HOME/var/tmp/vim//
 set undofile
 set backup
 set backupdir=$HOME/var/tmp/vim//
 set undofile


@@ -13,6 +12,7 @@ set undodir=$HOME/var/tmp/vim//
 set autoindent
 set colorcolumn=80
 highlight ColorColumn term=NONE ctermbg=0
 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
 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


@@ -31,4 +31,6 @@ autocmd InsertLeave * setlocal   relativenumber
 autocmd FocusLost   * setlocal norelativenumber
 autocmd FocusGained * setlocal   relativenumber
 
 autocmd FocusLost   * setlocal norelativenumber
 autocmd FocusGained * setlocal   relativenumber
 

-" vim:sts=4:sw=4:et:tw=79
+let g:Modeliner_format='ft= fenc= et ts= sts= sw= tw='
+
+" vim: set et fenc=utf-8 ft=vim sts=4 sw=4 ts=8 tw=79 :