refactored zsh configs, commented gpg-agent.conf

[dotfiles.git] / base / .vimrc

diff --git a/base/.vimrc b/base/.vimrc
index 7e81fe317e464e6719817090374bf6ad0d9cf6c9..0affbd2bdf321b0f24137fe3d03ad8f38aeae3e7 100644 (file)
--- a/base/.vimrc
+++ b/base/.vimrc
@@ -1,31 +1,40 @@
-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
 autocmd FileType json       setlocal tabstop=2 shiftwidth=2 expandtab
 autocmd FileType html       setlocal tabstop=2 shiftwidth=2 expandtab
+autocmd FileType todo       setlocal colorcolumn=0
 
 set cursorline
 set hlsearch
-nnoremap <CR> :noh<CR><CR>
 set list
 set listchars=tab:├─,extends:»,precedes:«,space:·,trail:∙,nbsp:■
 set number
 set relativenumber
-autocmd InsertEnter * :set norelativenumber
-autocmd InsertLeave * :set   relativenumber
-autocmd FocusLost   * :set norelativenumber
-autocmd FocusGained * :set   relativenumber
+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: set et fenc=utf-8 ft=vim sts=4 sw=4 ts=8 tw=79 :