3 files changed, 4 insertions, 2 deletions
diff --git a/.bashrc b/.bashrc
index 4564ab2..f1a899e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,4 +1,4 @@
-[ -n $ENV ] && . $ENV
+[ -n "$ENV" ] && . "$ENV" || [ -e .env ] && . .env
 
 PS1="\e[1;33m\u@\h:\W \e[0m"
 
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index af71e9f..741cdd4 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -15,3 +15,5 @@ set smtp_url	= smtp://$imap_user@mehdix.org:587/
 # Mailing Lists
 lists sr.ht-discuss
 set reply_to 	= "ask-yes"
+
+source ~/.config/mutt/`hostname`
diff --git a/.profile b/.profile
index 873899c..75ead8a 100644
--- a/.profile
+++ b/.profile
@@ -21,4 +21,4 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 export GDK_BACKEND=wayland
 
 [ -e .config/$(hostname).profile ] && . .config/$(hostname).profile
-[ $SHELL = "/bin/bash" ] && [ -f ~/.bashrc ] && . ~/.bashrc
+[ $0 = bash ] && [ -f ~/.bashrc ] && . ~/.bashrc