diff --git a/home/fish/interactive.fish b/home/fish/interactive.fish
index fb6b35f..d09c9bf 100644
--- a/home/fish/interactive.fish
+++ b/home/fish/interactive.fish
@@ -1,12 +1,10 @@
-if test (tty) = /dev/tty1; and test -z "$DISPLAY"; and test -z "$WAYLAND_DISPLAY"
+if test (tty) = /dev/tty1; and type -q startx; and test -z "$DISPLAY"; and test -z "$WAYLAND_DISPLAY"
   exec startx
 end
 
-if test "$KITTY_STR" = "1"
-  if not set -q _FASTFETCH_RUN
-    set -gx _FASTFETCH_RUN 1
-    fastfetch
-  end
+if test "$KITTY_STR" = "1"; and not set -q _FASTFETCH_RUN
+  set -gx _FASTFETCH_RUN 1
+  fastfetch
 end
 
 function postexec_test --on-event fish_postexec