Support for @sorin-ionescu rewrite of oh-my-zsh

Sorin's OMZ rewrite is a bit nicer, as it's written in more
native style ZSH, doesn't do auto updates, and incorporates
many bugfixes, and is more actively maintained than Robby's branch.

For now, YADR supports both, so if you want to try out the sorin
branch, go to sorin-ionescu/oh-my-zsh, install it, and rerun
the YADR installer so that the skwp theme is installed for you.

If you want to have them side by side for comparison, rename the
old robby one to ~/.oh-my-zsh.robby or similar, so you can toggle
back and forth through renames, or symlinks.

zsh/aliases.zsh

@@ -9,6 +9,7 @@ alias yuv='yadr vim-update-plugins'
 alias yip='yadr init-plugins'
 
 # PS
+alias psa="ps aux"
 alias psg="ps aux | grep "
 alias psr='ps aux | grep ruby'
 
@@ -56,7 +57,7 @@ alias guns='git unstage'
 alias gunc='git uncommit'
 alias gm='git merge'
 alias gms='git merge --squash'
-alias gam='git amend'
+alias gam='git amend --reset-author'
 alias gr='git rebase'
 alias gra='git rebase --abort'
 alias ggrc='git rebase --continue'
@@ -93,7 +94,6 @@ alias l='less'
 alias lh='ls -alt | head' # see the last modified files
 alias screen='TERM=screen screen'
 alias cl='clear'
-alias ps='ps aux'
 
 # Zippin
 alias gz='tar -zcvf'

zsh/key-bindings.zsh

@@ -31,4 +31,3 @@ bindkey '^?' backward-delete-char                   # [Delete] - delete backward
 bindkey '^[[3~' delete-char                         # [fn-Delete] - delete forward
 bindkey '^[3;5~' delete-char
 bindkey '\e[3~' delete-char
-

zsh/omz-sorin/omz-sorin.zsh

@@ -0,0 +1,35 @@
+# Set the path to Oh My Zsh.
+export OMZ="$HOME/.oh-my-zsh"
+
+# Set the key mapping style to 'emacs' or 'vi'.
+# zstyle ':omz:module:editor' keymap 'vi'
+
+# Auto convert .... to ../..
+zstyle ':omz:module:editor' dot-expansion 'no'
+
+# Set case-sensitivity for completion, history lookup, etc.
+zstyle ':omz:*:*' case-sensitive 'no'
+
+# Color output (auto set to 'no' on dumb terminals).
+zstyle ':omz:*:*' color 'yes'
+
+# Auto set the tab and window titles.
+zstyle ':omz:module:terminal' auto-title 'yes'
+
+# Set the Zsh modules to load (man zshmodules).
+# zstyle ':omz:load' zmodule 'attr' 'stat'
+
+# Set the Zsh functions to load (man zshcontrib).
+# zstyle ':omz:load' zfunction 'zargs' 'zmv'
+
+# Set the Oh My Zsh modules to load (browse modules).
+zstyle ':omz:load' omodule 'environment' 'terminal' 'editor' 'completion' \
+  'history' 'directory' 'spectrum' 'alias' 'utility' 'prompt' 'history-substring-search'
+
+# Set the prompt theme to load.
+# Setting it to 'random' loads a random theme.
+# Auto set to 'off' on dumb terminals.
+zstyle ':omz:module:prompt' theme 'skwp'
+
+# This will make you shout: OH MY ZSHELL!
+source "$OMZ/init.zsh"

zsh/zshrc

@@ -26,8 +26,12 @@ if [[ -d $HOME/.oh-my-zsh ]]; then
     for config_file ($yadr/custom/zsh/before/*) source $config_file
   fi
 
-  # Source oh-my-zsh
-  source $ZSH/oh-my-zsh.sh
+  # Figure out if we have Robby's or Sorin's Oh-my-zsh
+  if [[ -f $ZSH/oh-my-zsh.sh ]]; then
+    source $ZSH/oh-my-zsh.sh # OMZ Robby Russell (https://github.com/robbyrussell/oh-my-zsh)
+  else
+    source $yadr/zsh/omz-sorin/omz-sorin.zsh # OMZ Sorin Ionescu (https://github.com/sorin-ionescu/oh-my-zsh)
+  fi
 fi
 
 # Configuration