summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vimrc11
1 files changed, 4 insertions, 7 deletions
diff --git a/vimrc b/vimrc
index aa896e6..a58bc93 100644
--- a/vimrc
+++ b/vimrc
@@ -14,7 +14,7 @@ set background=dark " color scheme for dark background
set title " set terminal title
set ruler " show line/column of cursor in status line
set tabstop=4 " display a tab as 4 spaces
-"set softtabstop=4 " (soft) indent tabs with 4 spaces
+set softtabstop=-1 " use value of shiftwidth for softtabstop
set shiftwidth=4 " (auto)indent with 4 spaces (> <)
set noexpandtab " don't expand tabs to spaces
set nobackup " don't keep backup files
@@ -51,12 +51,9 @@ set viminfo+=n~/.vim/viminfo " different location for vim
set list listchars=tab:·\ ,trail:·
" autocommands
-autocmd FileType python setlocal tabstop=4 softtabstop=0
-autocmd FileType c setlocal tabstop=4 softtabstop=0 noexpandtab
-autocmd FileType perl setlocal tabstop=4 softtabstop=4 expandtab
-autocmd FileType yaml setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab
-autocmd FileType mail setlocal spell spelllang=de_20,en_us
-autocmd FileType vimwiki setlocal tabstop=4 softtabstop=4 shiftwidth=4 expandtab
+autocmd FileType yaml setlocal shiftwidth=2 expandtab
+autocmd FileType mail setlocal spell spelllang=de_20,en_us
+autocmd FileType vimwiki setlocal expandtab
autocmd InsertEnter * if &number | set norelativenumber | endif
autocmd InsertLeave * if &number | set relativenumber | endif