From 7a996880473c3276eb2f4996d11bfc8a68b6514d Mon Sep 17 00:00:00 2001
From: jasonm23 <jasonm23@gmail.com>
Date: Sun, 3 Jun 2012 18:41:44 +1000
Subject: [PATCH 1/3] added personal aliases

padrino aliases as a plugin

ocodo and squee zsh-prompts (osx specific)
---
 lib/aliases.zsh        | 5 ++---
 lib/padrino.zsh        | 8 ++++++++
 themes/ocodo.zsh-theme | 9 +++++++++
 themes/squee.zsh-theme | 9 +++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 lib/padrino.zsh
 create mode 100644 themes/ocodo.zsh-theme
 create mode 100644 themes/squee.zsh-theme

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 0555be264..2cc42078e 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -16,9 +16,8 @@ alias history='fc -l 1'
 
 # List direcory contents
 alias lsa='ls -lah'
-alias l='ls -la'
-alias ll='ls -l'
-alias sl=ls # often screw this up
+alias l='ls -1a'
+alias ll='ls -halF'
 
 alias afind='ack-grep -il'
 
diff --git a/lib/padrino.zsh b/lib/padrino.zsh
new file mode 100644
index 000000000..9db47533a
--- /dev/null
+++ b/lib/padrino.zsh
@@ -0,0 +1,8 @@
+alias padpg='padrino g admin_page'
+alias par='padrino rake ar:migrate'
+alias pcon='padrino console'
+alias pdaem='padrino start -d'
+alias pg='padrino gen'
+alias pprod='padrino stop; padrino start -de production'
+alias pstart='padrino start'
+alias pstop='padrino stop'
diff --git a/themes/ocodo.zsh-theme b/themes/ocodo.zsh-theme
new file mode 100644
index 000000000..cf7ce606b
--- /dev/null
+++ b/themes/ocodo.zsh-theme
@@ -0,0 +1,9 @@
+LHOST=$(scutil --get LocalHostName)
+PROMPT='$FG[030][$FG[079]%n@$LHOST$FG[030]][$FG[043]%t$FG[030] $(git_prompt_info)$FG[116]$(rvm_prompt_info)$FG[030]]$reset_color
+$FG[030][$FG[079]%~$FG[030]]$reset_color
+$ '
+# git theming
+ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[red]($fg_bold[white]"
+ZSH_THEME_GIT_PROMPT_SUFFIX="$fg_bold[red])"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="$fg_bold[cyan]*"
diff --git a/themes/squee.zsh-theme b/themes/squee.zsh-theme
new file mode 100644
index 000000000..f1db6edb9
--- /dev/null
+++ b/themes/squee.zsh-theme
@@ -0,0 +1,9 @@
+LHOST=$(scutil --get LocalHostName)
+PROMPT='$fg_bold[magenta][$fg[white]%t$fg_bold[magenta]]$fg_bold[magenta] [$fg[white]%n@$LHOST$fg_bold[magenta]]
+[$fg[white]%~$(git_prompt_info)$fg[white]$(rvm_prompt_info)$fg_bold[magenta]]$reset_color
+$ '
+# git theming                                                                                                                                                                   
+ZSH_THEME_GIT_PROMPT_PREFIX=" $fg_bold[red]($fg_bold[white]"
+ZSH_THEME_GIT_PROMPT_SUFFIX="$fg_bold[red])"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="$fg_bold[cyan]*"

From fec2b905e537ff3b9b09678b89d59a6fdb95ab16 Mon Sep 17 00:00:00 2001
From: Jason <jasonm23@gmail.com>
Date: Sun, 3 Jun 2012 18:51:58 +1000
Subject: [PATCH 2/3] ocodo.zsh-theme - an xterm-256color specific theme,
 replace 030,079,043,116 to $FG colors of your choice.

---
 themes/ocodo.zsh-theme | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/themes/ocodo.zsh-theme b/themes/ocodo.zsh-theme
index cf7ce606b..c26f32506 100644
--- a/themes/ocodo.zsh-theme
+++ b/themes/ocodo.zsh-theme
@@ -1,7 +1,14 @@
-LHOST=$(scutil --get LocalHostName)
+# Use this theme with xterm-256color
+
+# Uncomment for os x specific LocalHostName (if, like me you get irritating ISP assigned Hostnames)
+# LHOST=$(scutil --get LocalHostName)
+
+LHOST=$HOST
+
 PROMPT='$FG[030][$FG[079]%n@$LHOST$FG[030]][$FG[043]%t$FG[030] $(git_prompt_info)$FG[116]$(rvm_prompt_info)$FG[030]]$reset_color
 $FG[030][$FG[079]%~$FG[030]]$reset_color
 $ '
+
 # git theming
 ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[red]($fg_bold[white]"
 ZSH_THEME_GIT_PROMPT_SUFFIX="$fg_bold[red])"

From b637dbd84a96456e858975e369c1bec29d09cf9e Mon Sep 17 00:00:00 2001
From: Jason <jasonm23@gmail.com>
Date: Sun, 3 Jun 2012 18:55:51 +1000
Subject: [PATCH 3/3] Squee.zsh-theme a pleasant little zsh-theme

---
 themes/squee.zsh-theme | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/themes/squee.zsh-theme b/themes/squee.zsh-theme
index f1db6edb9..d8dbfbdea 100644
--- a/themes/squee.zsh-theme
+++ b/themes/squee.zsh-theme
@@ -1,4 +1,8 @@
-LHOST=$(scutil --get LocalHostName)
+# Squee a pleasant little zsh-theme
+
+# LHOST=$(scutil --get LocalHostName)
+# ^ uncomment and v comment - for better os x hostname support
+LHOST=$HOST
 PROMPT='$fg_bold[magenta][$fg[white]%t$fg_bold[magenta]]$fg_bold[magenta] [$fg[white]%n@$LHOST$fg_bold[magenta]]
 [$fg[white]%~$(git_prompt_info)$fg[white]$(rvm_prompt_info)$fg_bold[magenta]]$reset_color
 $ '