From 0874e37c31c47b26d54d34a21d43848e31e68182 Mon Sep 17 00:00:00 2001
From: Brian Moran <BMoran@urbn.com>
Date: Thu, 15 Oct 2015 11:17:49 -0400
Subject: [PATCH] Tweaked sorin prompt as new moron prompt

---
 modules/git/alias.zsh | 244 +++++++++++++++++++++---------------------
 runcoms/zshrc         |  18 ++++
 2 files changed, 140 insertions(+), 122 deletions(-)

diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh
index ffa854dd..79206f44 100644
--- a/modules/git/alias.zsh
+++ b/modules/git/alias.zsh
@@ -27,155 +27,155 @@ zstyle -s ':prezto:module:git:status:ignore' submodules '_git_status_ignore_subm
 #
 
 # Git
-alias g='git'
+#alias g='git'
 
 # Branch (b)
-alias gb='git branch'
-alias gbc='git checkout -b'
-alias gbl='git branch -v'
-alias gbL='git branch -av'
-alias gbx='git branch -d'
-alias gbX='git branch -D'
-alias gbm='git branch -m'
-alias gbM='git branch -M'
-alias gbs='git show-branch'
-alias gbS='git show-branch -a'
+#alias gb='git branch'
+#alias gbc='git checkout -b'
+#alias gbl='git branch -v'
+#alias gbL='git branch -av'
+#alias gbx='git branch -d'
+#alias gbX='git branch -D'
+#alias gbm='git branch -m'
+#alias gbM='git branch -M'
+#alias gbs='git show-branch'
+#alias gbS='git show-branch -a'
 
 # Commit (c)
-alias gc='git commit --verbose'
-alias gca='git commit --verbose --all'
-alias gcm='git commit --message'
-alias gco='git checkout'
-alias gcO='git checkout --patch'
-alias gcf='git commit --amend --reuse-message HEAD'
-alias gcF='git commit --verbose --amend'
-alias gcp='git cherry-pick --ff'
-alias gcP='git cherry-pick --no-commit'
-alias gcr='git revert'
-alias gcR='git reset "HEAD^"'
-alias gcs='git show'
-alias gcl='git-commit-lost'
+#alias gc='git commit --verbose'
+#alias gca='git commit --verbose --all'
+#alias gcm='git commit --message'
+#alias gco='git checkout'
+#alias gcO='git checkout --patch'
+#alias gcf='git commit --amend --reuse-message HEAD'
+#alias gcF='git commit --verbose --amend'
+#alias gcp='git cherry-pick --ff'
+#alias gcP='git cherry-pick --no-commit'
+#alias gcr='git revert'
+#alias gcR='git reset "HEAD^"'
+#alias gcs='git show'
+#alias gcl='git-commit-lost'
 
 # Conflict (C)
-alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
-alias gCa='git add $(gCl)'
-alias gCe='git mergetool $(gCl)'
-alias gCo='git checkout --ours --'
-alias gCO='gCo $(gCl)'
-alias gCt='git checkout --theirs --'
-alias gCT='gCt $(gCl)'
+#alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
+#alias gCa='git add $(gCl)'
+#alias gCe='git mergetool $(gCl)'
+#alias gCo='git checkout --ours --'
+#alias gCO='gCo $(gCl)'
+#alias gCt='git checkout --theirs --'
+#alias gCT='gCt $(gCl)'
 
 # Data (d)
-alias gd='git ls-files'
-alias gdc='git ls-files --cached'
-alias gdx='git ls-files --deleted'
-alias gdm='git ls-files --modified'
-alias gdu='git ls-files --other --exclude-standard'
-alias gdk='git ls-files --killed'
-alias gdi='git status --porcelain --short --ignored | sed -n "s/^!! //p"'
+#alias gd='git ls-files'
+#alias gdc='git ls-files --cached'
+#alias gdx='git ls-files --deleted'
+#alias gdm='git ls-files --modified'
+#alias gdu='git ls-files --other --exclude-standard'
+#alias gdk='git ls-files --killed'
+#alias gdi='git status --porcelain --short --ignored | sed -n "s/^!! //p"'
 
 # Fetch (f)
-alias gf='git fetch'
-alias gfc='git clone'
-alias gfm='git pull'
-alias gfr='git pull --rebase'
+#alias gf='git fetch'
+#alias gfc='git clone'
+#alias gfm='git pull'
+#alias gfr='git pull --rebase'
 
 # Grep (g)
-alias gg='git grep'
-alias ggi='git grep --ignore-case'
-alias ggl='git grep --files-with-matches'
-alias ggL='git grep --files-without-matches'
-alias ggv='git grep --invert-match'
-alias ggw='git grep --word-regexp'
+#alias gg='git grep'
+#alias ggi='git grep --ignore-case'
+#alias ggl='git grep --files-with-matches'
+#alias ggL='git grep --files-without-matches'
+#alias ggv='git grep --invert-match'
+#alias ggw='git grep --word-regexp'
 
 # Index (i)
-alias gia='git add'
-alias giA='git add --patch'
-alias giu='git add --update'
-alias gid='git diff --no-ext-diff --cached'
-alias giD='git diff --no-ext-diff --cached --word-diff'
-alias gir='git reset'
-alias giR='git reset --patch'
-alias gix='git rm -r --cached'
-alias giX='git rm -rf --cached'
+#alias gia='git add'
+#alias giA='git add --patch'
+#alias giu='git add --update'
+#alias gid='git diff --no-ext-diff --cached'
+#alias giD='git diff --no-ext-diff --cached --word-diff'
+#alias gir='git reset'
+#alias giR='git reset --patch'
+#alias gix='git rm -r --cached'
+#alias giX='git rm -rf --cached'
 
 # Log (l)
-alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"'
-alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
-alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
-alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
-alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
-alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
-alias glc='git shortlog --summary --numbered'
+#alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"'
+#alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
+#alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
+#alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
+#alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
+#alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
+#alias glc='git shortlog --summary --numbered'
 
 # Merge (m)
-alias gm='git merge'
-alias gmC='git merge --no-commit'
-alias gmF='git merge --no-ff'
-alias gma='git merge --abort'
-alias gmt='git mergetool'
+#alias gm='git merge'
+#alias gmC='git merge --no-commit'
+#alias gmF='git merge --no-ff'
+#alias gma='git merge --abort'
+#alias gmt='git mergetool'
 
 # Push (p)
-alias gp='git push'
-alias gpf='git push --force'
-alias gpa='git push --all'
-alias gpA='git push --all && git push --tags'
-alias gpt='git push --tags'
-alias gpc='git push --set-upstream origin "$(git-branch-current 2> /dev/null)"'
-alias gpp='git pull origin "$(git-branch-current 2> /dev/null)" && git push origin "$(git-branch-current 2> /dev/null)"'
+#alias gp='git push'
+#alias gpf='git push --force'
+#alias gpa='git push --all'
+#alias gpA='git push --all && git push --tags'
+#alias gpt='git push --tags'
+#alias gpc='git push --set-upstream origin "$(git-branch-current 2> /dev/null)"'
+#alias gpp='git pull origin "$(git-branch-current 2> /dev/null)" && git push origin "$(git-branch-current 2> /dev/null)"'
 
 # Rebase (r)
-alias gr='git rebase'
-alias gra='git rebase --abort'
-alias grc='git rebase --continue'
-alias gri='git rebase --interactive'
-alias grs='git rebase --skip'
+#alias gr='git rebase'
+#alias gra='git rebase --abort'
+#alias grc='git rebase --continue'
+#alias gri='git rebase --interactive'
+#alias grs='git rebase --skip'
 
 # Remote (R)
-alias gR='git remote'
-alias gRl='git remote --verbose'
-alias gRa='git remote add'
-alias gRx='git remote rm'
-alias gRm='git remote rename'
-alias gRu='git remote update'
-alias gRp='git remote prune'
-alias gRs='git remote show'
-alias gRb='git-hub-browse'
+#alias gR='git remote'
+#alias gRl='git remote --verbose'
+#alias gRa='git remote add'
+#alias gRx='git remote rm'
+#alias gRm='git remote rename'
+#alias gRu='git remote update'
+#alias gRp='git remote prune'
+#alias gRs='git remote show'
+#alias gRb='git-hub-browse'
 
 # Stash (s)
-alias gs='git stash'
-alias gsa='git stash apply'
-alias gsx='git stash drop'
-alias gsX='git-stash-clear-interactive'
-alias gsl='git stash list'
-alias gsL='git-stash-dropped'
-alias gsd='git stash show --patch --stat'
-alias gsp='git stash pop'
-alias gsr='git-stash-recover'
-alias gss='git stash save --include-untracked'
-alias gsS='git stash save --patch --no-keep-index'
-alias gsw='git stash save --include-untracked --keep-index'
+#alias gs='git stash'
+#alias gsa='git stash apply'
+#alias gsx='git stash drop'
+#alias gsX='git-stash-clear-interactive'
+#alias gsl='git stash list'
+#alias gsL='git-stash-dropped'
+#alias gsd='git stash show --patch --stat'
+#alias gsp='git stash pop'
+#alias gsr='git-stash-recover'
+#alias gss='git stash save --include-untracked'
+#alias gsS='git stash save --patch --no-keep-index'
+#alias gsw='git stash save --include-untracked --keep-index'
 
 # Submodule (S)
-alias gS='git submodule'
-alias gSa='git submodule add'
-alias gSf='git submodule foreach'
-alias gSi='git submodule init'
-alias gSI='git submodule update --init --recursive'
-alias gSl='git submodule status'
-alias gSm='git-submodule-move'
-alias gSs='git submodule sync'
-alias gSu='git submodule foreach git pull origin master'
-alias gSx='git-submodule-remove'
+#alias gS='git submodule'
+#alias gSa='git submodule add'
+#alias gSf='git submodule foreach'
+#alias gSi='git submodule init'
+#alias gSI='git submodule update --init --recursive'
+#alias gSl='git submodule status'
+#alias gSm='git-submodule-move'
+#alias gSs='git submodule sync'
+#alias gSu='git submodule foreach git pull origin master'
+#alias gSx='git-submodule-remove'
 
 # Working Copy (w)
-alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
-alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'
-alias gwd='git diff --no-ext-diff'
-alias gwD='git diff --no-ext-diff --word-diff'
-alias gwr='git reset --soft'
-alias gwR='git reset --hard'
-alias gwc='git clean -n'
-alias gwC='git clean -f'
-alias gwx='git rm -r'
-alias gwX='git rm -rf'
+#alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
+#alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'
+#alias gwd='git diff --no-ext-diff'
+#alias gwD='git diff --no-ext-diff --word-diff'
+#alias gwr='git reset --soft'
+#alias gwR='git reset --hard'
+#alias gwc='git clean -n'
+#alias gwC='git clean -f'
+#alias gwx='git rm -r'
+#alias gwX='git rm -rf'
diff --git a/runcoms/zshrc b/runcoms/zshrc
index 039b882d..c232c2bf 100644
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -11,3 +11,21 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
 fi
 
 # Customize to your needs...
+alias c='clear'
+alias lsa='ls -a'
+alias v='vim'
+
+#RaspberryPi
+export RPI=10.1.1.202
+
+# Git
+alias g='git'
+alias gb='git branch -v'
+alias gco='git checkout'
+alias gst='git status'
+
+# URBN
+export MISL_LOCAL_DEV='http://localhost:8800'
+alias MobileServices='cd ~/URBNLocal/source/MobileServices'
+alias MISLWebUI='cd ~/URBNLocal/source/MISLWebUI'
+