move some tools to aqua

.config/aqua/aqua.yaml

@@ -21,8 +21,6 @@ packages:
 - name: junegunn/fzf@0.43.0
 - name: starship/starship@v1.16.0
 - name: hashicorp/terraform@v1.6.2
-- name: cappyzawa/tfswitch@v2.4.4
-  registry: custom
 - name: jqlang/jq@jq-1.7
 - name: kubernetes/kubectl@v1.25.15
 - name: kubernetes-sigs/kustomize@kustomize/v5.2.1
@@ -55,3 +53,28 @@ packages:
 - name: open-policy-agent/conftest@v0.46.0
 - name: open-policy-agent/opa@v0.58.0
 - name: direnv/direnv@v2.32.3
+- name: Rasukarusan/fzf-chrome-active-tab@0.03
+  registry: custom
+- name: jesseduffield/lazydocker@v0.23.1
+- name: wagoodman/dive@v0.11.0
+- name: golang/go@go1.21.3
+- name: dominikh/go-tools/staticcheck@v0.3.3
+- name: carvel-dev/ytt@v0.45.6
+- name: ziglang/zig@0.11.0
+- name: zigtools/zls@0.11.0
+- name: Aloxaf/silicon@v0.5.1
+- name: github/hub@v2.14.2
+- name: kubernetes-sigs/kubebuilder@v3.12.0
+- name: tektoncd/cli@v0.32.2
+- name: okteto/okteto@2.21.0
+- name: kubernetes-sigs/controller-tools/controller-gen@v0.13.0
+- name: sigs.k8s.io/controller-runtime/tools/setup-envtest@bf15e44
+  registry: custom
+- name: Aloxaf/fzf-tab
+  registry: custom
+  version: c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9
+- name: kubernetes-sigs/krew@v0.4.4
+- name: tilt-dev/tilt@v0.33.6
+- name: tilt-dev/ctlptl@v0.8.22
+- name: protocolbuffers/protobuf/protoc@v24.4
+- name: protocolbuffers/protobuf-go/protoc-gen-go@v1.31.0

.config/aqua/registry.yaml

@@ -1,9 +1,4 @@
 packages:
-- type: github_release
-  repo_owner: cappyzawa
-  repo_name: tfswitch
-  asset: 'tfswitch_{{trimV .Version}}_{{.OS}}_{{.Arch}}.tar.gz'
-  description: tfswitch is a command line tool to switch between different versions of terraform.
 - type: github_release
   repo_owner: neovim
   repo_name: neovim
@@ -30,7 +25,30 @@ packages:
     overrides:
     - goos: windows
       format: zip
-    # - goos: darwin
-    #   files:
-    #     - name: nvim
-    #       src: nvim-osx64/bin/nvim
+      # - goos: darwin
+      #   files:
+      #     - name: nvim
+      #       src: nvim-osx64/bin/nvim
+- type: github_archive
+  name: Aloxaf/fzf-tab
+  repo_owner: Aloxaf
+  repo_name: fzf-tab
+  description: Replace zsh's default completion selection menu with fzf!
+  files:
+  - name: fzf-tab.plugin.zsh
+    src: fzf-tab-{{trimV .Version}}/fzf-tab.plugin.zsh
+- type: github_release
+  repo_owner: Rasukarusan
+  repo_name: fzf-chrome-active-tab
+  description: 🐧 Fuzzy search and activate Chrome tab via the terminal.
+  supported_envs:
+  - darwin
+  supported_if: GOOS == "darwin"
+  asset: chrome-tab-activate
+  aliases:
+  - name: tl
+- type: go_install
+  name: sigs.k8s.io/controller-runtime/tools/setup-envtest
+  repo_owner: kubernetes-sigs
+  repo_name: controller-runtime
+  path: sigs.k8s.io/controller-runtime/tools/setup-envtest

.zsh/zinit_wait.zsh

@@ -1,94 +1,3 @@
-# local snippets {{{
-zinit ice wait"1" lucid
-zinit snippet $HOME/.zsh/20_keybinds.zsh
-zinit ice wait"1" lucid
-zinit snippet $HOME/.zsh/30_aliases.zsh
-zinit ice wait"1" lucid
-zinit snippet $HOME/.zsh/50_setopt.zsh
-zinit ice wait"2" lucid
-zinit snippet $HOME/.zsh/60_lang.zsh
-zinit ice wait"4" lucid
-zinit snippet $HOME/.zsh/80_custom.zsh
-# }}}
-
-# utils {{{
-# jonas/tig {{{
-zinit ice wait"1" as"program" lucid \
-    make"install prefix=$ZPFX" pick"$ZPFX/bin/tig"
-zinit light jonas/tig
-# }}}
-# 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
-# }}}
-# Aloxaf/fzf-tab {{{
-zinit ice wait'2' lucid as"program" \
-    atload"source ./fzf-tab.plugin.zsh"
-zinit light Aloxaf/fzf-tab
-# }}}
-# alacritty/alacritty {{{
-zinit ice wait'2' lucid as"program" \
-    if'[[ "$(ostype)" == "darwin" ]]' \
-    make!"app" \
-    atclone"cp -r target/release/${PLATFORM}/Alacritty.app /Applications" \
-    atpull"%atclone" \
-    has"cargo"
-zinit light alacritty/alacritty
-# }}}
-# }}}
-
-# docker {{{
-# jesseduffield/lazydocker (as ld) {{{
-zinit ice wait"1" as"program" from"gh-r" pick"lazydocker" lucid \
-    atload"alias ld='lazydocker'"
-zinit light jesseduffield/lazydocker
-# }}}
-# wagoodman/dive {{{
-zinit ice wait'2' lucid as"program" from:"gh-r"
-zinit light wagoodman/dive
-# }}}
-# dagger/dagger {{{
-zinit ice wait'2' lucid as"program" from"gh-r" \
-    atclone"./dagger completion zsh > ~/.zsh/Completion/_dagger" atpull"%atclone"
-zinit light dagger/dagger
-# }}}
-# }}}
-
-# golang {{{
-# dominikh/go-tools (id-as"golang/staticcheck") {{{
-zinit ice wait"1" lucid as"program" from"gh-r" id-as"golang/staticcheck" \
-    pick"staticcheck/staticcheck"
-zinit light dominikh/go-tools
-# }}}
-# go-delve/delve {{{
-zinit ice wait'3' lucid as"program" pick"$ZPFX/bin/dlv" has"go" \
-    atclone"go build -o $ZPFX/bin/dlv cmd/dlv/main.go" atpull"%atclone"
-zinit light go-delve/delve
-# }}}
-# golang/dep {{{
-zinit ice wait'3' lucid as"program" has"go" \
-    atclone"./install.sh" atpull"%atclone"
-zinit light golang/dep
-# }}}
-# }}}
-
-# lua {{{
-# Koihik/vscode-lua-format {{{
-zinit ice wait'2' lucid as"program" \
-    pick"bin/$(ostype)/lua-format"
-zinit light Koihik/vscode-lua-format
-# }}}
-# }}}
-
-# yaml {{{
-# carvel-dev/ytt {{{
-zinit ice wait'2' lucid as"program" from"gh-r" \
-    mv"ytt-* -> ytt"
-zinit light carvel-dev/ytt
-# }}}
-# }}}
-
 # zsh {{{
 zinit wait lucid for \
     atinit"ZINIT[COMPINIT_OPTS]=-C; zpcompinit; zpcdreplay" \
@@ -99,128 +8,5 @@ zinit wait lucid for \
     zsh-users/zsh-completions
 # }}}
 
-# zig {{{
-# zigtools/zls {{{
-zinit ice wait'2' lucid as"program" from"gh-r" has"zig" \
-    pick"bin/zls"
-zinit light zigtools/zls
-# }}}
-# }}}
-
-# for only vim plugins {{{
-# Aloxaf/silicon {{{
-zinit ice lucid wait"2" as"program" from"gh-r"
-zinit light Aloxaf/silicon
-# }}}
-# github/hub {{{
-zinit ice wait'2' lucid as"program" make"install prefix=$ZPFX" pick"$ZPFX/bin/hub"
-zinit light github/hub
-# }}}
-# }}}
-
-# kubernetes {{{
-# GoogleContainerTools/kpt {{{
-zinit ice wait'3' lucid as"program" has"go" \
-    atclone"GO111MODULE=on go install ./..."
-zinit light GoogleContainerTools/kpt
-# }}}
-# zlabjp/kubernetes-scripts (as create-kubeconfig) {{{
-zinit ice wait'2' lucid as"program" pick"create-kubeconfig"
-zinit light zlabjp/kubernetes-scripts
-# }}}
-# ko-build/ko {{{
-zinit ice wait'3' lucid as"program" from"gh-r" \
-    atclone"./ko completion zsh > ~/.zsh/Completion/_ko" atpull"%atclone" \
-    atload"export KO_DOCKER_REPO='docker.io/cappyzawa'"
-zinit light ko-build/ko
-# }}}
-# operator-framework/operator-sdk {{{
-zinit ice wait'2' lucid as"program" from:"gh-r" \
-    bpick"operator-sdk_*" \
-    mv"operator-sdk_*->operator-sdk"
-zinit light operator-framework/operator-sdk
-# }}}
-# kubernetes-sigs/kubebuilder {{{
-zinit ice wait'2' lucid as"program" from:"gh-r" \
-    mv"kubebuilder_*->kubebuilder" \
-    atclone"kubebuilder completion zsh > ~/.zsh/Completion/_kubebuilder" \
-    atpull"%atclone"
-zinit light kubernetes-sigs/kubebuilder
-# }}}
-# tektoncd/cli {{{
-zinit ice wait'2' lucid as"program" from"gh-r" pick"tkn" \
-    atclone"./tkn completion zsh > ~/.zsh/Completion/_tkn && ln -s $(which tkn) /usr/local/bin/kubectl-tkn" atpull"%atclone"
-zinit light tektoncd/cli
-# }}}
-# okteto/okteto {{{
-zinit ice wait'1' lucid as"program" from"gh-r" \
-    mv"okteto-*->okteto"
-zinit light okteto/okteto
-# }}}
-# kubernetes-sigs/controller-runtime#setup-envtest {{{
-zinit ice wait'1' lucid as"program" \
-    id-as"kubernetes-sigs/setup-envtest" \
-    atclone"pushd tools/setup-envtest; go install ./...; popd" \
-    atpull"%atclone"
-zinit light kubernetes-sigs/controller-runtime
-# }}}
-# kubernetes-sigs/controller-tools#controller-gen {{{
-zinit ice wait'1' lucid as"program" \
-    id-as"kubernetes-sigs/controller-gen" \
-    atclone"pushd cmd/controller-gen; go install; popd" \
-    atpull"%atclone"
-zinit light kubernetes-sigs/controller-tools
-# }}}
-# sh0rez/kubectl-neat-diff {{{
-zinit ice wait'1' lucid as"program" from"gh-r" \
-    mv"kubectl-neat-diff-* -> kubectl-neat-diff" \
-    atload"export KUBECTL_EXTERNAL_DIFF=kubectl-neat-diff"
-zinit light sh0rez/kubectl-neat-diff
-# }}}
-# kubernetes-sigs/krew {{{
-zinit ice wait'1' lucid as"program" from"gh-r" \
-    mv"krew-*->krew" \
-    atclone"./krew install krew && ./krew completion zsh > ~/.zsh/Completion/_krew" atpull"%atclone"
-zinit light kubernetes-sigs/krew
-# }}}
-# FairwindsOps/pluto {{{
-zinit ice wait'1' lucid as"program" from"gh-r" \
-    atclone"./pluto completion zsh > ${HOME}/.zsh/Completion/_pluto" \
-    atpull"%atclone"
-zinit light FairwindsOps/pluto
-# }}}
-# tilt-dev/tilt {{{
-zinit ice wait'2' lucid as"program" from"gh-r" \
-    atclone"./tilt completion zsh > ${HOME}/.zsh/Completion/_tilt" \
-    atpull"%atclone"
-zinit light tilt-dev/tilt
-# }}}
-# tilt-dev/ctlptl {{{
-zinit ice wait'2' lucid as"program" from"gh-r" \
-    atclone"./ctlptl completion zsh > ${HOME}/.zsh/Completion/_ctlptl" \
-    atpull"%atclone"
-zinit light tilt-dev/ctlptl
-# }}}
-# }}}
-
-# minio/mc {{{
-zinit ice wait'3' lucid as"program" has"go" \
-    atclone"GO111MODULE=on go install ." atpull"%atclone"
-zinit light minio/mc
-# }}}
-
-# bazelbuild/bazel {{{
-zinit ice wait'2' lucid as"program" from:"gh-r" \
-    mv"bazel-*-*-x86_64*->bazel"
-zinit light bazelbuild/bazel
-# }}}
-
-# protocolbuffers/protobuf {{{
-zinit ice wait'2' lucid as"program" from:"gh-r" \
-    if'[[ "$(ostype)" == "darwin" ]]' \
-    bpick:"protoc-*-osx-*.zip" mv"bin/protoc->$ZPFX/bin/protoc"
-zinit light protocolbuffers/protobuf
-# }}}
-
 zinit ice wait cdreplay -q
 zinit creinstall -Q %HOME/.zsh/Completion 2>&1 >/dev/null

.zshenv

@@ -1,10 +1,10 @@
 typeset -gx -U path
 path=( \
+        ~/.local/share/aquaproj-aqua/bin(N-/) \
         /usr/local/bin(N-/) \
         ~/bin(N-/) \
         /usr/sbin(N-/) \
         ~/.local/bin(N-/) \
-        ~/.local/share/aquaproj-aqua/bin(N-/) \
         ~/.local/share/zinit/bin(N-/) \
         ~/.tmux/bin(N-/) \
         ~/.nimble/bin(N-/) \
@@ -17,7 +17,6 @@ path=( \
         /usr/local/opt/llvm/bin(N-/) \
         ~/.gem/ruby/2.6.0/bin(N-/) \
         ~/Library/Python/3.9/bin(N-/) \
-        /usr/local/go/bin(N-/) \
         /opt/homebrew/bin(N-/) \
         /opt/homebrew/opt/openjdk@17/bin(N-/) \
         $HOME/.krew/bin(N-/) \

.zshrc

@@ -8,6 +8,7 @@ source ~/.zsh/10_utils.zsh
 if ! has "aqua"; then
     curl -sSfL https://raw.githubusercontent.com/aquaproj/aqua-installer/v2.1.2/aqua-installer | bash
 fi
+if command -v aqua &> /dev/null; then source <(aqua completion zsh); fi
 
 source "${ZINIT_HOME}/zinit.zsh"
 source ~/.zsh/zinit.zsh
@@ -16,6 +17,16 @@ if has "starship"; then
     eval "$(starship init zsh)"
 fi
 
+for file in $(find "${XDG_DATA_HOME}/aquaproj-aqua/pkgs/github_archive/github.com/Aloxaf/fzf-tab" -type f -name 'fzf-tab.plugin.zsh' | head -n 1); do
+    source ${file}
+done
+
+source ~/.zsh/20_keybinds.zsh
+source ~/.zsh/30_aliases.zsh
+source ~/.zsh/50_setopt.zsh
+source ~/.zsh/60_lang.zsh
+source ~/.zsh/80_custom.zsh
+
 if [[ -f ~/.zshrc.local ]]; then
     source ~/.zshrc.local
 fi

README.md

@@ -15,3 +15,4 @@ curl -sL https://raw.githubusercontent.com/cappyzawa/dotfiles/master/etc/install
 * `git`
 * `tmux` 3.2+
 * [tonsky/FiraCode: Free monospaced font with programming ligatures](https://github.com/tonsky/FiraCode)
+* [alacritty/alacritty: A cross\-platform, OpenGL terminal emulator\.](https://github.com/alacritty/alacritty)