add git pushall alias to .gitconfig

[dotfiles.git] / base / .vimrc

diff --git a/base/.vimrc b/base/.vimrc
index 7e81fe317e464e6719817090374bf6ad0d9cf6c9..7469238bcfb515655220309c0c3f7c140f56deed 100644 (file)
--- a/base/.vimrc
+++ b/base/.vimrc
@@ -12,20 +12,23 @@ set undodir=$HOME/tmp/vim//
 
 set autoindent
 set colorcolumn=80
+highlight ColorColumn term=NONE ctermbg=0
 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
+
+" vim:sts=4:sw=4:et:tw=79