diff --git a/.config/starship/starship.toml b/.config/starship/starship.toml
index 19fe0d13..a7858e6d 100644
--- a/.config/starship/starship.toml
+++ b/.config/starship/starship.toml
@@ -168,3 +168,8 @@ disabled = true
 
 [username]
 disabled = false
+
+[env_var.ARCH]
+variable = "ARCH"
+default = "x86_64"
+style = "bold yellow"
diff --git a/.tmux.conf b/.tmux.conf
index 94c3caae..8915bd61 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -5,7 +5,7 @@ bind-key C-t send-prefix
 unbind-key C-b
 
 set-option -g default-shell /bin/zsh
-set-option -g default-command /bin/zsh
+set-option -g default-command "exec arch -arch arm64 /bin/zsh --login"
 set-option -g focus-events on
 set-option -s escape-time 0
 
diff --git a/.zprofile b/.zprofile
index 56c94630..2a1d4d81 100644
--- a/.zprofile
+++ b/.zprofile
@@ -64,10 +64,9 @@ export FZF_DEFAULT_OPTS="--extended --ansi --multi"
 
 ARCH=$(uname -m)
 if [[ $ARCH == arm64 ]]; then
-    echo "Current Architecture: $ARCH"
-	eval "$(/opt/homebrew/bin/brew shellenv)"
+    eval "$(/opt/homebrew/bin/brew shellenv)"
 elif [[ $ARCH == x86_64 ]]; then
-    echo "Current Architecture: $ARCH"
-	eval "$(/usr/local/bin/brew shellenv)"
+    eval "$(/usr/local/bin/brew shellenv)"
 fi
+export ARCH
 export LDFLAGS="-L$HOMEBREW_PREFIX/lib"