zshenv

@@ -21,6 +21,9 @@ PATH=$HOME/.local/bin:$PATH
 MANPATH=$HOME/.local/share/man:$MANPATH
 INFOPATH=$HOME/.local/share/info:$INFOPATH
 
+# Add ccache to the PATH if present
+[ -f /usr/bin/ccache ] && PATH=/usr/lib/ccache:$PATH
+
 # Use ~/.local for pip installs on macOS
 [ "`uname`" = "Darwin" ] && export PYTHONUSERBASE=$HOME/.local
 

zshrc

@@ -2,14 +2,10 @@
 # executing commands, will be sourced when starting as an interactive shell.
 
 # Load plugin scripts
-source-plugin() {
+plugin-load() { source ~/.config/zsh/$1/$1.plugin.zsh }
-  [ -d ~/.config/zsh/$1 ] && \
+plugin-load zsh-autosuggestions
-    source ~/.config/zsh/$1/$1.plugin.zsh || \
+plugin-load zsh-history-substring-search
-    echo "zsh plugin not found: $1"
+plugin-load zsh-syntax-highlighting
-}
-source-plugin zsh-autosuggestions
-source-plugin zsh-history-substring-search
-source-plugin zsh-syntax-highlighting
 
 # Disable non end-of-line autosuggest accept widgets
 ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(end-of-line vi-end-of-line)
@@ -121,40 +117,22 @@ typeset -U PATH
 typeset -U MANPATH
 typeset -U INFOPATH
 
-# Add ccache symlink directory to start of PATH, this must be after
-# `typeset -U PATH` because on macOS this reorders the list so ccache's
-# symlinks will no longer be at the start of PATH rendering it unusable.
-if [ `uname` = Darwin ]; then
-  [ -f /usr/local/bin/ccache ] && \
-    PATH=/usr/local/opt/ccache/libexec:$PATH
-else
-  [ -f /usr/bin/ccache ] && \
-    PATH=/usr/lib/ccache:$PATH
-fi
-
 # Aliases
 alias grep='grep --color=always'
-which cmake &> /dev/null && \
+alias cninja='cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMNADS=ON'
-  alias cninja='cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMNADS=ON'
+alias ssh='TERM=xterm-256color ssh'
-which ssh &> /dev/null && \
-  alias ssh='TERM=xterm-256color ssh'
 
 case `uname` in
   Linux)
     [ "$TMUX" = "" ] && \
-      alias cls="printf '\ec'" || \
+      alias cls="printf '\ec'" || alias cls="clear && printf '\e[3J'"
-      alias cls="clear && printf '\e[3J'"
     alias ls='ls -F --color=auto'
-    which cgdb &> /dev/null && \
+    alias debug='cgdb --args'
-      alias debug='cgdb --args' || \
-      which gdb &> /dev/null && \
-        alias debug='gdb --args'
     ;;
   Darwin)
     alias cls="clear && printf '\e[3J'"
     alias ls='ls -GFh'
-    which lldb &> /dev/null && \
+    alias debug='lldb --'
-      alias debug='lldb --'
     ;;
 esac