Skip to content

Commit

Permalink
Remove asdf and install rtx
Browse files Browse the repository at this point in the history
Signed-off-by: Marcus Crane <[email protected]>
  • Loading branch information
marcus-crane committed Oct 20, 2023
1 parent 2b603bc commit 0660b85
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 84 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

# Generated chezmoi files
dot_ssh/authorized_keys.tmpl
dot_sqliterc
dot_zshrc.tmpl
docs/*.tmpl
4 changes: 4 additions & 0 deletions docs/dot_sqliterc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.headers on

.mode line

4 changes: 4 additions & 0 deletions dot_config/rtx/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[tools]
golang = '1.21.3'
hugo = '1.19.0'
python = '3.12.0'
4 changes: 4 additions & 0 deletions dot_sqliterc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.headers on

.mode line

2 changes: 2 additions & 0 deletions run_once_01_packages-darwin.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ tap "homebrew/cask-versions"
tap "common-fate/granted"
tap "espanso/espanso"
tap "go-task/tap"
tap "jdx/tap"
tap "railwaycat/emacsmacport"
tap "vectordotdev/brew"
tap "yt-dlp/taps"
Expand Down Expand Up @@ -81,6 +82,7 @@ brew "protobuf"
brew "pwgen"
brew "rclone"
brew "ripgrep"
brew "rtx"
brew "source-highlight"
brew "speedtest-cli"
brew "telnet"
Expand Down
5 changes: 0 additions & 5 deletions run_once_03_install_asdf.sh

This file was deleted.

38 changes: 0 additions & 38 deletions run_once_04_packages-asdf.sh.tmpl

This file was deleted.

43 changes: 3 additions & 40 deletions zshrc.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ path=(
/opt/homebrew/opt/mtr/sbin
/nix/var/nix/profiles/default/bin # (1)!
$HOME/.bin
$HOME/.asdf/installs/lua/5.4.3/luarocks/bin
$HOME/.asdf/installs/rust/nightly/bin
/opt/homebrew/bin # (2)!
/bin
/sbin
Expand Down Expand Up @@ -72,7 +70,6 @@ export ZSH="$HOME/.oh-my-zsh"
DISABLE_AUTO_UPDATE="true" # (1)!
ZSH_THEME="agnoster"
plugins=(
asdf
aws
fzf
# fzf-tab
Expand Down Expand Up @@ -165,21 +162,6 @@ REPORTTIME=5
## Applications
### asdf
The version manager to rule them all
It wraps a number of existing language version managers into plugins that can be managed through one unified CLI tool
```bash
export ASDF_DIR=$HOME/.asdf
if [[ -f $ASDF_DIR/asdf.sh ]]; then
. $ASDF_DIR/asdf.sh
fi
export PATH=$(asdf where nodejs)/.npm/bin:$PATH
export PATH=$(asdf where python)/bin:$PATH
```
### Emacs
Given that I use chezmoi, I can't have Doom Emacs editing the default config in `$HOME` so we need to overwrite that.
Expand Down Expand Up @@ -269,7 +251,7 @@ export PATH="$PNPM_HOME:$PATH"
### Erlang
Whenever I compile `erlang` (using `asdf`), I always use the same flags so it's easier to just set them within my shell
Whenever I compile `erlang`, I always use the same flags so it's easier to just set them within my shell
```bash
export ERL_AFLAGS="-kernel shell_history enabled"
Expand All @@ -279,18 +261,16 @@ export KERL_BUILD_DOCS="yes"
### go
I don't explicitly set `GOROOT` as it is defined by `asdf` generally.
I don't explicitly set `GOROOT` as it is defined by `rtx` generally.
```bash
export GOPATH="$WORKSPACE/go"
ASDF_GO_VERSION=$(asdf current golang | awk '{ print $2 }')
export GOROOT="$HOME/.asdf/installs/golang/$ASDF_GO_VERSION/go"
export PATH="$GOPATH/bin:$PATH"
```
### Terraform
Sometimes I use an older version of Terraform outside of asdf that doesn't support ARM builds
Sometimes I use an older version of Terraform outside of `rtx` that doesn't support ARM builds
```bash
if [[ $(type /usr/local/bin/terraform) ]]; then
Expand Down Expand Up @@ -831,23 +811,6 @@ tsd() {
}
```
### Quick view asdf plugin versions
This function is handy for quickly viewing plugin versions for asdf
It'll try to install the plugin and ignore the error that results from trying to install an already installed plugin.
```bash
asdfv() {
if [[ ! $1 ]]; then
echo "You must enter a plugin name"
else
asdf plugin-add $1 || true && asdf list-all $1 |
fzf --tac
fi
}
```
### Format Terraform plans for Github
At work, I occasionally paste Terraform plans into Github pull requests where they aren't otherwise automated.
Expand Down

0 comments on commit 0660b85

Please sign in to comment.