diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml
index b7ff7f2..07c5081 100644
--- a/.chezmoiexternal.toml
+++ b/.chezmoiexternal.toml
@@ -24,26 +24,7 @@
     url = "https://github.com/eza-community/eza/releases/download/{{ $ezaVersion }}/eza_x86_64-unknown-{{ .chezmoi.os }}-gnu.tar.gz"
     path = "./eza"
 
-{{/* 手動安裝 neovim */ -}}
-{{ $nvimVersion := "v0.11.1" -}}
-[".local/bin/nvim"]
-    type = "archive-file"
-    url = "https://github.com/neovim/neovim/releases/download/{{ $nvimVersion }}/nvim-{{ .chezmoi.os }}-x86_64.tar.gz"
-    stripComponents = 1
-    path = "bin/nvim"
-[".local/lib/nvim"]
-    type = "archive"
-    url = "https://github.com/neovim/neovim/releases/download/{{ $nvimVersion }}/nvim-{{ .chezmoi.os }}-x86_64.tar.gz"
-    exact = true
-    stripComponents = 1
-    include = ["lib/nvim/**"]
-[".local/share/nvim"]
-    type = "archive"
-    url = "https://github.com/neovim/neovim/releases/download/{{ $nvimVersion }}/nvim-{{ .chezmoi.os }}-x86_64.tar.gz"
-    exact = true
-    stripComponents = 1
-    include = ["share/nvim/**"]
-
-{{/* 手動安裝 zsh(已在install-packages.sh處理) */ -}}
+{{/* 手動安裝 neovim (已在install-packages.sh處理) */ -}}
+{{/* 手動安裝 zsh (已在install-packages.sh處理) */ -}}
 {{/* 手動安裝 lazygit */ -}}
 {{ end }}
diff --git a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
index 761c9d5..86ba179 100644
--- a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
+++ b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
@@ -13,6 +13,17 @@ if ! command -v zsh &> /dev/null; then
   sh -c "$(curl -fsSL https://raw.githubusercontent.com/romkatv/zsh-bin/master/install)" -- -d ~/.local -e no
 fi
 
+{{/* 手動安裝 neovim 0.11.1 */ -}}
+{{ if eq .chezmoi.arch "amd64"}}
+if ! command -v zsh &> /dev/null; then
+  curl -LO https://github.com/neovim/neovim/releases/download/v0.11.1/nvim-linux-x86_64.appimage
+  chmod u+x nvim-linux-x86_64.appimage
+  ./nvim-linux-x86_64.appimage --appimage-extract
+  cp -rf squashfs-root/usr/* ~/.local/
+  rm -r nvim-linux-x86_64.appimage squashfs-root
+fi
+{{ end }}
+
 {{/* **** Root Mode ***************************************************** */ -}}
 {{ else -}}