diff --git a/conf.d/atuin.env.fish b/conf.d/atuin.env.fish
new file mode 100644
index 0000000..d058327
--- /dev/null
+++ b/conf.d/atuin.env.fish
@@ -0,0 +1,2 @@
+
+source "$HOME/.atuin/bin/env.fish"
diff --git a/conf.d/atuin.fish b/conf.d/atuin.fish
index 068520e..80075c2 100644
--- a/conf.d/atuin.fish
+++ b/conf.d/atuin.fish
@@ -1 +1,3 @@
-status --is-interactive; and atuin init fish | source
+if status is-interactive
+    atuin init fish | source
+end