diff --git a/pkgbuilds/omarchy-fish/PKGBUILD b/pkgbuilds/omarchy-fish/PKGBUILD
new file mode 100644
index 0000000..7c122d9
--- /dev/null
+++ b/pkgbuilds/omarchy-fish/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Ryan Hughes <ryan@omarchy.org>
+
+pkgname=omarchy-fish
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="Omarchy shell configuration for Fish"
+arch=('any')
+url="https://github.com/omacom-io/omarchy-fish"
+license=('MIT')
+depends=('fish' 'eza' 'mise' 'zoxide' 'starship' 'fzf' 'fd' 'bat')
+install=omarchy-fish.install
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
+        "fzf.fish-v10.3.tar.gz::https://github.com/PatrickF1/fzf.fish/archive/refs/tags/v10.3.tar.gz")
+sha256sums=('SKIP'
+            'a0d56e974b8d5144c3262dcf87630c8886407d28a2f9e626e46bc18199fe6f97')
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Install omarchy-fish conf.d files to vendor_conf.d
+  install -dm755 "${pkgdir}/usr/share/fish/vendor_conf.d"
+  install -Dm644 conf.d/envs.fish "${pkgdir}/usr/share/fish/vendor_conf.d/omarchy-fish-envs.fish"
+  install -Dm644 conf.d/init.fish "${pkgdir}/usr/share/fish/vendor_conf.d/omarchy-fish-init.fish"
+
+  # Install fzf.fish functions first
+  install -dm755 "${pkgdir}/usr/share/fish/vendor_functions.d"
+  install -Dm644 "${srcdir}/fzf.fish-10.3/functions/"*.fish "${pkgdir}/usr/share/fish/vendor_functions.d/"
+  install -Dm644 "${srcdir}/fzf.fish-10.3/conf.d/fzf.fish" "${pkgdir}/usr/share/fish/vendor_conf.d/fzf.fish"
+
+  # Install omarchy-fish functions (overrides fzf.fish customizations)
+  # Use find to include hidden files (....fish and .....fish)
+  find functions -name "*.fish" -exec install -Dm644 {} "${pkgdir}/usr/share/fish/vendor_functions.d/" \;
+
+  install -dm755 "${pkgdir}/usr/share/fish/vendor_completions.d"
+  install -Dm644 "${srcdir}/fzf.fish-10.3/completions/"*.fish "${pkgdir}/usr/share/fish/vendor_completions.d/"
+
+  # Install templates and documentation to /usr/share/omarchy-fish
+  install -dm755 "${pkgdir}/usr/share/${pkgname}"
+  cp templates/bashrc "${pkgdir}/usr/share/${pkgname}/bashrc"
+  cp LICENSE "${pkgdir}/usr/share/${pkgname}/LICENSE"
+  cp README.md "${pkgdir}/usr/share/${pkgname}/README.md"
+  cp "${srcdir}/fzf.fish-10.3/LICENSE.md" "${pkgdir}/usr/share/${pkgname}/LICENSE.fzf.fish"
+  cp "${srcdir}/fzf.fish-10.3/README.md" "${pkgdir}/usr/share/${pkgname}/README.fzf.fish.md"
+
+  # Install setup script
+  install -Dm755 bin/omarchy-setup-fish "${pkgdir}/usr/bin/omarchy-setup-fish"
+}
diff --git a/pkgbuilds/omarchy-fish/omarchy-fish.install b/pkgbuilds/omarchy-fish/omarchy-fish.install
new file mode 100644
index 0000000..82e9f17
--- /dev/null
+++ b/pkgbuilds/omarchy-fish/omarchy-fish.install
@@ -0,0 +1,14 @@
+post_install() {
+    echo "==> omarchy-fish installed successfully!"
+    echo ""
+    echo "==> To run fish from bash:"
+    echo "    fish"
+    echo ""
+    echo "==> To set as default shell:"
+    echo "    omarchy-setup-fish"
+}
+
+post_remove() {
+    echo "==> omarchy-fish has been removed"
+    echo "==> To restore bash, copy a backup to ~/.bashrc"
+}
diff --git a/pkgbuilds/omarchy-zsh/PKGBUILD b/pkgbuilds/omarchy-zsh/PKGBUILD
new file mode 100644
index 0000000..a714f69
--- /dev/null
+++ b/pkgbuilds/omarchy-zsh/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Ryan Hughes <ryan@omarchy.org>
+
+pkgname=omarchy-zsh
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="Omarchy shell configuration for Zsh"
+arch=('any')
+url="https://github.com/omacom-io/omarchy-zsh"
+license=('MIT')
+depends=('zsh' 'eza' 'mise' 'zoxide' 'starship' 'fzf' 'fd' 'bat')
+install=omarchy-zsh.install
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
+sha256sums=('SKIP')
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Install omarchy-zsh config files to /usr/share/omarchy-zsh
+  install -dm755 "${pkgdir}/usr/share/${pkgname}/conf.d"
+  install -dm755 "${pkgdir}/usr/share/${pkgname}/functions"
+
+  # Install config snippets
+  install -Dm644 conf.d/envs.zsh "${pkgdir}/usr/share/${pkgname}/conf.d/"
+  install -Dm644 conf.d/init.zsh "${pkgdir}/usr/share/${pkgname}/conf.d/"
+  install -Dm644 conf.d/options.zsh "${pkgdir}/usr/share/${pkgname}/conf.d/"
+
+  # Install function definitions
+  install -Dm644 functions/aliases.zsh "${pkgdir}/usr/share/${pkgname}/functions/"
+  install -Dm644 functions/functions.zsh "${pkgdir}/usr/share/${pkgname}/functions/"
+
+  # Install zshrc and bashrc templates
+  cp templates/zshrc "${pkgdir}/usr/share/${pkgname}/zshrc"
+  cp templates/bashrc "${pkgdir}/usr/share/${pkgname}/bashrc"
+
+  # Install documentation
+  install -dm755 "${pkgdir}/usr/share/${pkgname}"
+  cp LICENSE "${pkgdir}/usr/share/${pkgname}/LICENSE"
+  cp README.md "${pkgdir}/usr/share/${pkgname}/README.md"
+
+  # Install setup script
+  install -Dm755 bin/omarchy-setup-zsh "${pkgdir}/usr/bin/omarchy-setup-zsh"
+}
diff --git a/pkgbuilds/omarchy-zsh/omarchy-zsh.install b/pkgbuilds/omarchy-zsh/omarchy-zsh.install
new file mode 100644
index 0000000..80fd875
--- /dev/null
+++ b/pkgbuilds/omarchy-zsh/omarchy-zsh.install
@@ -0,0 +1,14 @@
+post_install() {
+    echo "==> omarchy-zsh installed successfully!"
+    echo ""
+    echo "==> To run zsh from bash:"
+    echo "    zsh"
+    echo ""
+    echo "==> To set as default shell:"
+    echo "    omarchy-setup-zsh"
+}
+
+post_remove() {
+    echo "==> omarchy-zsh has been removed"
+    echo "==> To restore bash, copy a backup to ~/.bashrc"
+}