diff --git a/.homesick_subdir b/.homesick_subdir index 0419568..37b8738 100644 --- a/.homesick_subdir +++ b/.homesick_subdir @@ -1,2 +1,3 @@ .ssh .chef +.rbenv diff --git a/home/.Brewfile b/home/.Brewfile index d07a565..470518b 100644 --- a/home/.Brewfile +++ b/home/.Brewfile @@ -26,6 +26,7 @@ brew 'postgresql' brew 'pwgen' brew 'pyenv' brew 'rbenv' +brew 'rbenv-default-gems' brew 'reattach-to-user-namespace' brew 'ssh-copy-id' brew 'tmux' diff --git a/home/.rbenv/default-gems b/home/.rbenv/default-gems new file mode 100644 index 0000000..faa5550 --- /dev/null +++ b/home/.rbenv/default-gems @@ -0,0 +1,5 @@ +bundler +jekyll +homesick +rails +tmuxinator diff --git a/home/.zsh/custom/walkah.zsh-theme b/home/.zsh/custom/walkah.zsh-theme index 4e51201..a47bd45 100644 --- a/home/.zsh/custom/walkah.zsh-theme +++ b/home/.zsh/custom/walkah.zsh-theme @@ -3,10 +3,9 @@ if [ -z $SSH_CONNECTION ]; then HCOLOR="green"; else HCOLOR="blue"; fi local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" -PROMPT='%{$fg[$HCOLOR]%}%m%{$reset_color%}:%c \ -$(git_prompt_info)%{$fg[red]%}%(!.#.»)%{$reset_color%} ' +PROMPT='%{$fg[$HCOLOR]%}%m%{$reset_color%}:%c $(git_prompt_info)%{$fg[red]%}%(!.#.»)%{$reset_color%} ' PROMPT2='%{$fg[red]%}\ %{$reset_color%}' -RPS1='%{$fg[cyan]%}(ruby-$(ruby_prompt_info)/node-$(nvm_prompt_info)) %{$reset_color%}${return_code}' +RPS1='%{$fg[cyan]%}(%{$fg[red]%}$(ruby_prompt_info) %{$fg[green]%}$(nvm current) %{$fg[blue]%}$(pyenv_prompt_info)%{$fg[cyan]%}) %{$reset_color%}${return_code}' ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " diff --git a/home/.zshrc b/home/.zshrc index 839407a..445d1bd 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -23,6 +23,7 @@ plugins=(extract command-not-found tmux tmuxinator git github git-flow ssh-agent # ruby plugins=($plugins ruby gem rbenv rails bundler heroku) +export RBENV_ROOT=$HOME/.rbenv # node plugins=($plugins nvm npm yarn) @@ -47,6 +48,7 @@ UNBUNDLED_COMMANDS=(knife) # nvm from homebrew if [ -f /usr/local/opt/nvm/nvm.sh ]; then + export NVM_DIR=$HOME/.nvm source /usr/local/opt/nvm/nvm.sh fi