From 568bf5c875c47f0d4023f5da99d204744b04ab8d Mon Sep 17 00:00:00 2001
From: Prad Nukala <prad@sonr.io>
Date: Thu, 13 Aug 2026 19:45:39 -0400
Subject: [PATCH] chore(config): set EDITOR/VISUAL defaults and update fish/zsh
 keybindings

---
 dot_config/fish/conf.d/10-env.fish                    | 2 ++
 dot_config/fish/functions/fish_user_key_bindings.fish | 3 ++-
 dot_zshrc                                             | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dot_config/fish/conf.d/10-env.fish b/dot_config/fish/conf.d/10-env.fish
index 055f52a..460868b 100644
--- a/dot_config/fish/conf.d/10-env.fish
+++ b/dot_config/fish/conf.d/10-env.fish
@@ -18,6 +18,8 @@ set -gx CODE_ROOT $HOME/Developer
 # Git hosts (non-secret; tokens are in secrets.fish)
 set -gx GITEA_LOGIN code.sonr.org
 set -gx GITLAB_HOST git.sonr.org
+set -gx EDITOR nvim
+set -gx VISUAL nvim
 
 test -x /usr/bin/brave-origin-nightly; and set -gx BROWSER /usr/bin/brave-origin-nightly
 test -x /usr/bin/chromium; and set -gx CHROME_EXECUTABLE /usr/bin/chromium
diff --git a/dot_config/fish/functions/fish_user_key_bindings.fish b/dot_config/fish/functions/fish_user_key_bindings.fish
index 1807fa6..52aff71 100644
--- a/dot_config/fish/functions/fish_user_key_bindings.fish
+++ b/dot_config/fish/functions/fish_user_key_bindings.fish
@@ -2,7 +2,8 @@ function fish_user_key_bindings
     # Keys owned by kitty.conf never reach fish and are NOT bound here:
     #   ctrl-g → lazygit overlay, ctrl-a → omp hsplit, ctrl-y → yazi vsplit,
     #   ctrl-h/j/k/l → vim-aware split nav (pass_keys.py).
-    bind ctrl-e nvim repaint
+    # ctrl-e: yazi, same as ctrl-f (cd's to yazi's exit dir on quit).
+    bind ctrl-e 'yy; commandline -f repaint'
     bind ctrl-b purple repaint
     bind ctrl-y clip-last
 
diff --git a/dot_zshrc b/dot_zshrc
index 984bc49..ac7ab97 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -26,6 +26,9 @@ if [ -d "$HOME/.config/zsh/functions" ]; then
     unset _f
 fi
 
+# ZLE keybinds — zsh ports of fish_user_key_bindings.fish
+[ -f "$HOME/.config/zsh/keybinds.zsh" ] && . "$HOME/.config/zsh/keybinds.zsh"
+
 # atuin shell history
 [ -f "$HOME/.atuin/bin/env" ] && . "$HOME/.atuin/bin/env"
 command -v atuin >/dev/null 2>&1 && eval "$(atuin init zsh)"