summaryrefslogtreecommitdiffstats
path: root/vim
diff options
context:
space:
mode:
authorStefan Ritter <xeno@thehappy.de>2011-08-26 11:19:45 +0200
committerStefan Ritter <xeno@thehappy.de>2011-08-26 11:19:45 +0200
commit43a556b114ee8fa5079cbe8f2ad807b63720165a (patch)
treeaded25889bea91ff118b1e899837a17e0f9a8109 /vim
parent6fdab648e7757992b5ad6cbb2ff0ec0ccced9598 (diff)
parent1e65945260e43e9c6d6f604907ce65e3e2e1ea98 (diff)
Merge branch 'master' of fucktheforce.de:xeno
Diffstat (limited to 'vim')
-rw-r--r--vim/vimrc12
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