From 63c769a02b02b393d68954d6384345a2eef93f3c Mon Sep 17 00:00:00 2001
From: vnc <vnc@debian01>
Date: Sat, 21 Mar 2015 19:22:17 +0100
Subject: [PATCH 1/5] bugfixes

---
 zshrc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/zshrc b/zshrc
index ae71caf45..00db035d3 100644
--- a/zshrc
+++ b/zshrc
@@ -4,9 +4,9 @@
 ZSH="$HOME/.zsh"
 
 # export ZSH_THEME="random"
-# export ZSH_THEME="ezzsh" # name of zsh theme
+export ZSH_THEME="ezzsh" # name of zsh theme
 # export ZSH_THEME="powerline" # name of zsh theme
-export ZSH_THEME="powerline-with-hostname" # name of zsh theme
+# export ZSH_THEME="powerline-with-hostname" # name of zsh theme
 
 # Set this to true to use case-sensitive completion
 CASE_SENSITIVE="false" # bool
@@ -151,6 +151,11 @@ if [[ "$OS_TYPE" == "FreeBSD" ]]; then
   fi
 fi
 
+if [[ "$OS_TYPE" == "Linux" ]]; then
+  alias ls='ls --group-directories-first -F --color=auto'
+fi
+
+
 # enable ls colorization: 
 if [ "$TERM" != "dumb" ]; then
   if [[ "$dircolors_enable" == 1 ]]; then
@@ -197,12 +202,7 @@ alias sudo='nocorrect sudo'
 # the more brutal attempt:
 unsetopt correct{,all} 
 
-# colored grep / less
-alias grep="grep --color='always'"
 alias less='less -R'
 alias diff='colordiff'
 
 
-set modeline
-
-

From 61cab420cd8b352edec13cfc48faeacde97b1811 Mon Sep 17 00:00:00 2001
From: Armin <armin@core>
Date: Sun, 22 Mar 2015 11:37:08 -0400
Subject: [PATCH 2/5] add -E for sudo

---
 zshrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zshrc b/zshrc
index 00db035d3..3bc9d44c3 100644
--- a/zshrc
+++ b/zshrc
@@ -4,9 +4,9 @@
 ZSH="$HOME/.zsh"
 
 # export ZSH_THEME="random"
-export ZSH_THEME="ezzsh" # name of zsh theme
+# export ZSH_THEME="ezzsh" # name of zsh theme
 # export ZSH_THEME="powerline" # name of zsh theme
-# export ZSH_THEME="powerline-with-hostname" # name of zsh theme
+export ZSH_THEME="powerline-with-hostname" # name of zsh theme
 
 # Set this to true to use case-sensitive completion
 CASE_SENSITIVE="false" # bool
@@ -197,7 +197,7 @@ if [ "$TERM" != "dumb" ]; then
 fi
 
 # do not autocorrect sudo commands (fixes "zsh: correct 'vim' to '.vim' [nyae]?")
-alias sudo='nocorrect sudo'
+alias sudo='nocorrect sudo -E'
 
 # the more brutal attempt:
 unsetopt correct{,all} 

From dce635a10568f9a59ee608070941222c814debe7 Mon Sep 17 00:00:00 2001
From: Armin Jenewein <armin.jenewein@de.amadeus.com>
Date: Tue, 24 Mar 2015 16:41:59 +0100
Subject: [PATCH 3/5] bugfixes

---
 zshrc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/zshrc b/zshrc
index 3bc9d44c3..ae71caf45 100644
--- a/zshrc
+++ b/zshrc
@@ -151,11 +151,6 @@ if [[ "$OS_TYPE" == "FreeBSD" ]]; then
   fi
 fi
 
-if [[ "$OS_TYPE" == "Linux" ]]; then
-  alias ls='ls --group-directories-first -F --color=auto'
-fi
-
-
 # enable ls colorization: 
 if [ "$TERM" != "dumb" ]; then
   if [[ "$dircolors_enable" == 1 ]]; then
@@ -197,12 +192,17 @@ if [ "$TERM" != "dumb" ]; then
 fi
 
 # do not autocorrect sudo commands (fixes "zsh: correct 'vim' to '.vim' [nyae]?")
-alias sudo='nocorrect sudo -E'
+alias sudo='nocorrect sudo'
 
 # the more brutal attempt:
 unsetopt correct{,all} 
 
+# colored grep / less
+alias grep="grep --color='always'"
 alias less='less -R'
 alias diff='colordiff'
 
 
+set modeline
+
+

From 202ae23fc72bfbd457a7e55a94b8d7af8920a777 Mon Sep 17 00:00:00 2001
From: Armin <armin@git.arminius.org>
Date: Wed, 25 Mar 2015 11:07:36 +0100
Subject: [PATCH 4/5] bugfix

---
 zshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zshrc b/zshrc
index ae71caf45..31b411bcb 100644
--- a/zshrc
+++ b/zshrc
@@ -202,7 +202,7 @@ alias grep="grep --color='always'"
 alias less='less -R'
 alias diff='colordiff'
 
-
-set modeline
+alias s='sudo -s -E'
+
 
 

From e9e8e2f93aa4d7a513bd2d52999252dd3b640edf Mon Sep 17 00:00:00 2001
From: Armin Jenewein <armin.jenewein@de.amadeus.com>
Date: Thu, 26 Mar 2015 11:22:30 +0100
Subject: [PATCH 5/5] new colors for "box", new aliases / options in zshrc

---
 zshrc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/zshrc b/zshrc
index ae71caf45..d3fbc5998 100644
--- a/zshrc
+++ b/zshrc
@@ -151,6 +151,11 @@ if [[ "$OS_TYPE" == "FreeBSD" ]]; then
   fi
 fi
 
+if [[ "$OS_TYPE" == "Linux" ]]; then
+  LS_COMMAND=ls
+  dircolors_enable=1
+fi
+
 # enable ls colorization: 
 if [ "$TERM" != "dumb" ]; then
   if [[ "$dircolors_enable" == 1 ]]; then
@@ -202,7 +207,9 @@ alias grep="grep --color='always'"
 alias less='less -R'
 alias diff='colordiff'
 
+# sudo shell with "s"
+alias s='sudo -s -E'
 
-set modeline
-
+# don't require "rehash" after installing a package
+setopt nohashdirs