diff --git a/zshrc b/zshrc
index 58b11fa..ac2a5be 100644
--- a/zshrc
+++ b/zshrc
@@ -36,6 +36,14 @@ source /opt/ros/indigo/setup.zsh > /dev/null 2>&1
 export PYTHONPATH=/opt/ros/indigo/lib/python2.7/site-packages:$PYTHONPATH
 export PKG_CONFIG_PATH="/opt/ros/indigo/lib/pkgconfig:$PKG_CONFIG_PATH"
 
+#run ssh-agent
+if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+    ssh-agent > ~/.ssh-agent-thing
+fi
+if [[ "$SSH_AGENT_PID" == "" ]]; then
+    eval "$(<~/.ssh-agent-thing)"
+fi
+
 # Get rc dir path
 RC_PATH=$(dirname "$(readlink -f ${(%):-%x})")
 
@@ -53,6 +61,50 @@ colors
 # Check for system updates inthe background
 (check_sys_update&) 2> /dev/null
 
+### TODO WHERE ARE THE ALIASES
+
+###########
+# Aliases #
+###########
+
+alias acs='apt-cache search'
+alias ls='ls --classify --tabsize=0 --literal --color=auto --show-control-chars -h'
+alias ll='ls -lha'
+alias less='less --quiet'
+alias df='df --human-readable'
+alias du='du --human-readable'
+# alias mutt='mutt -y'
+alias upgrade='sudo apt-get update && sudo apt-get -dy dist-upgrade && sudo apt-get dist-upgrade'
+# alias -g GP='|grep '
+alias grep="grep --color"
+#alias ssh='ssh -A'
+# alias -s txt=cat
+alias rm='rm -I'
+alias ipa='ip route && echo && ip address'
+alias ipr='ip address && echo && ip route'
+alias which='which -a'
+# Le fameux cd ...etc
+alias -g ...='../..'
+alias -g ....='../../..'
+alias -g .....='../../../..'
+alias -g ......='../../../../..'
+alias -g .......='../../../../../..'
+alias -g ........='../../../../../../..'
+# Hackish tweaks
+alias steam-wine="WINEDEBUG=-all wine $WINEPREFIX/drive_c/Program\ Files\ \(x86\)/Steam/Steam.exe -no-dwrite -no-cef-sandbox >/dev/null 2>&1 &"
+alias pacaur='AURDEST=$HOME/aur pacaur'
+alias redwm='cd ~/aur/dwm-git; updpkgsums; makepkg -fi --noconfirm; killall dwm'
+alias minecraft='java -jar $HOME/.minecraft/launcher.jar'
+alias shuffle='mpv --shuffle --volume=50 --no-audio-display'
+alias steam="LD_PRELOAD='/usr/\$LIB/libstdc++.so.6 /usr/\$LIB/libgcc_s.so.1 /usr/\$LIB/libxcb.so.1 /usr/\$LIB/libgpg-error.so' /usr/bin/steam"
+alias surftor='http_proxy=socks5://127.0.0.1:9050/ surf'
+alias ytmp3='youtube-dl -x --audio-format mp3 --no-playlist -o "%(title)s.%(ext)s"'
+# Fix pour archlinux
+alias zbarcam='LD_PRELOAD=/usr/lib/libv4l/v4l1compat.so zbarcam'
+alias gitprunelocal="git branch -r | awk '{print $1}' | egrep -v -f /dev/fd/0 <(git branch -vv | grep origin) | awk '{print $1}' | xargs git branch -d"
+alias gitprunelocalforce="git branch -r | awk '{print $1}' | egrep -v -f /dev/fd/0 <(git branch -vv | grep origin) | awk '{print $1}' | xargs git branch -D"
+alias cantine="curl -s https://timechef.elior.com/api/restaurant/22/menus | jq '.[0].famillePlats[0].plats[].libelle'"
+
 # Term specific hacks
 case $TERM in
     *kitty)
@@ -71,7 +123,8 @@ case $TERM in
       preexec () {
         print -n "\e]0;st - $1 - ${HOST} - ${PWD}\a"
       }
-        alias ssh='TERM=xterm ssh -A'
+#        alias ssh='TERM=xterm ssh -A'
+        alias ssh='TERM=xterm ssh'
     ;;
 esac