From 48e913c8ce5888b61d60d8ae8efd0bba810c908b Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Mon, 16 Jan 2017 14:11:15 -0600
Subject: [PATCH] Update .zshrc

Updating to the version of .zshrc on Tau Scorpii. This enhanced version
has a couple of improvements:

* Aliases moved to a separate file for easier maintenance
* Auto-discovery of functions on fpath
---
 .zshalias | 28 ++++++++++++++++++++++++++++
 .zshrc    | 42 ++++++++++++++----------------------------
 2 files changed, 42 insertions(+), 28 deletions(-)
 create mode 100644 .zshalias

diff --git a/.zshalias b/.zshalias
new file mode 100644
index 0000000..2901c6a
--- /dev/null
+++ b/.zshalias
@@ -0,0 +1,28 @@
+# General commands
+alias rm='rm -I'
+alias ls='LC_COLLATE=C ls -N --color=auto --group-directories-first'
+alias grep='grep --color=auto'
+
+# Git
+alias g='git status'
+alias gc='git diff --cached --color|less -S'
+alias gd='git diff --color|less -S'
+alias gl='git log --graph --oneline --decorate --date-order --all --color|less -S'
+alias gs='git show --pretty=fuller --stat --patch --color HEAD|less -S'
+
+# Mercurial
+alias hd='hg diff --color=always|less -S'
+alias hl='hg shortlog --graph --color=always|less -S'
+alias hs='hg export --color=always|less -S'
+
+# Python development
+alias pep8='PYTHONWARNINGS= pep8'
+alias pylint='PYTHONWARNINGS= pylint -rn'
+alias flake8='PYTHONWARNINGS= flake8'
+
+# Misc
+alias aws='PYTHONWARNINGS= aws'
+alias rmrpmbuild='rm -rf BUILD BUILDROOT RPMS SRPMS'
+alias apache2='/usr/sbin/apache2 -d ~/.local/lib64/apache2 -f httpd.conf'
+alias openconnect='/usr/sbin/openconnect -i vpn0 --juniper --syslog -b --pid-file=/tmp/openconnect.pid -u dhatch ssl.firemon.com'
+alias ipsec='/usr/sbin/ipsec'
diff --git a/.zshrc b/.zshrc
index b50a136..636fac9 100644
--- a/.zshrc
+++ b/.zshrc
@@ -28,31 +28,13 @@ bindkey -M viins "${terminfo[kdch1]}" vi-delete-char
 bindkey -M vicmd "${terminfo[kdch1]}" vi-delete-char
 bindkey "^R" history-incremental-search-backward
 
-alias rm='rm -I'
-alias ls='LC_COLLATE=C ls -N --color=auto --group-directories-first'
-alias g='git status'
-alias gc='git diff --cached --color|less -S'
-alias gd='git diff --color|less -S'
-alias gl='git log --graph --oneline --decorate --date-order --all --color|less -S'
-alias gs='git show --stat --patch --color HEAD|less -S'
-alias hd='hg diff --color=always|less -S'
-alias hl='hg shortlog --graph --color=always|less -S'
-alias hs='hg export --color=always|less -S'
-alias pep8='PYTHONWARNINGS= pep8'
-alias pylint='PYTHONWARNINGS= pylint -rn'
-alias flake8='PYTHONWARNINGS= flake8'
-alias aws='PYTHONWARNINGS= aws'
-alias grep='grep --color=auto'
-alias rmrpmbuild='rm -rf BUILD BUILDROOT RPMS SRPMS'
-alias apache2='/usr/sbin/apache2 -d ~/.local/lib64/apache2 -f httpd.conf'
-alias openconnect='/usr/sbin/openconnect -i vpn0 --juniper --syslog -b --pid-file=/tmp/openconnect.pid -u dhatch ssl.firemon.com'
-alias ipsec='/usr/sbin/ipsec'
+if [[ -f ${ZDOTDIR:-${HOME}}/.zshalias ]]; then
+	source "${ZDOTDIR:-${HOME}}/.zshalias"
+fi
 
 zstyle ':completion:*:sudo::' environ PATH="/sbin:/usr/sbin:$PATH" HOME="/root"
 
-typeset -U path
 typeset -U fpath
-
 fpath[1,0]=~/.zsh/functions
 
 case $TERM in
@@ -61,17 +43,22 @@ case $TERM in
 	;;
 esac
 
-autoload kadmin
-autoload startrole
-autoload switchrealm
-autoload vmip
+for x in ~/.zsh/functions/*; do
+	f="${x##*/}"
+	case "$f" in
+	_*|precmd)
+		;;
+	*)
+		autoload "${x##*/}"
+		;;
+	esac
+done
 
 autoload -U compinit promptinit
 compinit
 promptinit
 
-os=$(. /etc/os-release; echo $ID)
-case ${os} in;
+case "$(. /etc/os-release; echo $ID)" in;
 gentoo)
 	prompt gentoo
 	;;
@@ -79,4 +66,3 @@ centos|redhat|rhel)
 	prompt redhat
 	;;
 esac
-unset os