diff --git a/fish/.config/fish/conf.d/fnm.fish b/fish/.config/fish/conf.d/fnm.fish
new file mode 100644
index 0000000..dcc9fc3
--- /dev/null
+++ b/fish/.config/fish/conf.d/fnm.fish
@@ -0,0 +1 @@
+fnm env | source
diff --git a/fish/.config/fish/conf.d/starship.fish b/fish/.config/fish/conf.d/starship.fish
new file mode 100644
index 0000000..c179c03
--- /dev/null
+++ b/fish/.config/fish/conf.d/starship.fish
@@ -0,0 +1 @@
+starship init fish | source
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index e163179..6b4efe0 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -79,9 +79,6 @@ alias cbu='cargo update'
 
 fzf_key_bindings
 
-starship init fish | source
-fnm env | source
-
 # https://github.com/fish-shell/fish-shell/issues/7485#issuecomment-728984689
 # https://wiki.archlinux.org/title/Flatpak#Adding_Flatpak_.desktop_files_to_your_menu
 set -l xdg_data_home $XDG_DATA_HOME ~/.local/share