From 203aebd6a9e979bd28588e829c66afd6a91487a2 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Fri, 5 Nov 2021 17:49:49 -0700
Subject: [PATCH] Xonsh and Emacs don't get along well

---
 doom/config.el | 2 ++
 xonsh/rc.xsh   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doom/config.el b/doom/config.el
index 04c681d..d766c9f 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -1,5 +1,7 @@
 ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
 
+(setq shell-file-name "/usr/bin/bash")
+
 ;; Place your private configuration here! Remember, you do not need to run 'doom
 ;; sync' after modifying this file!
 
diff --git a/xonsh/rc.xsh b/xonsh/rc.xsh
index 78e05d3..0d33460 100644
--- a/xonsh/rc.xsh
+++ b/xonsh/rc.xsh
@@ -86,7 +86,7 @@ aliases["vv"] = _vv
 
 # Fix prompt for Emacs TRAMP
 # https://github.com/oh-my-fish/theme-bobthefish/issues/148
-if $TERM == "dumb":
+if not ${...}.get("TERM") or $TERM == "dumb":
     $PROMPT = "$ "
     $RIGHT_PROMPT = None
     $BOTTOM_TOOLBAR = None