Merge b10422f8fd into 7c10d9839f

Add 14 aliases to the chezmoi plugin covering the core dotfile
management workflow. Aliases follow the OMZ naming convention
(cm prefix + first letters of subcommand).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

plugins/chezmoi/README.md

@@ -2,10 +2,29 @@
 
 ## Introduction
 
-This `chezmoi` plugin sets up completion for [chezmoi](https://chezmoi.io).
+This `chezmoi` plugin provides completion and [aliases](#aliases) for [chezmoi](https://chezmoi.io).
 
 To use it, add `chezmoi` to the plugins array of your zshrc file:
 
-```bash
+```zsh
 plugins=(... chezmoi)
 ```
+
+## Aliases
+
+| Alias  | Command                | Description                                            |
+| :----- | :--------------------- | :----------------------------------------------------- |
+| `cm`   | `chezmoi`              | The base chezmoi command                               |
+| `cma`  | `chezmoi add`          | Add a file to the source state                         |
+| `cmap` | `chezmoi apply`        | Update the destination to match the target state       |
+| `cmcd` | `chezmoi cd`           | Launch a shell in the source directory                 |
+| `cmd`  | `chezmoi diff`         | Print the diff between target state and destination    |
+| `cme`  | `chezmoi edit`         | Edit the source state of a target                      |
+| `cmg`  | `chezmoi git`          | Run git in the source directory                        |
+| `cmi`  | `chezmoi init`         | Set up the source directory                            |
+| `cmia` | `chezmoi init --apply` | Set up the source directory and apply in one step      |
+| `cmm`  | `chezmoi merge`        | Three-way merge for a file                             |
+| `cmma` | `chezmoi merge-all`    | Three-way merge for all modified files                 |
+| `cmra` | `chezmoi re-add`       | Re-add modified files                                  |
+| `cmst` | `chezmoi status`       | Show the status of targets                             |
+| `cmu`  | `chezmoi update`       | Pull and apply changes from the remote                 |

plugins/chezmoi/chezmoi.plugin.zsh

@@ -12,3 +12,23 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_chezmoi" ]]; then
 fi
 
 chezmoi completion zsh >| "$ZSH_CACHE_DIR/completions/_chezmoi" &|
+
+#
+# Aliases
+# (sorted alphabetically by alias name)
+#
+
+alias cm='chezmoi'
+alias cma='chezmoi add'
+alias cmap='chezmoi apply'
+alias cmcd='chezmoi cd'
+alias cmd='chezmoi diff'
+alias cme='chezmoi edit'
+alias cmg='chezmoi git'
+alias cmi='chezmoi init'
+alias cmia='chezmoi init --apply'
+alias cmm='chezmoi merge'
+alias cmma='chezmoi merge-all'
+alias cmra='chezmoi re-add'
+alias cmst='chezmoi status'
+alias cmu='chezmoi update'

plugins/opentofu/opentofu.plugin.zsh

@@ -30,14 +30,20 @@ function tofu_version_prompt_info() {
 alias tt='tofu'
 alias tta='tofu apply'
 alias tta!='tofu apply -auto-approve'
+alias ttap='tofu apply -parallelism=1'
+alias ttapp='tofu apply tfplan'
 alias ttc='tofu console'
 alias ttd='tofu destroy'
 alias ttd!='tofu destroy -auto-approve'
 alias ttf='tofu fmt'
 alias ttfr='tofu fmt -recursive'
 alias tti='tofu init'
+alias ttir='tofu init -reconfigure'
+alias ttiu='tofu init -upgrade'
+alias ttiur='tofu init -upgrade -reconfigure'
 alias tto='tofu output'
 alias ttp='tofu plan'
+alias ttpo='tofu plan -out tfplan'
 alias ttv='tofu validate'
 alias tts='tofu state'
 alias ttsh='tofu show'

plugins/terraform/terraform.plugin.zsh

@@ -4,21 +4,21 @@ function tf_prompt_info() {
   # check if in terraform dir and file exists
   [[ -d "${TF_DATA_DIR:-.terraform}" && -r "${TF_DATA_DIR:-.terraform}/environment" ]] || return
 
-  local workspace="$(< "${TF_DATA_DIR:-.terraform}/environment")"
+  local workspace="$(<"${TF_DATA_DIR:-.terraform}/environment")"
   echo "${ZSH_THEME_TF_PROMPT_PREFIX-[}${workspace:gs/%/%%}${ZSH_THEME_TF_PROMPT_SUFFIX-]}"
 }
 
 function tf_version_prompt_info() {
-    local terraform_version
-    terraform_version=$(terraform --version | head -n 1 | cut -d ' ' -f 2)
-    echo "${ZSH_THEME_TF_VERSION_PROMPT_PREFIX-[}${terraform_version:gs/%/%%}${ZSH_THEME_TF_VERSION_PROMPT_SUFFIX-]}"
+  local terraform_version
+  terraform_version=$(terraform --version | head -n 1 | cut -d ' ' -f 2)
+  echo "${ZSH_THEME_TF_VERSION_PROMPT_PREFIX-[}${terraform_version:gs/%/%%}${ZSH_THEME_TF_VERSION_PROMPT_SUFFIX-]}"
 }
 
-
 alias tf='terraform'
 alias tfa='terraform apply'
 alias tfa!='terraform apply -auto-approve'
 alias tfap='terraform apply -parallelism=1'
+alias tfapp='terraform apply tfplan'
 alias tfc='terraform console'
 alias tfd='terraform destroy'
 alias tfd!='terraform destroy -auto-approve'
@@ -31,6 +31,7 @@ alias tfiu='terraform init -upgrade'
 alias tfiur='terraform init -upgrade -reconfigure'
 alias tfo='terraform output'
 alias tfp='terraform plan'
+alias tfpo='terraform plan -out tfplan'
 alias tfv='terraform validate'
 alias tfs='terraform state'
 alias tft='terraform test'