From 67131f41e8e7c1fb26f4677bfda307c9dd0a63f3 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Wed, 30 Sep 2020 17:09:37 -0400
Subject: [PATCH] update bashrc

---
 bash/.bash_profile | 11 +++++------
 bash/.bashrc       |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/bash/.bash_profile b/bash/.bash_profile
index b567fb9..acdc259 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,9 +1,8 @@
-# .bash_profile is *not* sourced when launching bash from some GUI terminal emulators
-# However, it *is* sourced when logging in via TTY or ssh.
+# .bash_profile is *not sourced* when launching bash from most GUI terminal emulators
+#
+# .bash_profile *is sourced* for login shells like from a TTY, ssh connection, or tmux.
 
-# Due to this somewhat inconsistent behaviour, I ended up putting everything in
-# .bashrc, which is more or less guarunteed to be sourced no matter what.
-
-# [ -f "$HOME/.bashrc" ] && source "$HOME/.bashrc"
+# For the sake of simplicity and consistency, I source my .bashrc
+[ -f "$HOME/.bashrc" ] && source "$HOME/.bashrc"
 
 # vim:ft=sh
diff --git a/bash/.bashrc b/bash/.bashrc
index 93399a6..b06ff1c 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -186,7 +186,7 @@ parse_git() {
 # PS1="\u@\h:\W\\$ "
 
 # ***color prompts***
-PS1="${bold}${blue}\W ${yellow}\\$ ${reset}"
+# PS1="${bold}${blue}\W ${yellow}\\$ ${reset}"
 # PS1="${bold}${purple}\u${yellow}@${cyan}\h${white}:${blue}\W ${yellow}\\$ ${reset}"
 
 # ***git prompts***