diff --git a/.spellr_wordlists/english.txt b/.spellr_wordlists/english.txt index 1593841..0afc8a8 100644 --- a/.spellr_wordlists/english.txt +++ b/.spellr_wordlists/english.txt @@ -5,8 +5,6 @@ an'd applescript argf asc -asdf -asdfrc autocorrect autolint automain @@ -200,6 +198,7 @@ pwd pyenv rackup rakefile +rbenv rbspy rcu rcur diff --git a/Brewfile b/Brewfile index 27d8292..adc2baf 100644 --- a/Brewfile +++ b/Brewfile @@ -4,7 +4,8 @@ tap "homebrew/cask" tap "homebrew/cask-fonts" tap "homebrew/core" tap "homebrew/services" -brew "asdf" +brew "rbenv" +brew "ruby-build" brew "exercism" brew "diffr" brew "git" diff --git a/LaunchAgents/sh.dana.github-cctray.plist b/LaunchAgents/sh.dana.github-cctray.plist index 6655042..db7b8e3 100644 --- a/LaunchAgents/sh.dana.github-cctray.plist +++ b/LaunchAgents/sh.dana.github-cctray.plist @@ -8,16 +8,18 @@ $PATH BUNDLE_GEMFILE $HOME/.dotfiles/github-cctray/Gemfile - ASDF_RUBY_VERSION + RBENV_VERSION 3.2.2 - ASDF_DIR - /usr/local/opt/asdf/libexec Label sh.dana.github-cctray ProgramArguments - $HOME/.asdf/shims/bundle + /usr/local/bin/rbenv + exec + bundle + exec + bundle exec rackup -p diff --git a/bash_profile b/bash_profile index 80f7f24..de13710 100755 --- a/bash_profile +++ b/bash_profile @@ -16,23 +16,10 @@ if [[ -f /opt/homebrew/bin/brew ]]; then eval "$(/opt/homebrew/bin/brew shellenv)" fi -# Brew doesn't finish setting this up, so i must do it -if [[ -d "$(brew --prefix libffi)" ]]; then - export LDFLAGS="-L$(brew --prefix libffi)/lib" - export CPPFLAGS="-I$(brew --prefix libffi)/include" - export PKG_CONFIG_PATH="$(brew --prefix libffi)/lib/pkgconfig" -fi - - if [[ -f ~/.cargo/env ]]; then source /Users/dana/.cargo/env fi -if [[ -f "$(brew --prefix asdf)/libexec/asdf.sh" ]]; then - source "$(brew --prefix asdf)/libexec/asdf.sh" - source "$(brew --prefix asdf)/etc/bash_completion.d/asdf.bash" -fi - source ~/.dotfiles/locals/secrets.sh source ~/.dotfiles/functions/nvm_support.sh source ~/.dotfiles/functions/bash_support.sh @@ -68,3 +55,5 @@ fi export PS2="\[$C_PINK\]ยป \[$C_RESET\]" export PS1="\[\$(last_command_style)\]\[$C_PINK\]\w\[$C_LIGHT_PINK\]\$(prompt_version)\[\$(prompt_git_color)\]\$(prompt_git)$PS2" + +eval "$(rbenv init - bash)" diff --git a/scripts/install.sh b/scripts/install.sh index fdb9d03..40cf18e 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -14,7 +14,6 @@ echodo ln -sf ~/.dotfiles/gemrc ~/.gemrc echodo ln -sf ~/.dotfiles/irbrc ~/.irbrc echodo ln -sf ~/.dotfiles/finicky.js ~/.finicky.js echodo ln -sf ~/.dotfiles/vimrc ~/.vimrc -echodo ln -sf ~/.dotfiles/asdfrc ~/.asdfrc echodo mkdir -p ~/.ssh echodo ln -sf ~/.dotfiles/ssh_config ~/.ssh/config echodo mkdir -p ~/.bundle diff --git a/scripts/update.sh b/scripts/update.sh index 5bb8032..3410f1a 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -30,15 +30,10 @@ git submodule add git@github.com:robotdana/github-cctray.git git_update_submodules ( cd github-cctray && git remote add upstream git@github.com:joejag/github-cctray.git ) -if [[ ! -z "$(which asdf)" ]]; then - asdf plugin add nodejs - asdf plugin add ruby - - asdf install ruby latest:3.0 - asdf install ruby latest:3.1 - asdf install ruby latest:3.2 - asdf install ruby 3.3.0-preview3 -end +rbenv install 3.0 +rbenv install 3.1 +rbenv install 3.2 +rbenv install 3.3.0-preview3 install_launchagents.sh