From 6544629f187bc01bf6879fbf72d93eeb24bdd1f0 Mon Sep 17 00:00:00 2001
From: lhark <lhark@hotmail.fr>
Date: Wed, 30 Mar 2016 15:27:36 +0000
Subject: [PATCH] Resolve conflicting aliases

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

diff --git a/zshrc b/zshrc
index 6180a5a..5486ed3 100644
--- a/zshrc
+++ b/zshrc
@@ -62,20 +62,6 @@ alias minecraft="java -jar $HOME/.minecraft/launcher.jar"
 alias redwm='cd ~/abs/dwm; updpkgsums; makepkg -fi --noconfirm; killall dwm'
 
 
-# Term specific hacks
-case $TERM in
-    xterm*)
-      preexec () {
-        print -Pn "\e]0;$1 -- ${USER}@${HOST}\a"
-      }
-    ;;
-    # Fix broken ssh with st
-    st*)
-        alias ssh='TERM=xterm ssh'
-    ;;
-esac
-
-
 # Aliases
 alias acs='apt-cache search'
 alias ls='ls --classify --tabsize=0 --literal --color=auto --show-control-chars -h'
@@ -107,6 +93,20 @@ alias -g .......='../../../../../..'
 alias -g ........='../../../../../../..'
 
 
+# Term specific hacks
+case $TERM in
+    xterm*)
+      preexec () {
+        print -Pn "\e]0;$1 -- ${USER}@${HOST}\a"
+      }
+    ;;
+    # Fix broken ssh with st
+    st*)
+        alias ssh='TERM=xterm ssh'
+    ;;
+esac
+
+
 # Demande confirmation pour 'rm *' -> ou
 unsetopt rm_star_silent