added ghc_home, cabal_home flags, branch config in git, sidharta->veitheller

Makefile

@@ -28,7 +28,7 @@ valgrind:
 	cp valgrindrc ~/.valgrindrc
 
 vim:
-	cp vimrc ~/.vimrc.local
+	cp vimrc ~/.vimrc
 	cp -r .vim ~/.vim
 
 zsh:

cabal/config

@@ -14,10 +14,10 @@
 -- require-sandbox: False
 -- ignore-sandbox: False
 remote-repo: hackage.haskell.org:http://hackage.haskell.org/packages/archive
-remote-repo-cache: /Users/sidharta/.cabal/packages
+remote-repo-cache: /Users/veitheller/.cabal/packages
 -- local-repo:
 -- logs-dir:
-world-file: /Users/sidharta/.cabal/world
+world-file: /Users/veitheller/.cabal/world
 -- verbose: 1
 -- compiler: ghc
 -- with-compiler:
@@ -41,7 +41,7 @@ world-file: /Users/sidharta/.cabal/world
 -- flags:
 -- extra-include-dirs:
 -- extra-lib-dirs:
-extra-prog-path: /Users/sidharta/.cabal/bin
+extra-prog-path: /Users/veitheller/.cabal/bin
 -- instantiate-with:
 -- tests: False
 -- library-coverage:
@@ -66,7 +66,7 @@ documentation: True
 -- upgrade-dependencies: False
 -- root-cmd:
 -- symlink-bindir:
-build-summary: /Users/sidharta/.cabal/logs/build.log
+build-summary: /Users/veitheller/.cabal/logs/build.log
 -- build-log:
 remote-build-reporting: anonymous
 -- report-planning-failure: False
@@ -92,7 +92,7 @@ haddock
   -- contents-location:
 
 install-dirs user
-  -- prefix: /Users/sidharta/.cabal
+  -- prefix: /Users/veitheller/.cabal
   -- bindir: $prefix/bin
   -- libdir: $prefix/lib
   -- libsubdir: $abi/$pkgkey

gitconfig

@@ -29,6 +29,10 @@
 [apply]
     whitespace = fix
 
+[branch]
+    autosetupmerge = always
+    autosetuprebase = always
+
 [color]
     branch = auto
     diff = auto

zshrc

@@ -2,7 +2,7 @@
 
 zstyle ':completion:*' completer _expand _complete _ignored _approximate
 zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'm:{[:lower:]}={[:upper:]}' 'r:|[._-_]=** r:|=**' ''
-zstyle :compinstall filename '/Users/sidharta/.zshrc'
+zstyle :compinstall filename '/Users/veitheller/.zshrc'
 
 autoload -Uz compinit -D && compinit
 autoload -U promptinit && promptinit
@@ -20,7 +20,9 @@ bindkey -e
 
 export GOPATH=~/.go
 export GOBIN=$GOPATH/bin
-export PATH=$PATH:/opt/local/bin:/usr/local/sbin:~/.cabal/bin:$GOBIN
+export GHC_HOME=/usr/local/bin
+export CABAL_HOME=$HOME/.cabal/
+export PATH=$GHC_HOME:$CABAL_HOME/bin:$PATH:/opt/local/bin:/usr/local/sbin:~/.cabal/bin:$GOBIN
 export MANPATH=$MANPATH:/opt/local/share/man:/usr/local/opt/erlang/lib/erlang/man
 export INFOPATH=$INFOPATH:/opt/local/share/info
 export PYTHONSTARTUP=~/.pythonrc