diff --git a/fish/dot-config/fish/conf.d/define_global_variables.fish b/fish/dot-config/fish/conf.d/define_global_variables.fish
index 28ddab7..13a65ce 100644
--- a/fish/dot-config/fish/conf.d/define_global_variables.fish
+++ b/fish/dot-config/fish/conf.d/define_global_variables.fish
@@ -14,6 +14,8 @@ set -gx PNPM_HOME $HOME/.local/share/pnpm
 
 set -gx LIBVIRT_DEFAULT_URI 'qemu:///system'
 
+set -gx SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
+
 if test (uname) = Darwin
     set -gx ANDROID_HOME $HOME/Library/Android/Sdk
 else
diff --git a/fish/dot-config/fish/conf.d/import_sources.fish b/fish/dot-config/fish/conf.d/import_sources.fish
index 580613f..1b9a8d8 100644
--- a/fish/dot-config/fish/conf.d/import_sources.fish
+++ b/fish/dot-config/fish/conf.d/import_sources.fish
@@ -1,5 +1,3 @@
-ssh_agent_startup
-
 test -e /opt/homebrew/bin/brew
 and /opt/homebrew/bin/brew shellenv | source -
 
diff --git a/sway/dot-config/sway/config b/sway/dot-config/sway/config
index 10148e8..83e45b5 100644
--- a/sway/dot-config/sway/config
+++ b/sway/dot-config/sway/config
@@ -172,7 +172,7 @@ input type:pointer {
     bindsym $mod+f fullscreen
 
     # Toggle the current focus between tiling and floating mode
-    bindsym $mod+Shift+space floating toggle
+    bindsym $mod+Shift+space floating toggle; move position center
 
     # Swap focus between the tiling area and the floating area
     bindsym $mod+Mod1+space focus mode_toggle
@@ -244,7 +244,6 @@ bindsym $mod+r mode "resize"
 
 include /etc/sway/config.d/*
 
-exec systemctl --user start ssh-agent.service
 exec noctalia
 
 include ~/.config/sway/noctalia