Permalink
Browse files

kill rvm

  • Loading branch information...
1 parent dac92c6 commit 9e270f25c06a723b11a7c4fa56bff035eb0bd08d @holman holman committed Apr 10, 2012
Showing with 15 additions and 13 deletions.
  1. +4 −4 README.markdown
  2. +1 −1 git/aliases.zsh
  3. +1 −1 ruby/aliases.zsh
  4. +0 −1 ruby/rvm.zsh
  5. +2 −2 system/path.zsh
  6. +4 −4 zsh/prompt.zsh
  7. +3 −0 zsh/zshrc.symlink
View
@@ -3,7 +3,7 @@
## dotfiles
Your dotfiles are how you personalize your system. These are mine. The very
-prejudiced mix: OS X, zsh, Ruby, Rails, git, homebrew, rvm, vim. If you
+prejudiced mix: OS X, zsh, Ruby, Rails, git, homebrew, rbenv, vim. If you
match up along most of those lines, you may dig my dotfiles.
I was a little tired of having long alias files and everything strewn about
@@ -66,13 +66,13 @@ bubble bath.
- If you want some more colors for things like `ls`, install grc: `brew install
grc`.
-- If you install the excellent [rvm](http://rvm.beginrescueend.com) to manage
- multiple rubies, your current branch will show up in the prompt. Bonus.
+- If you install the excellent [rbenv](https://github.com/sstephenson/rbenv) to
+ manage multiple rubies, your current branch will show up in the prompt. Bonus.
## bugs
I want this to work for everyone; that means when you clone it down it should
-work for you even though you may not have `rvm` installed, for example. That
+work for you even though you may not have `rbenv` installed, for example. That
said, I do use this as *my* dotfiles, so there's a good chance I may break
something if I forget to make a check for a dependency.
View
@@ -26,4 +26,4 @@ alias gca='git commit -a'
alias gco='git checkout'
alias gb='git branch'
alias gs='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
-alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
+alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
View
@@ -1,4 +1,4 @@
-alias r='rvm use 1.8.7'
+alias r='rbenv local 1.8.7-p358'
alias sc='script/console'
alias sg='script/generate'
View
@@ -1 +0,0 @@
-[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
View
@@ -1,3 +1,3 @@
-export PATH="./bin:/usr/local/bin:/usr/local/sbin:$HOME/.sfs:$ZSH/bin:$PATH:$HOME/.rvm/bin"
+export PATH="./bin:/usr/local/bin:/usr/local/sbin:$HOME/.sfs:$ZSH/bin:$HOME/.rbenv/bin:$PATH"
-export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
+export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
View
@@ -40,10 +40,10 @@ need_push () {
fi
}
-rvm_prompt(){
- if $(which rvm &> /dev/null)
+rb_prompt(){
+ if $(which rbenv &> /dev/null)
then
- echo "%{$fg_bold[yellow]%}$(rvm tools identifier)%{$reset_color%}"
+ echo "%{$fg_bold[yellow]%}$(cat $HOME/.rbenv/version)%{$reset_color%}"
else
echo ""
fi
@@ -72,7 +72,7 @@ directory_name(){
echo "%{$fg_bold[cyan]%}%1/%\/%{$reset_color%}"
}
-export PROMPT=$'\n$(rvm_prompt) in $(directory_name) $(git_dirty)$(need_push)\n'
+export PROMPT=$'\n$(rb_prompt) in $(directory_name) $(git_dirty)$(need_push)\n'
set_prompt () {
export RPROMPT="%{$fg_bold[cyan]%}$(todo)%{$reset_color%}"
}
View
@@ -20,3 +20,6 @@ compinit
# load every completion after autocomplete loads
for config_file ($ZSH/**/completion.sh) source $config_file
+
+# I guess we need to load rbenv last. Meh.
+eval "$(rbenv init -)"

0 comments on commit 9e270f2

Please sign in to comment.