X-Git-Url: http://git.madism.org/?p=~madcoder%2Fdotfiles.git;a=blobdiff_plain;f=config%2Fzsh%2F50_aliases;fp=config%2Fzsh%2F50_aliases;h=c3911781fa942e23d1e388c524535980edb6862b;hp=d1f041691fef88cdae4687a430237120d69f8f8b;hb=901f0486e49163e44626809ac42a18c6a1dd52bf;hpb=5d1af5e2d843cdca9551fcdd769ebad8075d6750

diff --git a/config/zsh/50_aliases b/config/zsh/50_aliases
index d1f0416..c391178 100644
--- a/config/zsh/50_aliases
+++ b/config/zsh/50_aliases
@@ -1,5 +1,13 @@
 #!/bin/zsh
 
+local g
+
+case $(uname) in
+    Darwin)
+        g=g
+        ;;
+esac
+
 autoload zmv
 alias mmv='noglob zmv -W'
 
@@ -13,71 +21,25 @@ fi
 alias du="du -hcs"
 alias df="df -h"
 
-case "${$(ls --version | head -1)##* }" in
+case "${$(${g}ls --version | head -1)##* }" in
     [0-5].*)
-        alias ls="ls -bCF --color=auto"
+        alias ls="${g}ls -bCF --color=auto"
         ;;
     *)
-        alias ls="ls --group-directories-first -bCF --color=auto"
+        alias ls="${g}s --group-directories-first -bCF --color=auto"
         ;;
 esac
 
-alias la="ls --color=always -a"
-alias ll="ls --color=always -l"
-alias lla="ls --color=always -la"
-alias lal="ls --color=always -la"
+alias la="${g}ls --color=always -a"
+alias ll="${g}ls --color=always -l"
+alias lla="${g}ls --color=always -la"
+alias lal="${g}ls --color=always -la"
 
 alias egrep='egrep --color=tty -d skip'
 alias fgrep='fgrep --color=tty -d skip'
 alias grep='grep --color=tty -d skip'
 
-alias md='mkdir'
-alias rd='rmdir'
-alias rm='rm -i'
-alias s2disk='sudo s2disk'
-alias s2both='sudo s2both'
-alias s2ram='sudo s2ram'
-alias opannotate-asm='opannotate  -a --objdump-params -S'
-alias caff='caff -u BC6AFB5BA1EE761C,E34B6A5AFE3AF15F -m yes'
-
 alias v=vim
-alias m=madmutt
 cvi () {
     vim -O ${${1%.[hc]}%.}.{h,c}
 }
-xvi () {
-    vim -O ${${${1%.h}%.cpp}%.}.{h,cpp}
-}
-ovi () {
-    vim -O ${${1%.ml}%.}.ml{i,}
-}
-
-alias br='bts --mbox show'
-
-upload() {
-    debsign *.changes
-    dput -e 0 gluck_delayed *.changes
-}
-
-conf_push () {
-    echo -n "PUSHING TO $1"
-    rsync -au --exclude=.git --delete ~madcoder/.madconf/ "$1":.madconf/
-    ssh "$1" LC_ALL=C .madconf/bin/madconf
-    echo "."
-}
-
-dict () { dictl "$@" 2>&1 | colorit | less -R ; }
-
-vman() {
-    if /usr/bin/man "$@" > /dev/null; then
-        vim -m -n --noplugin -c "set ft=man" -c "noremap q :q<cr>" -c "Man $@"
-    fi
-}
-
-gdbpid() {
-    if test "$1" = $(printf "%d" "$1"); then
-        gdb --pid="$1"
-    else
-        gdb --pid=$(pidof "$1")
-    fi
-}