Merge b637dbd84a into caa15548c1

lib/aliases.zsh

@@ -16,9 +16,8 @@ alias history='fc -l 1'
 
 # List direcory contents
 alias lsa='ls -lah'
-alias l='ls -la'
+alias l='ls -1a'
-alias ll='ls -l'
+alias ll='ls -halF'
-alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
 

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'

themes/ocodo.zsh-theme

@@ -0,0 +1,16 @@
+# 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])"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="$fg_bold[cyan]*"

themes/squee.zsh-theme

@@ -0,0 +1,13 @@
+# 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
+$ '
+# 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]*"