reverted to before zulu

zsh/zshrc

@@ -1,61 +1,52 @@
-# Oh My ZSH Path
+# Exports
 export ZSH=${HOME}/dotfiles/lib/ohmyzsh
-
-# Oh My ZSH Theme
 ZSH_THEME="mortalscumbag"
-
-# Disable Auto Update of Oh My ZSH
 DISABLE_AUTO_UPDATE="true"
-
-# Go Path
 export GOPATH=${HOME}/go
-
-# Path
-export PATH="${GOPATH}/bin:${HOME}/.gem/ruby/2.2.0/bin:${HOME}/dotfiles/lib/util:${HOME}/dotfiles/lib/dasht/bin:${PATH}"
-
-# Dasht
+export PATH="${GOPATH}/bin:${HOME}/.gem/ruby/2.3.0/bin:${HOME}/dotfiles/lib/util:${HOME}/dotfiles/lib/bin:${HOME}/dotfiles/lib/dasht/bin:${PATH}:/opt/android-sdk/build-tools/26.0.0/"
 export DASHT_DOCSETS_DIR=$HOME/.local/share/Zeal/Zeal/docsets
+export EDITOR='nano'
+export TERM=linux
 
 # Plugins
-plugins=(gem bundler composer git vagrant docker python)
-plugins+=(npm systemd systemadmin gitignore tmux extract)
-plugins+=(command-not-found colored-man-pages fabric ansible)
+plugins=(gem bundler git vagrant docker python ansible)
+plugins+=(systemd systemadmin tmux command-not-found extract)
+case $(uname -n) in
+"megumi")
+  plugins+=(archlinux)
+  ;;
+"sayaka")
+  plugins+=(archlinux)
+  ;;
+"git")
+  plugins+=(debian)
+  ;;
+"test")
+  plugins+=(debian)
+  ;;
+esac
 
-if [ $(uname -n) = "megumi" -o $(uname -n) = "kimari" -o $(uname -n) = "sayaka" ]; then
-    plugins+=(archlinux)
-fi
-if [ $(uname -n) = "mx" -o $(uname -n) = "git" ]; then
-    plugins+=(debian)
-fi
-
-# Preferred editor for local and remote sessions
-export EDITOR='nano'
-
-# Load Oh My ZSH
+# OMZ
 source ${ZSH}/oh-my-zsh.sh
 
-# Fix home/end key at work
-bindkey "^[[1~" beginning-of-line
-bindkey "^[[4~" end-of-line
+# Fix MobaXterm Home/End key with ZSH
+bindkey '^[[H' beginning-of-line
+bindkey '^[[F' end-of-line
 
-# Source k.sh
-source ${HOME}/dotfiles/lib/k/k.sh
-
-# Shell Syntax Highlighter
+# Syntax Highlighting
 source ${HOME}/dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 
+# Aliases
+for file in ${HOME}/dotfiles/zsh/aliases.d/*.zsh; do
+  source $file
+done
+
+# FZF
+[ -f ${HOME}/.fzf.zsh ] && source ${HOME}/.fzf.zsh
+
 # Dircolors
 eval `dircolors ${HOME}/dotfiles/zsh/dircolors`
 
-# Source Aliases
-source ${HOME}/dotfiles/zsh/aliases.zsh
-
-# Source FZF
-[ -f ${HOME}/.fzf.zsh ] && source ${HOME}/.fzf.zsh
-
 # Completions Path
 fpath=(${HOME}/dotfiles/lib/completions/src $fpath)
-
-# Source local zshrc
-[ -f ${HOME}/local.zshrc ] && source ${HOME}/local.zshrc