X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=.vimrc;h=150a23fb9b901c999b78dcbe76ff7a5b60d9eb6e;hb=c6d7fadc21dd431d747cc89b73b198aecee8f556;hp=af5c4d6b17e7bb7d1d08cad5e847865eb1327f78;hpb=7a36d117d286d776893edd21a1184e5585884373;p=dotfiles

diff --git a/.vimrc b/.vimrc
index af5c4d6..150a23f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -26,27 +26,25 @@ set foldenable
 set foldmethod=syntax
 set foldlevelstart=99
 
-" Show line numbers.
-set number
-set numberwidth=4
-
 " Scroll five lines ahead of cursor.
 set scrolloff=5
 
 " Turn off error bells and visual bell
 set noeb vb t_vb=
 
-" Set tabs to width 4.
+" Set tabs to width 2.
 filetype plugin indent on
-set shiftwidth=4
-set softtabstop=4
-set tabstop=4
+set shiftwidth=2
+set softtabstop=2
+set tabstop=2
 set expandtab
 
-" language-specific settings
-autocmd FileType html       setlocal shiftwidth=2 softtabstop=2 tabstop=2
-autocmd FileType javascript setlocal shiftwidth=2 softtabstop=2 tabstop=2
-autocmd FileType ruby       setlocal shiftwidth=2 softtabstop=2 tabstop=2
+" language-specific settings: tab width is 4 for python
+autocmd FileType python setlocal shiftwidth=4 softtabstop=4 tabstop=4
+
+"allow projet-specific vimrcs
+set exrc
+set secure " Don't execute :autocmd in project-specific vimrcs unless owned by me
 
 " Allow backspacing over everything in insert mode.
 set backspace=indent,eol,start
@@ -93,6 +91,11 @@ syn sync fromstart
 " Set the color scheme to desert.
 colorscheme desert
 
+" Set custom whitespace display
+set list
+set showbreak=↪\ 
+set listchars=tab:\ \ →,eol:↲,nbsp:␣,trail:•,extends:⟩,precedes:⟨
+
 " Unmap the arrow keys to prevent bad habits.
 noremap  <Up> ""
 noremap! <Up> <Esc>