From eafc8610aa99b4a219d819979e107c17239b409b Mon Sep 17 00:00:00 2001
From: id101010 <aaron@duckpond.ch>
Date: Wed, 31 Aug 2016 18:05:43 +0200
Subject: [PATCH] Updated zshrc and vimrc

---
 vim/vimrc | 10 +++++++---
 zsh/zshrc |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index 077bd16..3ea8e3b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,12 +1,14 @@
 "vimrc - VIM Configuration file"
 
-"Autointend"
+"Autointend and autoscroll 3 lines above the cursor"
 :set cindent
+:set scrolloff=3
 
-"Tabstop, Shiftwith and replace tabs with spaces" 
+"Tabstop, Shiftwith and replace tabs with spaces but not in makefiles 
 :set tabstop=4
 :set shiftwidth=4
 :set expandtab
+:autocmd FileType make set noexpandtab
 
 "Stuff needed by urxvt"
 :set nocompatible
@@ -15,7 +17,9 @@
 
 "Syntaxhighlighting, colorscheme, linenumbers"
 :syntax on
-:colorscheme calmar256-dark
+:set background=dark
+:colorscheme lettuce
+:set t_Co=256
 :set number
 :set list
 :set nowrap
diff --git a/zsh/zshrc b/zsh/zshrc
index 34c77fe..f603339 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -98,7 +98,7 @@ alias egrep='egrep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias diff='colordiff'
 alias ports='netstat -tulanp'
-alias penis="cowsay -f head-in ahh ja so lässig"
+alias cal='cal -m'
 
 setopt autopushd pushdsilent pushdtohome
 setopt pushdignoredups