diff --git a/.config/aqua/aqua.yaml b/.config/aqua/aqua.yaml
index 3122d2a4..a2baa0d2 100644
--- a/.config/aqua/aqua.yaml
+++ b/.config/aqua/aqua.yaml
@@ -32,3 +32,17 @@ packages:
 - name: BurntSushi/ripgrep@13.0.0
 - name: jesseduffield/lazygit@v0.40.2
 - name: x-motemen/ghq@v1.4.2
+- name: sharkdp/hyperfine@v1.18.0
+- name: xxxserxxx/gotop@v4.2.0
+- name: mikefarah/yq@v4.35.2
+- name: dandavison/delta@0.16.5
+- name: o2sh/onefetch@2.18.1
+- name: smallstep/cli@v0.25.0
+- name: smallstep/certificates@v0.25.0
+- name: mike-engel/jwt-cli@6.0.0
+- name: cheat/cheat@4.4.0
+- name: golangci/golangci-lint@v1.55.1
+- name: goreleaser/goreleaser@v1.21.2
+- name: google/yamlfmt@v0.10.0
+- name: koalaman/shellcheck@v0.9.0
+- name: mvdan/sh@v3.7.0
diff --git a/.zsh/zinit_wait.zsh b/.zsh/zinit_wait.zsh
index bf8d075a..d044eb50 100644
--- a/.zsh/zinit_wait.zsh
+++ b/.zsh/zinit_wait.zsh
@@ -39,59 +39,17 @@ zinit ice wait"1" as"program" lucid \
     make"install prefix=$ZPFX" pick"$ZPFX/bin/tig"
 zinit light jonas/tig
 # }}}
-# sharkdp/hyperfine {{{
-zinit ice wait"1" as"program" from"gh-r" pick"hyperfine-*/hyperfine" lucid
-zinit light sharkdp/hyperfine
-# }}}
-# cjbassi/gotop {{{
-zinit ice wait"1" as"program" from"gh-r" pick"gotop" lucid
-zinit light cjbassi/gotop
-# }}}
 # Rasukarusan/fzf-chrome-active-tab (as tl) {{{
 zinit ice lucid wait"2" as"program" from"gh-r" \
     has"fzf" mv"chrome-tab-activate->tl"
 zinit light Rasukarusan/fzf-chrome-active-tab
 # }}}
-# mikefarah/yq {{{
-zinit ice wait'2' lucid as"program" from:"gh-r" \
-    mv"yq* -> yq"
-zinit light mikefarah/yq
-# }}}
-# cli/cli (as gh) {{{
-zinit ice wait'1' lucid as"program" from:"gh-r" \
-    mv"gh*/bin/gh->gh" \
-    atclone"gh completion --shell zsh > ~/.zsh/Completion/_gh" \
-    atpull"%atclone"
-zinit light "cli/cli"
-# }}}
 # sharkdp/bat {{{
 zinit ice wait'1' lucid as"program" from"gh-r" \
     pick"bat-v*/bat" \
     atload"compdef _gnu_generic bat"
 zinit light sharkdp/bat
 # }}}
-# sharkdp/fd {{{
-zinit ice wait'1' lucid as"program" from"gh-r" \
-    pick"fd-*/fd" \
-    atload"compdef _gnu_generic fd"
-zinit light sharkdp/fd
-# }}}
-# sharkdp/diskus {{{
-zinit ice wait'1' lucid as"program" from"gh-r" \
-    pick"diskus-*/diskus" \
-    atload"compdef _gnu_generic diskus"
-zinit light sharkdp/diskus
-# }}}
-# dandavison/delta {{{
-zinit ice wait'1' lucid as"program" from"gh-r" \
-    pick"delta-*/delta" \
-    atload"compdef _gnu_generic delta"
-zinit light dandavison/delta
-# }}}
-# o2sh/onefetch {{{
-zinit ice wait'1' lucid as"program" from:"gh-r"
-zinit light o2sh/onefetch
-# }}}
 # facebookexperimental/starlark-rust {{{
 zinit ice wait'3' lucid as"program" has"cargo" \
     atclone"cargo build" atpull"%atclone" \
@@ -108,27 +66,6 @@ zinit ice wait'2' lucid as"program" from"gh-r" \
     mv"opa* -> opa"
 zinit light open-policy-agent/opa
 # }}}
-# smallstep/cli {{{
-zinit ice wait'3' lucid as"program" from"gh-r" \
-    mv"step_*/bin/step -> $ZPFX/bin/step" \
-    atclone"$ZPFX/bin/step completion zsh > ~/.zsh/Completion/_step" atpull"%atclone"
-zinit light smallstep/cli
-# }}}
-# smallstep/certificates {{{
-zinit ice wait'3' lucid as"program" from"gh-r" \
-    pick"step-ca_*/step-ca"
-zinit light smallstep/certificates
-# }}}
-
-# mike-engel/jwt-cli {{{
-zinit ice wait'2' lucid as"program" from"gh-r"
-zinit light mike-engel/jwt-cli
-# }}}
-# cheat/cheat {{{
-zinit ice wait'2' lucid as"program" from"gh-r" \
-    mv"cheat-*->cheat"
-zinit light cheat/cheat
-# }}}
 # Aloxaf/fzf-tab {{{
 zinit ice wait'2' lucid as"program" \
     atload"source ./fzf-tab.plugin.zsh"
@@ -163,17 +100,6 @@ zinit light dagger/dagger
 # }}}
 
 # golang {{{
-# goreleaser/goreleaser {{{
-zinit ice wait"3" as"program" from"gh-r" lucid \
-    pick"goreleaser" has"go"
-zinit light goreleaser/goreleaser
-# }}}
-# golangci/golangci-lint {{{
-zinit ice wait"3" as"program" from"gh-r" pick"golangci-lint-*/golangci-lint" lucid \
-    has"go" \
-    atclone"golangci-lint completion zsh > ~/.zsh/Completion/_golangci-lint"
-zinit light golangci/golangci-lint
-# }}}
 # dominikh/go-tools (id-as"golang/staticcheck") {{{
 zinit ice wait"1" lucid as"program" from"gh-r" id-as"golang/staticcheck" \
     pick"staticcheck/staticcheck"
@@ -200,19 +126,11 @@ zinit light Koihik/vscode-lua-format
 # }}}
 
 # yaml {{{
-# adrienverge/yamllint {{{
-zinit ice wait'2' lucid atclone"python setup.py install" atpull"%atclone"
-zinit light adrienverge/yamllint
-# }}}
 # carvel-dev/ytt {{{
 zinit ice wait'2' lucid as"program" from"gh-r" \
     mv"ytt-* -> ytt"
 zinit light carvel-dev/ytt
 # }}}
-# google/yamlfmt {{{
-zinit ice wait'2' lucid as"program" from"gh-r"
-zinit light google/yamlfmt
-# }}}
 # }}}
 
 # zsh {{{
@@ -233,19 +151,6 @@ zinit light zigtools/zls
 # }}}
 # }}}
 
-# shell {{{
-# koalaman/shellcheck {{{
-zinit ice wait'2' lucid as"program" from"gh-r" \
-    pick"shellcheck-*/shellcheck"
-zinit light koalaman/shellcheck
-# }}}
-# mvdan/sh {{{
-zinit ice wait'2' lucid as"program" from"gh-r" \
-    mv"shfmt_* -> shfmt"
-zinit light mvdan/sh
-# }}}
-# }}}
-
 # for only vim plugins {{{
 # Aloxaf/silicon {{{
 zinit ice lucid wait"2" as"program" from"gh-r"