revert

zsh/zshrc

@@ -1,35 +1,61 @@
-# Exports & Completionpath
-export DOT=${HOME}/dotfiles
-export OWN=${DOT}/zsh
-export LIB=${DOT}/lib
-export ZUL=${LIB}/zulu
-export ZULU_DIR=${ZUL}
-export ZUC=${ZUL}/config
-export ZULU_CONFIG_DIR=${ZUC}
-export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${PATH}"
-export EDITOR='nano'
-export TERM=xterm-256color
+# Oh My ZSH Path
+export ZSH=${HOME}/dotfiles/lib/ohmyzsh
 
-# Fix MobaXterm Home/End key with ZSH
-bindkey '^[[H' beginning-of-line
-bindkey '^[[F' end-of-line
+# Oh My ZSH Theme
+ZSH_THEME="mortalscumbag"
 
-# Settings & Dircolors
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
-eval `dircolors ${OWN}/dircolors`
+# Disable Auto Update of Oh My ZSH
+DISABLE_AUTO_UPDATE="true"
 
-# Install Zulu if needed
-if [[ ! -e ${ZUC}/ZULU_INSTALLED ]]; then
- source ${DOT}/install_zulu.zsh
- touch ${ZUC}/ZULU_INSTALLED
+# 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 DASHT_DOCSETS_DIR=$HOME/.local/share/Zeal/Zeal/docsets
+
+# 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)
+
+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'
 
-for file in ${OWN}/files.d/*.zsh; do source $file; done # Aliases
-source ${ZUL}/core/zulu # Zulu
+# Load Oh My ZSH
+source ${ZSH}/oh-my-zsh.sh
 
-# Init Zulu
-zulu init
+# Fix home/end key at work
+bindkey "^[[1~" beginning-of-line
+bindkey "^[[4~" end-of-line
 
-source "/usr/share/fzf/completion.zsh"
-source "/usr/share/fzf/key-bindings.zsh"
+# Source k.sh
+source ${HOME}/dotfiles/lib/k/k.sh
+
+# Shell Syntax Highlighter
+source ${HOME}/dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
+
+# 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