diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 4ba5a7d..d447847 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -16,9 +16,16 @@ for f in (ls $HOME/.ssh/*.pub);
 end
 
 # Start X at login
+#if status is-login
+#  if test -z "$DISPLAY" -a "$XDG_VTNR" = 1 -a -z "$TMUX"
+#    exec startx -- -keeptty
+#  end
+#end
+
+# Start Sway at login
 if status is-login
-  if test -z "$DISPLAY" -a "$XDG_VTNR" = 1 -a -z "$TMUX"
-    exec startx -- -keeptty
+  if test -z "$WAYLAND_DISPLAY" -a "$XDG_VTNR" = 1 -a -z "$TMUX"
+    exec sway --unsupported-gpu
   end
 end