diff --git a/cli/.config/fish/conf.d/globals.fish b/cli/.config/fish/conf.d/globals.fish
index b7a7c54..b076196 100644
--- a/cli/.config/fish/conf.d/globals.fish
+++ b/cli/.config/fish/conf.d/globals.fish
@@ -1,6 +1,6 @@
 set -x LESS 'i n M R S'
 set -x PAGER less
-set -x EDITOR nvim
+set -x EDITOR hx
 set -x TIME_STYLE long-iso
 set -x SSH_AUTH_SOCK "$HOME/.ssh/ssh_auth_sock"
 set -x ALTERNATE_EDITOR ""
diff --git a/cli/.config/zsh/settings.zsh b/cli/.config/zsh/settings.zsh
index 9f3293f..fd3d416 100644
--- a/cli/.config/zsh/settings.zsh
+++ b/cli/.config/zsh/settings.zsh
@@ -1,4 +1,4 @@
-# disable the bloody ^S / ^Q, I use tmux all the time anyway
+# disable the bloody ^S / ^Q
 stty -ixon
 setopt APPEND_HISTORY EXTENDED_HISTORY HIST_IGNORE_DUPS EXTENDED_GLOB AUTO_CD AUTO_PUSHD PRINT_EXIT_VALUE
 unsetopt BEEP NO_MATCH NOTIFY MENU_COMPLETE AUTO_MENU
@@ -7,9 +7,12 @@ SAVEHIST=1000
 HISTSIZE=1000
 HISTFILE=$HOME/.histfile.$UID
 
+EDITOR=vim
+whence hx >/dev/null && EDITOR=hx
+
+export EDITOR
 export LESS='i M R'
 export PAGER=less
-export EDITOR=nvim
 export TIME_STYLE=long-iso
 export ALTERNATE_EDITOR=