From e1105afa0c53c752690f584e11a9c0ef10e94a58 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 25 May 2023 02:14:19 +0100
Subject: [PATCH] feat: move various various tools to be managed with rtx

---
 Brewfile               |  5 -----
 config/rtx/config.toml |  1 +
 tool-versions          | 42 ++++++++++++++++++++++++------------------
 zsh/containers.zsh     |  6 ------
 zsh/golang.zsh         |  2 --
 zsh/linux.zsh          |  4 ----
 zshrc                  |  2 +-
 7 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/Brewfile b/Brewfile
index 39f0f08..1ee6536 100644
--- a/Brewfile
+++ b/Brewfile
@@ -29,7 +29,6 @@ brew 'geckodriver'
 brew 'git'
 brew 'git-crypt'
 brew 'git-delta'
-brew 'go'
 brew 'hadolint'
 brew 'hey'
 brew 'highlight'
@@ -60,7 +59,6 @@ brew 'telnet'
 brew 'terraform'
 brew 'terraform-ls'
 brew 'tflint'
-brew 'the_silver_searcher'
 brew 'tldr'
 brew 'tmux'
 brew 'trash'
@@ -163,9 +161,6 @@ if hostname == 'noct'
   brew 'go-jsonnet'
   brew 'influxdb'
   brew 'jsonnet-bundler'
-  brew 'kubernetes-cli'
-  brew 'helm'
-  brew 'kubectx'
   brew 'mariadb'
   cask 'lens'
 
diff --git a/config/rtx/config.toml b/config/rtx/config.toml
index 4ae669a..1cc85c1 100644
--- a/config/rtx/config.toml
+++ b/config/rtx/config.toml
@@ -1,2 +1,3 @@
 [settings]
 legacy_version_file = true
+experimental = true
diff --git a/tool-versions b/tool-versions
index 71887cf..6daab16 100644
--- a/tool-versions
+++ b/tool-versions
@@ -1,18 +1,24 @@
-bat        latest
-buf        latest
-difftastic latest
-direnv     latest
-dust       latest
-exa        latest
-golang     latest
-helm       latest
-jq         latest
-k9s        latest
-kubectl    latest
-neovim     latest
-nodejs     lts
-python     latest
-rclone     latest
-shellcheck latest
-shfmt      latest
-starship   latest
+actionlint    latest
+bat           latest
+buf           latest
+ctop          latest
+difftastic    latest
+direnv        latest
+dust          latest
+exa           latest
+golang        latest
+golangci-lint latest
+goreleaser    latest
+helm          latest
+jq            latest
+k9s           latest
+kubectl       latest
+kubectx       latest
+neovim        latest
+nodejs        lts
+python        latest
+rclone        latest
+shellcheck    latest
+shfmt         latest
+starship      latest
+terraform     latest
diff --git a/zsh/containers.zsh b/zsh/containers.zsh
index c84388d..4afffdb 100644
--- a/zsh/containers.zsh
+++ b/zsh/containers.zsh
@@ -2,12 +2,6 @@
 # Containers
 #
 
-# Docker
-if command-exists docker; then
-  zinit light-mode wait lucid from'gh-r' as'program' mv'ctop-* -> ctop' \
-    for @bcicen/ctop
-fi
-
 docker_remove_exited() {
   docker rm $(docker ps -f='status=exited' -q)
 }
diff --git a/zsh/golang.zsh b/zsh/golang.zsh
index 7c5a4c0..2e972d9 100755
--- a/zsh/golang.zsh
+++ b/zsh/golang.zsh
@@ -21,10 +21,8 @@ install_go_global_packages() {
     github.com/erning/gorun@latest
     github.com/go-delve/delve/cmd/dlv@latest
     github.com/golang/mock/mockgen@latest
-    github.com/golangci/golangci-lint/cmd/golangci-lint@latest
     github.com/google/go-jsonnet/cmd/jsonnet@latest
     github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
-    github.com/goreleaser/goreleaser@latest
     github.com/icholy/gomajor@latest
     github.com/kisielk/errcheck@latest
     github.com/lighttiger2505/sqls@latest
diff --git a/zsh/linux.zsh b/zsh/linux.zsh
index 337e3a5..a3012bc 100644
--- a/zsh/linux.zsh
+++ b/zsh/linux.zsh
@@ -9,7 +9,3 @@ alias o="xdg-open"
 export TERM="xterm-256color"
 
 path_append "/opt/tigervnc/bin"
-
-zinit light-mode wait lucid as'program' from'gh-r' mv'shfmt* -> shfmt' \
-  atclone'./shfmt completions zsh > _shfmt' atpull'%atclone' \
-  for @mvdan/sh
diff --git a/zshrc b/zshrc
index 3b5a540..68b3bcf 100644
--- a/zshrc
+++ b/zshrc
@@ -136,8 +136,8 @@ source "$DOTZSH/tmux.zsh"
 
 # Development
 source "$DOTZSH/containers.zsh"
-source "$DOTZSH/golang.zsh"
 source "$DOTZSH/git.zsh"
+source "$DOTZSH/golang.zsh"
 source "$DOTZSH/google-cloud.zsh"
 source "$DOTZSH/kubernetes.zsh"
 source "$DOTZSH/nodejs.zsh"