Browse files

latest tweex

  • Loading branch information...
1 parent d6fe003 commit b302446c9ac342f7be9aac1b9810114803c12ef4 @lachie committed Jan 20, 2012
View
2 home/.oh-my-zsh/custom/aliases.zsh
@@ -10,7 +10,7 @@ alias start_mongod="mongod --config /usr/local/Cellar/mongodb/1.6.5-x86_64/mongo
alias less="less -r"
function apk() {
- ack "$@" app lib
+ ack "$@" app lib spec
}
function f() {
View
9 home/.oh-my-zsh/custom/ec2.zsh
@@ -0,0 +1,9 @@
+export EC2_KEYPAIR_US_EAST_1=default
+
+
+export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
+export EC2_PRIVATE_KEY="$(/bin/ls $HOME/.ec2/pk-*.pem)"
+export EC2_CERT="$(/bin/ls $HOME/.ec2/cert-*.pem)"
+
+export EC2_HOME="/usr/local/Cellar/ec2-api-tools/1.4.4.1/jars"
+export AWS_RDS_HOME="/usr/local/Cellar/rds-command-line-tools/1.3.003/jars"
View
7 home/.oh-my-zsh/custom/editor.zsh
@@ -3,6 +3,11 @@ export EDITOR=/usr/bin/vim
function mvim()
{
# spawn a sub-shell, unset environment variables for the sub-shell, start mvim.
- (unset GEM_PATH; unset GEM_HOME; command mvim "$@")
+ (
+ unset GEM_PATH
+ unset GEM_HOME
+ rbenv shell system
+ command mvim "$@"
+ )
}
View
12 home/.oh-my-zsh/custom/git.zsh
@@ -11,3 +11,15 @@ export git_concise_log_format='--pretty=format:%Cblue%h%d%Creset %ar %Cgreen%an%
alias glog='git log $git_concise_log_format'
alias gl='glog --graph'
alias glg='git log --graph --oneline --decorate'
+
+
+
+function git_current_branch() {
+ git symbolic-ref HEAD 2> /dev/null | sed -e 's/refs\/heads\///'
+}
+
+alias gpthis='git push origin HEAD:$(git_current_branch)'
+alias grb='git rebase -p'
+alias gup='git fetch origin && grb origin/$(git_current_branch)'
+alias gm='git merge --no-ff'
+
View
1 home/.oh-my-zsh/custom/ruby.zsh
@@ -1,2 +1,3 @@
export ARCHFLAGS="-arch x86_64"
alias be="bundle exec"
+
View
2 home/.oh-my-zsh/plugins/projects/projects.plugin.zsh
@@ -1,5 +1,5 @@
p_completion_cache=$HOME/.config/completion_caches/p/repos.sqlite
-project_roots=($HOME/dev $HOME/Dropbox/dev)
+project_roots=($HOME/dev $HOME/Dropbox/dev $HOME/Blake)
# main commands
View
2 home/.oh-my-zsh/plugins/rubygems/rubygems.plugin.zsh
@@ -6,7 +6,7 @@ find_gem() {
}
cdgem() {
- cd $(find_gem $@)
+ cd $(find_gem $@)/lib
}
vigem() {
View
4 home/.zshrc
@@ -25,7 +25,7 @@ plugins=(git projects rubygems zsh-syntax-highlighting zsh-history-substring-sea
source $ZSH/oh-my-zsh.sh
-path=( $HOME/bin /usr/local/sbin $path )
+path=( $HOME/.rbenv/bin $HOME/.rbenv/shims $HOME/bin /usr/local/sbin $path )
# Customize to your needs...
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
+eval "$(rbenv init - zsh)"

0 comments on commit b302446

Please sign in to comment.