From 2fa34f96cd59b80faab59d61c65641dc96b57b1f Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:32:20 +0100
Subject: [PATCH 1/7] Brings all directory stuff to directories.zsh

- Cleans out aliases.zsh.
- Removes unneeded cd function.
---
 lib/aliases.zsh     | 14 --------------
 lib/directories.zsh | 38 +++++++++++++++-----------------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 3044c9660..c67f854a7 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -1,11 +1,3 @@
-# Push and pop directories on directory stack
-alias pu='pushd'
-alias po='popd'
-
-# Basic directory operations
-alias ...='cd ../..'
-alias -- -='cd -'
-
 # Super user
 alias _='sudo'
 alias please='sudo'
@@ -25,12 +17,6 @@ then
 else
     alias history='fc -l 1'
 fi
-# List direcory contents
-alias lsa='ls -lah'
-alias l='ls -lah'
-alias ll='ls -lh'
-alias la='ls -lAh'
-alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
 
diff --git a/lib/directories.zsh b/lib/directories.zsh
index 1896945f4..57008a340 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -4,12 +4,10 @@ setopt auto_pushd
 setopt pushd_ignore_dups
 setopt pushdminus
 
-alias ..='cd ..'
-alias cd..='cd ..'
-alias cd...='cd ../..'
-alias cd....='cd ../../..'
-alias cd.....='cd ../../../..'
-alias cd/='cd /'
+alias -g ...='../..'
+alias -g ....='../../..'
+alias -g .....='../../../..'
+alias -g ......='../../../../..'
 
 alias 1='cd -'
 alias 2='cd -2'
@@ -21,23 +19,17 @@ alias 7='cd -7'
 alias 8='cd -8'
 alias 9='cd -9'
 
-cd () {
-  if   [[ "x$*" == "x..." ]]; then
-    cd ../..
-  elif [[ "x$*" == "x...." ]]; then
-    cd ../../..
-  elif [[ "x$*" == "x....." ]]; then
-    cd ../../../..
-  elif [[ "x$*" == "x......" ]]; then
-    cd ../../../../..
-  elif [ -d ~/.autoenv ]; then
-    source ~/.autoenv/activate.sh
-    autoenv_cd "$@"
-  else
-    builtin cd "$@"
-  fi
-}
-
 alias md='mkdir -p'
 alias rd=rmdir
 alias d='dirs -v | head -10'
+
+# List direcory contents
+alias lsa='ls -lah'
+alias l='ls -la'
+alias ll='ls -l'
+alias la='ls -lA'
+alias sl=ls # often screw this up
+
+# Push and pop directories on directory stack
+alias pu='pushd'
+alias po='popd'

From cbf48828e34a1e1f18bfd0699bde3aafcf0ddfe6 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:40:22 +0100
Subject: [PATCH 2/7] Pushes autoenv code to its plugin.

Sources the activate.sh file or informs the user, that its not
available.
Overriding the cd function, as it was formerly done, is not needed
anymore, activate.sh does this by itself.
---
 plugins/autoenv/autoenv.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index ca5666979..a8271849e 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -1,6 +1,17 @@
+# Activates autoenv or reports its failure
+if ! source $HOME/.autoenv/activate.sh 2>/dev/null; then
+  echo '-------- AUTOENV ---------'
+  echo 'Could not find ~/.autoenv/activate.sh.'
+  echo 'Please check if autoenv is correctly installed.'
+  echo 'In the meantime the autoenv plugin is DISABLED.'
+  echo '--------------------------'
+  return 1
+fi
+
 # The use_env call below is a reusable command to activate/create a new Python
 # virtualenv, requiring only a single declarative line of code in your .env files.
 # It only performs an action if the requested virtualenv is not the current one.
+
 use_env() {
     typeset venv
     venv="$1"

From 42fb8c577acf832e8d8d8eacae3b0170b8691bc4 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:50:19 +0100
Subject: [PATCH 3/7] Refactors history alias and moves it.

More compact case statement instead of the ugly if elif... else
statement. Moves it to history.zsh
---
 lib/aliases.zsh | 14 --------------
 lib/history.zsh |  8 ++++++++
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index c67f854a7..da29fde58 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -4,19 +4,5 @@ alias please='sudo'
 
 #alias g='grep -in'
 
-# Show history
-if [ "$HIST_STAMPS" = "mm/dd/yyyy" ]
-then
-    alias history='fc -fl 1'
-elif [ "$HIST_STAMPS" = "dd.mm.yyyy" ]
-then
-    alias history='fc -El 1'
-elif [ "$HIST_STAMPS" = "yyyy-mm-dd" ]
-then
-    alias history='fc -il 1'
-else
-    alias history='fc -l 1'
-fi
-
 alias afind='ack-grep -il'
 
diff --git a/lib/history.zsh b/lib/history.zsh
index 655945166..45a37fc11 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -5,6 +5,14 @@ fi
 HISTSIZE=10000
 SAVEHIST=10000
 
+# Show history
+case $HIST_STAMPS in
+  "mm/dd/yyyy") alias history='fc -fl 1' ;;
+  "dd.mm.yyyy") alias history='fc -El 1' ;;
+  "yyyy-mm-dd") alias history='fc -il 1' ;;
+  *) alias history='fc -l 1' ;;
+esac
+
 setopt append_history
 setopt extended_history
 setopt hist_expire_dups_first

From 35bba1d86d304d2f961ce77ee20eefb3af4e2929 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:53:14 +0100
Subject: [PATCH 4/7] Moves remaining aliases to misc and deletes file.

There were only three aliases left in aliases.zsh
File deleted!
---
 lib/aliases.zsh | 8 --------
 lib/misc.zsh    | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 lib/aliases.zsh

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
deleted file mode 100644
index da29fde58..000000000
--- a/lib/aliases.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Super user
-alias _='sudo'
-alias please='sudo'
-
-#alias g='grep -in'
-
-alias afind='ack-grep -il'
-
diff --git a/lib/misc.zsh b/lib/misc.zsh
index a8678b8ec..892d78ef3 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -13,3 +13,10 @@ export PAGER="less"
 export LESS="-R"
 
 export LC_CTYPE=$LANG
+
+## super user alias
+alias _='sudo'
+alias please='sudo'
+
+## more intelligent acking for ubuntu users
+alias afind='ack-grep -il'

From 7677f50c34c93f073bedb5d3f71462716abc1f75 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:55:10 +0100
Subject: [PATCH 5/7] Moves a bindkey call from misc to key-bindings.

---
 lib/key-bindings.zsh | 3 +++
 lib/misc.zsh         | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 94f1842f3..8a516dcfc 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -44,6 +44,9 @@ autoload -U edit-command-line
 zle -N edit-command-line
 bindkey '\C-x\C-e' edit-command-line
 
+# file rename magick
+bindkey "^[m" copy-prev-shell-word
+
 # consider emacs keybindings:
 
 #bindkey -e  ## emacs key bindings
diff --git a/lib/misc.zsh b/lib/misc.zsh
index 892d78ef3..ea8a05fcb 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -2,9 +2,6 @@
 autoload -U url-quote-magic
 zle -N self-insert url-quote-magic
 
-## file rename magick
-bindkey "^[m" copy-prev-shell-word
-
 ## jobs
 setopt long_list_jobs
 

From 89433cbc4e390e5aa865e0a5aa69c43c359e2e0f Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Sat, 11 Jan 2014 00:04:53 +0100
Subject: [PATCH 6/7] Deletes dot aliases from common-aliases.

They are implemented in lib anyway.
---
 plugins/common-aliases/common-aliases.plugin.zsh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 75899ca2c..5f0171fe7 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -21,12 +21,6 @@ alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
 
 alias t='tail -f'
 
-# because typing 'cd' is A LOT of work!!
-alias ..='cd ../'
-alias ...='cd ../../'
-alias ....='cd ../../../'
-alias .....='cd ../../../../'
-
 # Command line head / tail shortcuts
 alias -g H='| head'
 alias -g T='| tail'

From bbededdd29ac9d4ca15c4ce371e2329c29c3f4a6 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Sat, 15 Mar 2014 00:00:14 +0100
Subject: [PATCH 7/7] Fix a typo

---
 lib/directories.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 57008a340..f55d812bd 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -23,7 +23,7 @@ alias md='mkdir -p'
 alias rd=rmdir
 alias d='dirs -v | head -10'
 
-# List direcory contents
+# List directory contents
 alias lsa='ls -lah'
 alias l='ls -la'
 alias ll='ls -l'