X-Git-Url: https://code.kerkeslager.com/?p=dotfiles;a=blobdiff_plain;f=.vimrc;h=b48496e00c1d6ac8585e229fe4310dbb8b825fd2;hp=eac5995a1c3095038d813ddf96431429bee41da1;hb=342890eff5844f8cfb8eea6d07cbc912c4992a68;hpb=0474d4f3e31338874753e745545c4e344d7a6364

diff --git a/.vimrc b/.vimrc
index eac5995..b48496e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -11,6 +11,9 @@ set wildignore=*.swp,*.bak,*.pyc,*.class,*.o,*.exe
 " Set filetype stuff to on.
 filetype on
 filetype plugin on
+
+" Set up autoindentation.
+set smartindent
 filetype indent on
 
 " Example filetype-specific setting:
@@ -23,26 +26,22 @@ 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 up autoindentation.
-set smartindent
-filetype indent on
-
 " Set tabs to width 4.
-set softtabstop=4
-set tabstop=4
-set shiftwidth=4
+filetype plugin indent on
+set shiftwidth=2
+set softtabstop=2
+set tabstop=2
 set expandtab
 
+" language-specific settings
+autocmd FileType python setlocal shiftwidth=4 softtabstop=4 tabstop=4
+
 " Allow backspacing over everything in insert mode.
 set backspace=indent,eol,start
 
@@ -56,9 +55,6 @@ augroup Spacing
     autocmd FileType help,make match BadSpacing /  *$/
 augroup END
 
-" Highlight search terms.
-set hlsearch
-
 " Search as you type.
 set incsearch
 
@@ -101,14 +97,5 @@ noremap! <Left> <Esc>
 noremap  <Right> ""
 noremap! <Right> <Esc>
 
-" Map open and close items in insert mode.
-" Keep this commented out until I can get it working better.
-"inoremap { {<CR>}<Esc>O
-"inoremap [ []<Esc>i
-"inoremap ( ()<Esc>i
-"inoremap } <Esc>/}<CR>o
-"inoremap ] <Esc>/]<CR>a
-"inoremap ) <Esc>/)<CR>a
-
 " Automatically reload the .vimrc when changes are made to it
 au! BufWritePost .vimrc source %