Resort

zsh/.zshrc

@@ -1,35 +1,75 @@
 autoload -U compinit && compinit
 
-# helper methods
+### Helper methods
 include () {
     [[ -f "$1" ]] && source "$1"
 }
 
-# load antigen
+# default path to the Mac's Python bin path
+include $HOME/Library/Python/2.7/bin/virtualenvwrapper.sh
+
+# goh config
+# - requires installation of vutran/goh
+include $HOME/.gohrc
+
+# load dropbox config
+include $HOME/.dropboxrc
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+# Bootstrap Antigen
 source /usr/local/share/antigen/antigen.zsh
 include $HOME/.antigenrc
 
+### Paths
+
 # incude local node_modules and vendor folder in path
 export PATH="./node_modules/.bin:./vendor/bin:$PATH"
 
 # include yarn path
 export PATH="$HOME/.yarn/bin:$PATH"
 
+# Go
+export GOPATH=$HOME/go
+export PATH=$PATH:$GOPATH/bin
+
+# virtualenvwrapper
+export WORKON_HOME=$HOME/.virtualenvs
+export PROJECT_HOME=$HOME/Devel
+
+# include path from brew
+export PATH="/usr/local/opt/python/libexec/bin:$PATH"
+
+# make brew mysql-client available in the path
+# - require installation of `mysql-client`
+#  - brew install mysql-client
+export PATH="/usr/local/opt/mysql-client/bin:$PATH"
+
+# include Volta
+export VOLTA_HOME="$HOME/.volta"
+export PATH="$VOLTA_HOME/bin:$PATH"
+
+### Default configs
+
 # Preferred editor for local and remote sessions
 export EDITOR='vim'
 
-# set default shell
+# Set default shell
 export SHELL='zsh'
 
 KEYTIMEOUT=1
 
-# force tmux 256 colors
+GPG_TTY=$(tty)
+export GPG_TTY
+
+### Alias
+
+# Force tmux 256 colors
 alias tmux='tmux -2'
 
-# enable user's agignore file
+# Enable user's agignore file
 alias ag='ag --path-to-ignore ~/.ignore'
 
-# ydiff
+# Ydiff
 alias sbs='ydiff -s -w 0'
 
 # arc alias
@@ -46,36 +86,5 @@ alias glm="git log --author=vutran"
 alias gbm="git branch -m"
 alias glp="git log --format=\"%Cgreen%h %Cblue %ae %Cred %aI %Creset %s\""
 
-# load nvm
-#export NVM_DIR="${XDG_CONFIG_HOME/:-$HOME/.}nvm"
-#[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
-
-# Go
-export GOPATH=$HOME/go
-export PATH=$PATH:$GOPATH/bin
-
-# virtualenvwrapper
-export WORKON_HOME=$HOME/.virtualenvs
-export PROJECT_HOME=$HOME/Devel
-
-GPG_TTY=$(tty)
-export GPG_TTY
-
-# make brew mysql-client available in the path
-# - require installation of `mysql-client`
-#  - brew install mysql-client
-export PATH="/usr/local/opt/mysql-client/bin:$PATH"
-
 # alias `todolist` (http://todolist.site/)
 alias t="todolist"
-
-# default path to the Mac's Python bin path
-include $HOME/Library/Python/2.7/bin/virtualenvwrapper.sh
-
-# goh config
-# - requires installation of vutran/goh
-include $HOME/.gohrc
-
-# load dropbox config
-include $HOME/.dropboxrc
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion