Merge remote-tracking branch 'cadusk/master'

Conflicts:
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	tools/install.sh

lib/aliases.zsh

@@ -34,6 +34,8 @@ else
     alias history='fc -l 1'
 fi
 
+alias afind='ack-grep -il'
+
 # Enable ls colors
 LS_OPTIONS='-hF'
 if [ "$DISABLE_LS_COLORS" != "true" ]
@@ -47,8 +49,13 @@ alias lsa='ls -lah'
 alias l='ls -lah'
 alias ll='ls -lh'
 alias la='ls -lAh'
-alias l=la
 alias sl=ls # often screw this up
 
-alias afind='ack-grep -il'
-
+alias gita='git add -A'
+alias gitl='git l'
+alias gitw='git who'
+alias gitt='git tags'
+# Aliases
+alias ta='tmux attach -t'
+alias tl='tmux list-session'
+alias ts='tmux new-session'

templates/zshrc-linux.zsh

@@ -70,10 +70,5 @@ if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
 
 [ "$TERM" = "xterm" ] && TERM="xterm-256color"
 
-# Aliases
-alias ta='tmux attach -t'
-alias tl='tmux list-session'
-alias ts='tmux new-session'
-
 source $ZSH/oh-my-zsh.sh
 unsetopt correctall

templates/zshrc-mac.zsh

@@ -46,14 +46,12 @@ zstyle ':completion:*:descriptions' format '%B%d%b'
 if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
 if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 
-# Aliases
-alias ta='tmux attach -t'
-alias tl='tmux list-session'
-alias ts='tmux new-session'
-
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"
 
+# MacOSX specific aliases
+alias bu='brew update && brew upgrade'
+
 source $ZSH/oh-my-zsh.sh
 unsetopt correctall
 

tools/install.sh

@@ -10,7 +10,6 @@ if [ -d "$ZSH" ]; then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   echo "git not installed"
   exit
 }