diff --git a/.config/fish/conf.d/atuin.fish b/.config/fish/conf.d/atuin.fish
new file mode 100644
index 00000000..80075c2d
--- /dev/null
+++ b/.config/fish/conf.d/atuin.fish
@@ -0,0 +1,3 @@
+if status is-interactive
+    atuin init fish | source
+end
diff --git a/.config/fish/conf.d/homebrew.fish b/.config/fish/conf.d/homebrew.fish
new file mode 100644
index 00000000..47ce4c59
--- /dev/null
+++ b/.config/fish/conf.d/homebrew.fish
@@ -0,0 +1,3 @@
+if test -x /home/linuxbrew/.linuxbrew/bin/brew
+    eval (/home/linuxbrew/.linuxbrew/bin/brew shellenv)
+end
diff --git a/.config/fish/conf.d/starship.fish b/.config/fish/conf.d/starship.fish
new file mode 100644
index 00000000..c179c03c
--- /dev/null
+++ b/.config/fish/conf.d/starship.fish
@@ -0,0 +1 @@
+starship init fish | source
diff --git a/.config/fish/conf.d/zoxide.fish b/.config/fish/conf.d/zoxide.fish
new file mode 100644
index 00000000..2e9cc179
--- /dev/null
+++ b/.config/fish/conf.d/zoxide.fish
@@ -0,0 +1 @@
+zoxide init fish | source
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index f5397472..2865428b 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,11 +1,2 @@
-# Uncomment the next line to enable brew
-# eval (/home/linuxbrew/.linuxbrew/bin/brew shellenv) 
-starship init fish | source
-zoxide init fish | source
-
-if status is-interactive
-    atuin init fish | source
-end
-
 source ~/.config/fish/user_variables.fish
 source ~/.config/fish/abbreviations.fish