Permalink
Browse files

ohmzsh + other hacks

  • Loading branch information...
1 parent fb87f00 commit f3170efd72b56209bffaa9fad2ceead56eb96a10 @plukevdh committed Jul 21, 2012
Showing with 32 additions and 5 deletions.
  1. +3 −0 .gitmodules
  2. +2 −2 home/.aliases
  3. +25 −1 home/.githelpers
  4. +1 −1 home/.oh-my-zsh
  5. +1 −1 home/.zshrc
View
3 .gitmodules
@@ -0,0 +1,3 @@
+[submodule "home/.oh-my-zsh"]
+ path = home/.oh-my-zsh
+ url = git://github.com/robbyrussell/oh-my-zsh.git
View
4 home/.aliases
@@ -1,3 +1,3 @@
-crunch = ~/Code/Projects/crunchy/crunch
-echo = ~/Code/Projects/crunchy/echo
+crunch = ~/code/projects/crunchy/crunch
+echo = ~/code/projects/crunchy/echo
View
26 home/.githelpers
@@ -11,4 +11,28 @@ pretty_git_log() {
sed -Ee 's/(^[^<]*) ago)/\1)/' -Ee 's/(^[^<]*), [[:digit:]]+ .*months?)/\1)/' |
column -s '}' -t |
less -FXRS
-}
+}
+
+eval "$(hub alias -s)"
+# hub tab-completion script for zsh.
+# This script complements the completion script that ships with git.
+#
+# vim: ft=zsh sw=2 ts=2 et
+
+# Autoload _git completion functions
+if declare -f _git > /dev/null; then
+_git
+fi
+
+if declare -f _git_commands > /dev/null; then
+_hub_commands=(
+ 'alias:show shell instructions for wrapping git'
+ 'pull-request:open a pull request on GitHub'
+ 'fork:fork origin repo on GitHub'
+ 'create:create new repo on GitHub for the current project'
+ 'browse:browse the project on GitHub'
+ 'compare:open GitHub compare view'
+ )
+# Extend the '_git_commands' function with hub commands
+eval "$(declare -f _git_commands | sed -e 's/base_commands=(/base_commands=(${_hub_commands} /')"
+fi
2 home/.oh-my-zsh
@@ -1 +1 @@
-Subproject commit 11034217a7ea3cffe6e0fe631837c518b8c7e1a5
+Subproject commit d05b2010ffd4cd33ff9402c402051b1caf985d97
View
2 home/.zshrc
@@ -14,7 +14,7 @@ bindkey -e
COMPLETION_WAITING_DOTS=true
JRUBY_INVOCATION="$(readlink "$(which celerity_jruby)")"
export JRUBY_OPTS=--1.9
-PATH="~/.rvm/bin:/usr/local/bin:/usr/local/sbin/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/share/npm/bin:$PATH"
+PATH="~/.rvm/bin:/usr/local/bin:/usr/local/sbin/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/share/npm/bin:~/.gem/ruby/1.9.1/bin:$PATH"
TZ="America/New_York"
HISTFILE=$HOME/.zhistory
HISTSIZE=1000

0 comments on commit f3170ef

Please sign in to comment.