From 4c1e256d6308b02d2e835ff6e11e86e7276676f3 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blake@blakenorth.net>
Date: Mon, 16 Sep 2024 11:53:23 -0700
Subject: [PATCH] env: even more intelligently set EDITOR

---
 .config/shell/env | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.config/shell/env b/.config/shell/env
index 4d831fe..db7cf6f 100644
--- a/.config/shell/env
+++ b/.config/shell/env
@@ -55,13 +55,20 @@ if [ -z "$PROFILE_LOADED" ] && [ -f ~/.profile ]; then
 fi
 
 # Intelligently set $EDITOR
-if [ "${EDITOR:-}" = "" ] || [ "${EDITOR##*/}" = "nano" ]; then
+if [ "${EDITOR:-}" = "" ] ||
+   [ "${EDITOR##*/}" = "nano" ] ||
+   ! command -v "$EDITOR" > /dev/null
+then
    if command -v nvim > /dev/null;then
       export EDITOR=nvim
    elif command -v vim > /dev/null;then
       export EDITOR=vim
    elif command -v vi > /dev/null;then
       export EDITOR=vi
+   elif command -v nano > /dev/null; then
+      export EDITOR=nano
+   else
+      echo "Error: couldn't find a valid candidate for \$EDITOR" >&2
    fi
 fi
 export SYSTEMD_EDITOR="$EDITOR"