From 94edd4b09b63d083a3a2d395df709309bce6b76f Mon Sep 17 00:00:00 2001
From: PowerUser64 <blake@blakenorth.net>
Date: Tue, 17 Sep 2024 23:14:59 -0700
Subject: [PATCH] shell: always launch zsh unless bash is explicitly launched

---
 .config/shell/aliases | 4 +++-
 .zshrc                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.config/shell/aliases b/.config/shell/aliases
index 4c2fd54..206c7d6 100644
--- a/.config/shell/aliases
+++ b/.config/shell/aliases
@@ -40,6 +40,8 @@ alias ffmpeg='ffmpeg -hide_banner'
    alias glow='glow -p' # force Glow to preview with `less` if not in vim
 alias juliai='julia -i ${XDG_CONFIG_HOME:-"$HOME/.config"}/julia/startup.jl'
 
+alias bash='LAUNCH_ZSH=false bash'
+
 # I hate it when I get ghost script instead of git status
 alias gs='echo "you don'\''t $(tput sitm)really$(tput sgr0) want ghost script now, do you?"'
 
@@ -126,7 +128,7 @@ alias                                                     \
    dc='docker-compose'                                    \
    occ='docker exec -u www-data nextcloud php occ --ansi' \
 
-# Nix                                             
+# Nix
 alias                                                \
    nsp='nix-shell -p'                                \
    nx='$EDITOR /etc/nixos/systems/$HOST/default.nix' \
diff --git a/.zshrc b/.zshrc
index 21561c6..7b9b707 100644
--- a/.zshrc
+++ b/.zshrc
@@ -265,7 +265,7 @@ load_working_dir && cd - > /dev/null || true
 # <<<
 # <<<
 
-export BASH_LAUNCH_ZSH=false
+export LAUNCH_ZSH="${STAY_ZSH:-true}"
 
 # Optionally source another zshrc
 ${SKIP_LOCAL_ZSHRC:-false} || careful_source "$SHELL_CONFIG_DIR/local/zshrc"