From 63c637726ee176c6ab3af40f39689ebb5c2b3222 Mon Sep 17 00:00:00 2001
From: Daniel Dixon <code@danieldixon.com>
Date: Tue, 19 Jun 2012 19:43:47 -0500
Subject: [PATCH 1/8] Customizing for me.

---
 templates/zshrc.zsh-template | 2 +-
 tools/install.sh             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e52553241..a1ed0881f 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="robbyrussell"
+ZSH_THEME="eastwood"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
diff --git a/tools/install.sh b/tools/install.sh
index 8ca427d2c..c6f50369d 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -7,7 +7,7 @@ fi
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
 which git > /dev/null
 if [[ $? -eq 0 ]]; then
-  /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+  /usr/bin/env git clone https://github.com/onedanshow/oh-my-zsh.git ~/.oh-my-zsh
 else
   echo "git not installed"
   exit

From e12f239b2ae6de220f1a5da183f5ac4dc5367bbe Mon Sep 17 00:00:00 2001
From: Daniel Dixon <code@danieldixon.com>
Date: Wed, 20 Jun 2012 09:56:22 -0500
Subject: [PATCH 2/8] Added more personalization.

---
 README.textile               |  6 ++--
 lib/aliases.zsh              | 70 +++++++++++++++++++++++++++++++++++-
 templates/zshrc.zsh-template |  2 +-
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/README.textile b/README.textile
index a38e2d7cf..c4fbcd64d 100644
--- a/README.textile
+++ b/README.textile
@@ -13,18 +13,18 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/onedanshow/oh-my-zsh/raw/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/onedanshow/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
 
 1. Clone the repository
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+  @git clone git://github.com/onedanshow/oh-my-zsh.git ~/.oh-my-zsh@
 
 2. Create a new zsh config by copying the zsh template we've provided.
 
diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 0555be264..f8648a634 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -17,8 +17,76 @@ alias history='fc -l 1'
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -la'
-alias ll='ls -l'
+#alias ll='ls -l'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
 
+# DD: mine, or added from https://github.com/thoughtbot/dotfiles
+
+# Folder aliases
+alias ls='ls -F'
+alias la='la -A'
+alias ll='ls -lA'
+alias ..='cd ..'
+alias ...='../..'
+alias path='echo -e ${PATH//:/\\\n}'
+
+# Ruby aliases
+alias rss='ruby script/server'
+alias rssd='ruby script/server -u'
+alias rsc='ruby script/console'
+
+# Gem/Rails aliases
+alias geml='gem list --local | more'
+alias geme='cd `rvm gemdir`/gems; ls'
+alias cap='bundle exec cap'
+alias rake='bundle exec rake'
+#alias migrate="rake db:migrate db:test:prepare"
+#alias remigrate="rake db:migrate && rake db:migrate:redo && rake db:schema:dump db:test:prepare"
+#alias remongrate="rake mongoid:migrate && rake mongoid:migrate:redo"
+
+# Git aliases
+alias g="git"
+alias glog='git log --color'
+alias gd='git diff --color'
+alias gs='git status'
+alias gcom='git commit'
+alias gpu='git pull'
+alias gps='git push'
+alias gcm='git checkout master'
+alias gcp='git checkout production'
+alias gch='git checkout'
+alias gmm='git merge master'
+#alias gci="git pull --rebase && rake && git push"
+alias tlf="tail -f"
+
+alias ln='ln -v'
+alias mkdir='mkdir -p'
+
+alias -g G='| grep'
+alias -g M='| less'
+alias -g L='| wc -l'
+alias -g ONE="| awk '{ print \$1}'"
+
+# git
+alias gci="git pull --rebase && rake && git push"
+
+# Bundler
+alias b="bundle"
+alias be="bundle exec"
+alias bake="bundle exec rake"
+
+# Tests and Specs
+alias t="ruby -I test"
+alias s="bundle exec rspec"
+alias cuc="bundle exec cucumber"
+
+# Rubygems
+alias gi="gem install"
+alias giv="gem install -v"
+
+# Network
+alias whats-my-ip="curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'"
+
+
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index a1ed0881f..b08ca0bb0 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -29,7 +29,7 @@ ZSH_THEME="eastwood"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git)
+plugins=(git ssh-agent sublime)
 
 source $ZSH/oh-my-zsh.sh
 

From 7017877f0eeca282cebed9ea9bab3b46ae2f306c Mon Sep 17 00:00:00 2001
From: Daniel Dixon <code@danieldixon.com>
Date: Sat, 23 Jun 2012 09:14:41 -0500
Subject: [PATCH 3/8] No auto correction on heroku or jitsu

---
 lib/aliases.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index f8648a634..d90addab7 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -89,4 +89,8 @@ alias giv="gem install -v"
 # Network
 alias whats-my-ip="curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'"
 
+# Annoyances
+alias heroku='nocorrect heroku'
+alias jitsu='nocorrect jitsu'
+
 

From ebf2f045089d976868a6df2d2533f7e2226532e2 Mon Sep 17 00:00:00 2001
From: Daniel Dixon <code@danieldixon.com>
Date: Tue, 10 Jul 2012 10:18:29 -0500
Subject: [PATCH 4/8] Added editor file.

---
 lib/editor.zsh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 lib/editor.zsh

diff --git a/lib/editor.zsh b/lib/editor.zsh
new file mode 100644
index 000000000..2e1828810
--- /dev/null
+++ b/lib/editor.zsh
@@ -0,0 +1,4 @@
+#
+# Editor options
+#
+export EDITOR=subl
\ No newline at end of file

From 3d281e939042ed44081bd3949376d03e6bbcbcd1 Mon Sep 17 00:00:00 2001
From: Daniel Dixon <code@danieldixon.com>
Date: Sat, 14 Jul 2012 09:24:11 -0500
Subject: [PATCH 5/8] Added guard to aliases.

---
 lib/aliases.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index d90addab7..4b7604225 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -92,5 +92,6 @@ alias whats-my-ip="curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'"
 # Annoyances
 alias heroku='nocorrect heroku'
 alias jitsu='nocorrect jitsu'
+alias guard='bundle exec guard'
 
 

From fb3db50269a6487026ba511d02cde9908b5bdddb Mon Sep 17 00:00:00 2001
From: Daniel Dixon <code@danieldixon.com>
Date: Tue, 1 Jan 2013 17:38:26 -0600
Subject: [PATCH 6/8] Added a paths file.

---
 lib/path.zsh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 lib/path.zsh

diff --git a/lib/path.zsh b/lib/path.zsh
new file mode 100644
index 000000000..1f3991dbd
--- /dev/null
+++ b/lib/path.zsh
@@ -0,0 +1,2 @@
+# DD: added, so that Titanium Appcelerator will work: http://developer.appcelerator.com/question/145794/launching-simulator-process-failed
+export PATH=$PATH:/usr/local/share/npm/bin
\ No newline at end of file

From c0b961e53415eaf9b3c818a10fae0db33c66a774 Mon Sep 17 00:00:00 2001
From: Daniel Dixon <code@danieldixon.com>
Date: Thu, 30 May 2013 12:42:29 -0500
Subject: [PATCH 7/8] Added 'p' for 'powder' gem to alises.

---
 lib/aliases.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 4b7604225..d1ef4d94a 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -46,6 +46,9 @@ alias rake='bundle exec rake'
 #alias remigrate="rake db:migrate && rake db:migrate:redo && rake db:schema:dump db:test:prepare"
 #alias remongrate="rake mongoid:migrate && rake mongoid:migrate:redo"
 
+# POW aliases
+alias p='powder'
+
 # Git aliases
 alias g="git"
 alias glog='git log --color'

From 614f8e4d039ee1f599d8ae8d126a63d42a99b474 Mon Sep 17 00:00:00 2001
From: Daniel Dixon <code@danieldixon.com>
Date: Tue, 6 Aug 2013 17:46:08 -0500
Subject: [PATCH 8/8] Added shortcut for heroku

---
 lib/aliases.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index d1ef4d94a..bd36ec211 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -94,6 +94,7 @@ alias whats-my-ip="curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'"
 
 # Annoyances
 alias heroku='nocorrect heroku'
+alias h='heroku'
 alias jitsu='nocorrect jitsu'
 alias guard='bundle exec guard'