X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=inline;f=config%2Fzsh%2F50_aliases;h=9d0909fad1133cc84665c52ccc09d4a8e7903a40;hb=49f54dc98ba5d201bdae8fa18dabfa13bc561679;hp=e829180742fdbd6713f151c50aaca5cfc2affb96;hpb=5923f706617b966f114656c78bd60108d4ab1dde;p=~madcoder%2Fdotfiles.git

diff --git a/config/zsh/50_aliases b/config/zsh/50_aliases
index e829180..9d0909f 100644
--- a/config/zsh/50_aliases
+++ b/config/zsh/50_aliases
@@ -1,69 +1,45 @@
 #!/bin/zsh
 
+local g
+
+case $(uname) in
+    Darwin)
+        g=g
+        ;;
+esac
+
 autoload zmv
 alias mmv='noglob zmv -W'
 
-alias su='export XAUTHORITY=${HOME}/.Xauthority ; sudo -s'
-alias sudo='export XAUTHORITY=${HOME}/.Xauthority ; sudo'
+if test -n "$XAUTHORITY"; then
+    alias su='sudo -E -s'
+else
+    alias su='export XAUTHORITY=${HOME}/.Xauthority ; sudo -s'
+    alias sudo='export XAUTHORITY=${HOME}/.Xauthority ; sudo'
+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}ls --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 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
-}