diff --git a/.config/fish/conf.d/iterm2.fish b/.config/fish/conf.d/iterm2.fish
new file mode 100644
index 0000000..d20c8cc
--- /dev/null
+++ b/.config/fish/conf.d/iterm2.fish
@@ -0,0 +1,3 @@
+if test -e {$HOME}/.iterm2_shell_integration.fishsource
+    source {$HOME}/.iterm2_shell_integration.fish
+end
diff --git a/.config/fish/conf.d/zoxide.fish b/.config/fish/conf.d/zoxide.fish
new file mode 100644
index 0000000..4089533
--- /dev/null
+++ b/.config/fish/conf.d/zoxide.fish
@@ -0,0 +1,3 @@
+if command -v zoxide &> /dev/null
+    zoxide init --cmd cd fish | source
+end
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index e354b27..c3d4bf5 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -4,6 +4,3 @@
 #end
 
 bind \e\[A 'history merge; up-or-search'
-
-test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
-zoxide init --cmd cd fish | source