diff --git a/.config/aqua/aqua.yaml b/.config/aqua/aqua.yaml new file mode 100644 index 00000000..78637d8b --- /dev/null +++ b/.config/aqua/aqua.yaml @@ -0,0 +1,28 @@ +# aqua - Declarative CLI Version Manager +# https://aquaproj.github.io/ +# checksum: +# enabled: true +# require_checksum: true +# supported_envs: +# - all +registries: +- type: standard + ref: v4.72.0 # renovate: depName=aquaproj/aqua-registry +- name: custom + type: local + path: ./registry.yaml +- name: private + type: local + path: ./private/registry.yaml + private: true +packages: +- import: ./private/aqua.yaml +- name: cli/cli@v2.37.0 +- 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 diff --git a/.config/aqua/policy.yaml b/.config/aqua/policy.yaml new file mode 100644 index 00000000..27450c29 --- /dev/null +++ b/.config/aqua/policy.yaml @@ -0,0 +1,19 @@ +# aqua Policy +# https://aquaproj.github.io/ +registries: +- name: custom + type: local + path: registry.yaml +- type: standard + ref: semver(">= 4.0.0") +- name: private + type: local + path: private/registry.yaml +packages: +# Example +- registry: custom # allow all packages in the Registry + # - name: cli/cli # allow only a specific package. The default value of registry is "standard" + # - name: cli/cli + # version: semver(">= 2.0.0") # version is optional +- registry: standard +- registry: private diff --git a/.config/aqua/registry.yaml b/.config/aqua/registry.yaml new file mode 100644 index 00000000..fc372c90 --- /dev/null +++ b/.config/aqua/registry.yaml @@ -0,0 +1,6 @@ +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. diff --git a/.gitignore b/.gitignore index 5d5a6dca..527974e7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .config/anyenv/*.swp .config/anyenv/envs/ .config/anyenv/plugins/ +.config/aqua/private/ .config/cheat/cheatsheets/private .config/gcloud/ .config/direnv/ diff --git a/.zsh/zinit.zsh b/.zsh/zinit.zsh index ec540138..03320539 100644 --- a/.zsh/zinit.zsh +++ b/.zsh/zinit.zsh @@ -1,7 +1,6 @@ # required for activatioin {{{ # junegunn/fzf {{{ zinit ice lucid from"gh-r" as"program" -zinit light "junegunn/fzf" # }}} # direnv/direnv {{{ zinit ice from"gh-r" as"program" mv"direnv* -> direnv" \ @@ -13,6 +12,10 @@ zinit light direnv/direnv zinit ice lucid as"program" pick:"bin/anyenv" zinit light anyenv/anyenv # }}} +# aquaproj/aqua {{{ +zinit ice lucid as"program" from"gh-r" +zinit light aquaproj/aqua +# }}} zinit ice lucid zinit snippet $HOME/.zsh/10_utils.zsh # }}} diff --git a/.zsh/zinit_wait.zsh b/.zsh/zinit_wait.zsh index 5442f435..b5483d9a 100644 --- a/.zsh/zinit_wait.zsh +++ b/.zsh/zinit_wait.zsh @@ -173,10 +173,6 @@ zinit ice wait'2' lucid as"program" \ has"cargo" zinit light alacritty/alacritty # }}} -# aquaproj/aqua {{{ -zinit ice wait'2' lucid as"program" from"gh-r" -zinit light aquaproj/aqua -# }}} # }}} # docker {{{ @@ -301,13 +297,6 @@ zinit light GoogleContainerTools/kpt zinit ice wait'2' lucid as"program" pick"create-kubeconfig" zinit light zlabjp/kubernetes-scripts # }}} -# kubernetes-sigs/kustomize {{{ -zinit ice wait'2' lucid as"program" from"gh-r" ver"kustomize%2Fv5.1.0" \ - bpick:"*_darwin_*.tar.gz" \ - atclone"./kustomize completion zsh > ~/.zsh/Completion/_kustomize" \ - atpull"%atclone" -zinit light kubernetes-sigs/kustomize -# }}} # stern/stern {{{ zinit ice wait'2' lucid as"program" from"gh-r" \ mv"stern* -> stern" diff --git a/.zshenv b/.zshenv index b3fc923d..31793b50 100644 --- a/.zshenv +++ b/.zshenv @@ -5,6 +5,7 @@ path=( \ /usr/sbin(N-/) \ ~/.config/anyenv/bin(N-/) \ ~/.local/bin(N-/) \ + ~/.local/share/aquaproj-aqua/bin(N-/) \ ~/.local/share/zinit/bin(N-/) \ ~/.tmux/bin(N-/) \ ~/.nimble/bin(N-/) \ @@ -111,6 +112,11 @@ export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" export ANYENV_ROOT="${XDG_CONFIG_HOME}/anyenv" +# Aqua +export AQUA_CONFIG="${XDG_CONFIG_HOME}/aqua/aqua.yaml" +export AQUA_PROGRESS_BAR="true" +export AQUA_POLICY_CONFIG="${XDG_CONFIG_HOME}/aqua/policy.yaml" + # available $INTERACTIVE_FILTER export INTERACTIVE_FILTER="fzf:peco:percol:gof:pick"