Merge branch 'master' of fucktheforce.de:xeno

1 files changed, 9 insertions, 3 deletions

diff --git a/vim/vimrc b/vim/vimrc
index 6a6a5ae..f634939 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,6 +2,10 @@ syntax on
 filetype plugin indent on
 set t_Co=256
 colorscheme vitamins
+set tw=0
+set sw=4
+set ts=4
+set expandtab
 set ls=0
 set number
 set noerrorbells
@@ -13,9 +17,11 @@ set shiftround
 set modeline
 set nobackup
 set nohlsearch
-"set foldenable
-"set listchars=tab:»·
-"set list         " enable tab chars
+set colorcolumn=80
+highlight ColorColumn ctermbg=darkred guibg=darkred
+set foldenable
+set listchars=tab:»·
+set list
 
 autocmd bufnewfile *.py so ~/etc/vim/header_python
 autocmd bufnewfile *.html so ~/etc/vim/header_html