From bda5105914f1d3b21d4600824c2ad112dd4cb6a4 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blake@blakenorth.net>
Date: Mon, 9 Sep 2024 02:45:23 -0700
Subject: [PATCH] even more intelegently set EDITOR

---
 .config/shell/env | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.config/shell/env b/.config/shell/env
index 73f6d14..3fb5bf1 100644
--- a/.config/shell/env
+++ b/.config/shell/env
@@ -14,12 +14,14 @@ if [ -z "$PROFILE_LOADED" ] && [ -f ~/.profile ]; then
 fi
 
 # Intelligently set $EDITOR
-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
+if [ "${EDITOR:-}" = "" ] || [ "${EDITOR##*/}" = "nano" ]; 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
+   fi
 fi
 export SYSTEMD_EDITOR="$EDITOR"
 export VISUAL="$EDITOR"