From f5c03eae013a7e008d231b14f6ba2a4787c7d57e Mon Sep 17 00:00:00 2001
From: Simon Marty <simon.marty@protonmail.com>
Date: Tue, 30 Sep 2025 21:02:53 -0700
Subject: [PATCH 1/2] Add plugin for finch

---
 plugins/finch/README.md        | 15 +++++++++++++++
 plugins/finch/finch.plugin.zsh | 15 +++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 plugins/finch/README.md
 create mode 100644 plugins/finch/finch.plugin.zsh

diff --git a/plugins/finch/README.md b/plugins/finch/README.md
new file mode 100644
index 000000000..79c7df88a
--- /dev/null
+++ b/plugins/finch/README.md
@@ -0,0 +1,15 @@
+# Finch plugin
+
+This plugin adds auto-completion and aliases for [finch](https://runfinch.com/).
+
+To use it add `finch` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... finch)
+```
+
+## Aliases
+
+| Alias   | Command     | Description                                       |
+| :------ | :---------- |  :----------------------------------------------- |
+| fvm     | `finch vm`  | Operate on the Virtual Machine container runtime  |
diff --git a/plugins/finch/finch.plugin.zsh b/plugins/finch/finch.plugin.zsh
new file mode 100644
index 000000000..6627dd250
--- /dev/null
+++ b/plugins/finch/finch.plugin.zsh
@@ -0,0 +1,15 @@
+if (( ! $+commands[finch] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `finch`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_finch" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _finch
+  _comps[finch]=_finch
+fi
+
+finch completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_finch" &|
+
+alias fvm='finch vm'

From 928f6923087feebd334936e28da2d2aef33ffc74 Mon Sep 17 00:00:00 2001
From: Simon Marty <simon.marty@protonmail.com>
Date: Tue, 30 Sep 2025 21:06:39 -0700
Subject: [PATCH 2/2] Remove alias per contribution guidelines

---
 plugins/finch/README.md        | 6 ------
 plugins/finch/finch.plugin.zsh | 2 --
 2 files changed, 8 deletions(-)

diff --git a/plugins/finch/README.md b/plugins/finch/README.md
index 79c7df88a..d8a0d612e 100644
--- a/plugins/finch/README.md
+++ b/plugins/finch/README.md
@@ -7,9 +7,3 @@ To use it add `finch` to the plugins array in your zshrc file.
 ```zsh
 plugins=(... finch)
 ```
-
-## Aliases
-
-| Alias   | Command     | Description                                       |
-| :------ | :---------- |  :----------------------------------------------- |
-| fvm     | `finch vm`  | Operate on the Virtual Machine container runtime  |
diff --git a/plugins/finch/finch.plugin.zsh b/plugins/finch/finch.plugin.zsh
index 6627dd250..bd81b1090 100644
--- a/plugins/finch/finch.plugin.zsh
+++ b/plugins/finch/finch.plugin.zsh
@@ -11,5 +11,3 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_finch" ]]; then
 fi
 
 finch completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_finch" &|
-
-alias fvm='finch vm'