more tweaks after Arch rollout

fish/.config/fish/config.fish

@@ -37,9 +37,14 @@ status --is-interactive; and begin
     # Interactive shell initialisation
     set -gx GPG_TTY (tty)
 
-    if test "$TERM" != dumb
-        eval (/usr/local/bin/starship init fish)
-
-    end
+    source $HOME/.config/fish/device-conf.fish
 
 end
+
+if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]
+  exec sway
+end
+
+set -g EDITOR /usr/bin/nvim
+set -g VISUAL /usr/bin/nvim
+set -g SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket