diff --git a/shell/bash/.bash_exec b/shell/bash/.bash_exec
index 9773c9e..dae12e3 100644
--- a/shell/bash/.bash_exec
+++ b/shell/bash/.bash_exec
@@ -15,6 +15,23 @@ export ZELLIJ_AUTO_EXIT=true
 export ZELLIJ_CONFIG_FILE=~/.config/zellij/config.kdl
 eval "$(zellij setup --generate-auto-start bash)"
 
+# fnm
+FNM_PATH="$HOME/.local/share/fnm"
+if test -d "$FNM_PATH" ; then
+    export PATH="$FNM_PATH:$PATH"
+    eval "$(fnm env --use-on-cd)"
+fi
+
+# Prompt
+if command -v starship > /dev/null; then
+    eval "$(starship init bash)"
+fi
+
+# Zoxide
+if command -v zoxide > /dev/null; then
+    eval "$(zoxide init --cmd cd bash)"
+fi
+
 if command -v jaaj &> /dev/null && command -v dotacat &> /dev/null; then
   jaaj
 fi
diff --git a/shell/bash/.bashrc b/shell/bash/.bashrc
index 9a2c165..54efb06 100755
--- a/shell/bash/.bashrc
+++ b/shell/bash/.bashrc
@@ -30,13 +30,6 @@ export EDITOR="hx"
 export HISTFILESIZE=
 export HISTSIZE=4294967295
 
-# fnm
-FNM_PATH="$HOME/.local/share/fnm"
-if test -d "$FNM_PATH" ; then
-    export PATH="$FNM_PATH:$PATH"
-    eval "$(fnm env --use-on-cd)"
-fi
-
 CARGO_ENV_PATH="$HOME/.cargo/env"
 if [ -f "$CARGO_ENV_PATH" ]; then
     . "$CARGO_ENV_PATH"
@@ -50,11 +43,3 @@ fi
 if [ -f ~/.bash_exec ]; then
     source ~/.bash_exec
 fi
-
-if command -v starship > /dev/null; then
-    eval "$(starship init bash)"
-fi
-
-if command -v zoxide > /dev/null; then
-    eval "$(zoxide init --cmd cd bash)"
-fi