Merge branch 'master' of fucktheforce.de:xeno

1 files changed, 3 insertions, 5 deletions

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