zsh: cleanup

1 files changed, 34 insertions, 43 deletions

diff --git a/zsh_aliases b/zsh_aliases
index e49846a..cb6b37e 100644
--- a/zsh_aliases
+++ b/zsh_aliases
@@ -20,17 +20,17 @@ function cond-alias {
     fi
 }
 
-cond-alias aptup='sudo apt update && sudo apt upgrade'
-cond-alias curl='noglob curl'
-cond-alias ec='emacsclient -nq'
-cond-alias find='noglob bfs'
+cond-alias aptup="sudo apt update && sudo apt upgrade"
+cond-alias curl="noglob curl"
+cond-alias ec="emacsclient -nq"
+cond-alias find="noglob bfs"
 cond-alias git-root='cd $(git rev-parse --show-toplevel)'
-cond-alias grep='grep --color=auto'
+cond-alias grep="grep --color=auto"
 cond-alias hstat="history 0 | awk '{print \$2}' | sort | uniq -c | sort -nr | head"
-cond-alias mg='mg -n'
+cond-alias mg="mg -n"
 cond-alias ta='tmux new-session -AD -s $LOGNAME'
-cond-alias week='date +%V'
-cond-alias reload='exec zsh'
+cond-alias week="date +%V"
+cond-alias reload="exec zsh"
 if (( $+commands[apt-mark] )); then
     # This is the most precise method I've found for answering the question
     # "which packages did I install explicitly?"
@@ -73,42 +73,32 @@ function brew-fzf {
     esac
 }
 
-(( $+commands[brew] )) || unfunction brew-fzf
-
-# Alias diff
-function alias-diff {
-    # Use colors in diff output when supported
-    if diff --color=auto /dev/null /dev/null 2> /dev/null; then
-       alias diff='diff --color=auto'
-    fi
-}
-
-alias-diff
+# Use colors in diff output when supported
+if diff --color=auto /dev/null /dev/null 2> /dev/null; then
+    alias diff="diff --color=auto"
+fi
 
 # Alias ls
-function alias-ls {
-    local -r ls_opts='--group-directories-first --color=auto'
-    case "$OSTYPE" in
-        darwin*|freebsd*)
-            if (( $+commands[gls] )); then
-                alias ls="gls ${ls_opts}"
-                alias ll="gls ${ls_opts} -lh"
-            elif (( $+commands[gnuls] )); then
-                alias ls="gnuls ${ls_opts}"
-                alias ll="gnuls ${ls_opts} -lh"
-            else
-                alias ls='ls -G'
-                alias ll='ls -Glh'
-            fi
-            ;;
-        *)
-            alias ls="ls ${ls_opts}"
-            alias ll="ls ${ls_opts} -lh"
-            ;;
-    esac
-}
-
-alias-ls
+ls_opts="--group-directories-first --color=auto"
+case "$OSTYPE" in
+    darwin*|freebsd*)
+        if (( $+commands[gls] )); then
+            alias ls="gls ${ls_opts}"
+            alias ll="gls ${ls_opts} -lh"
+        elif (( $+commands[gnuls] )); then
+            alias ls="gnuls ${ls_opts}"
+            alias ll="gnuls ${ls_opts} -lh"
+        else
+            alias ls="ls -G"
+            alias ll="ls -Glh"
+        fi
+        ;;
+    *)
+        alias ls="ls ${ls_opts}"
+        alias ll="ls ${ls_opts} -lh"
+        ;;
+esac
+unset ls_opts
 
 # Activate or deactivate a virtualenv in the directory venv
 function venv {
@@ -168,4 +158,5 @@ function cdn {
 source "$HOME/.zsh_aliases.local" 2> /dev/null
 
 # Clean up functions
-unfunction cond-alias alias-diff alias-ls
+(( $+commands[brew] )) || unfunction brew-fzf
+unfunction cond-alias