removing vim stuff as I use janus

bin/server-reload

@@ -0,0 +1,4 @@
+#!/bin/sh
+ps aux | grep nginx | awk '{print }' | xargs sudo kill -9
+sudo nginx
+script/unicorn_dev

git/aliases.zsh

@@ -1,33 +1,21 @@
 # Use `hub` as our git wrapper:
 #   http://defunkt.github.com/hub/
-#
-# I use JRuby substantially, and we want to make sure hub is run using MRI
-# regardless of which Ruby you're using or else the `git status` in your prompt
-# will take seven thousand seconds to run `ls`.
-#
-# I'm hardcoding it to an installed rvm (using rvm's `rvm 1.8.7,ruby /hub/path`
-# syntax is way too slow). It should work fine for those without rvm, though.
-if [[ -s $HOME/.rvm/scripts/rvm ]] 
-then
-  # alias git='$HOME/.rvm/rubies/ruby-1.8.7-p302/bin/ruby `which hub`'
-  alias git='$HOME/.rvm/rubies/ruby-1.8.7-p330/bin/ruby `which hub`'
-fi
-
-# The rest of my fun git aliases
-# alias ga='git add .'
+git(){hub "$@"}
 ga() {
  git add .
  git add -u
 }
-alias gl='git pull --rebase --prune'
-alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
-alias gp='git push origin HEAD'
+alias g='git'
+alias gp='git pull --rebase --prune'
+alias gpush='git push origin HEAD'
+# alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+# alias gp='git push origin HEAD'
 alias gd='git diff'
 alias gc='git commit'
 alias gitc='git commit -m'
-alias gca='git commit -a'
+# alias gca='git commit -a'
 alias gco='git checkout'
 alias gb='git branch'
 alias gss='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
-alias gs='git status' # upgrade your git if -sb breaks for you. it's fun.
-alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
+alias gs='git status'
+# alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"

git/gitconfig.sample

@@ -7,24 +7,17 @@
 # can symlink ~/.gitconfig to this file and go rock out with your git out!
 
 [user]
-        name = Zach Holman
-        email = your@example.com
-[alias]
-        co = checkout
-        promote = !$ZSH/bin/git-promote
-        wtf     = !$ZSH/bin/git-wtf
-        rank-contributers = !$ZSH/bin/git-rank-contributers
-        count   = !git shortlog -sn
+  name = Tim Clem
+  email = timothy.clem@gmail.com
+[github]
+	user = tclem
+	token = 30105e012899452fc53ec28c637d988f
 [color]
-        diff = auto
-        status = auto
-        branch = auto
+	ui = true
+[rerere]
+	enabled = true
+[alias]
+	lol = log --oneline --graph --decorate
 [core]
-        excludesfile = ~/.gitignore
-        editor = mate -w
-[apply]
-        whitespace = nowarn
-[github]
-        user = holman
-[mergetool]
-        keepBackup = false
+	autocrlf = input
+

ruby/aliases.zsh

@@ -1,12 +1,13 @@
 alias r='rvm use 1.8.7'
 
-alias f='RAILS_ENV=fi'
-
 alias sc='script/console'
 alias ss='script/server -p `available_rails_port`'
 alias sg='script/generate'
 alias sd='script/destroy'
 
 alias migrate='rake db:migrate db:test:clone'
 
-alias s="ps aux | grep \"[r]uby\" | grep script/server || echo \"You're not running any, dawg.\""
+alias s="ps aux | grep \"[r]uby\" | grep script/server || echo \"You're not running any, dawg.\""
+
+alias killnginx="ps aux | grep nginx | awk '{print $2}' | xargs sudo kill -9"
+

zsh/aliases.zsh

@@ -1,4 +1,5 @@
 alias dotmate='mate $ZSH'
 alias dotcd='cd $ZSH'
 
-alias reload!='. ~/.zshrc'
+alias reload!='. ~/.zshrc'
+alias v=mvim

zsh/completion.zsh

@@ -3,3 +3,7 @@ zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
 
 # pasting with tabs doesn't perform completion
 zstyle ':completion:*' insert-tab pending
+
+# tab completion colors
+zstyle ':completion:*' list-colors ''
+#zstyle ':completion:*' list-colors ${(s.:.)LSCOLORS}

zsh/prompt.zsh

@@ -22,13 +22,13 @@ git_dirty() {
 }
 
 git_prompt_info () {
- ref=$(git symbolic-ref HEAD 2>/dev/null) || return
+  ref=$(git symbolic-ref HEAD 2>/dev/null) || return
 # echo "(%{\e[0;33m%}${ref#refs/heads/}%{\e[0m%})"
- echo "${ref#refs/heads/}"
+  echo "${ref#refs/heads/}"
 }
 
 project_name () {
-  name=$(pwd | awk -F'Development/' '{print $2}' | awk -F/ '{print $1}')
+  name=$(pwd | awk -F'GitHub/' '{print $2}' | awk -F/ '{print $1}')
   echo $name
 }
 
@@ -44,9 +44,9 @@ unpushed () {
 need_push () {
   if [[ $(unpushed) == "" ]]
   then
-    echo " "
+    echo ""
   else
-    echo "with %{$fg_bold[magenta]%}unpushed%{$reset_color%}"
+    echo " with %{$fg_bold[magenta]%}unpushed%{$reset_color%}"
   fi
 }
 
@@ -63,11 +63,9 @@ directory_name(){
   echo "%{$fg_bold[cyan]%}%1/%\/%{$reset_color%}"
 }
 
-export PROMPT=$'\n$(rvm_prompt) in $(directory_name) $(project_name_color)$(git_dirty) $(need_push)\n› '
-set_prompt () {
-  export RPROMPT=""
-}
+date_time='%D{%m.%d.%Y} %@'
+
+export PROMPT=$'$(rvm_prompt) in $(directory_name) $(project_name_color)$(git_dirty)$(need_push)\n%% '
+#export RPROMPT=$'$date_time'
+export RPROMPT=""
 
-precmd() {
-  set_prompt
-}