diff --git a/files/environment/.config/environment.d/envvars.conf b/files/environment/.config/environment.d/envvars.conf
index 9c46d7f..2905a71 100644
--- a/files/environment/.config/environment.d/envvars.conf
+++ b/files/environment/.config/environment.d/envvars.conf
@@ -2,7 +2,7 @@ PATH=$HOME/.dots/scripts:$HOME/.cargo/bin:$HOME/.ghcup/bin:$HOME/.local/bin:$HOM
 EDITOR=hx
 VISUAL=hx
 _JAVA_AWT_WM_NONREPARENTING=1
-SSH_AUTH_SOCK=/run/user/1000/keyring/ssh
+SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
 
 # support jp input in gnome
 GTK_IM_MODULE=ibus
diff --git a/lock.sh b/lock.sh
index c750454..03776eb 100755
--- a/lock.sh
+++ b/lock.sh
@@ -1 +1,4 @@
-dbus-send --type=method_call --dest=org.gnome.ScreenSaver /org/gnome/ScreenSaver org.gnome.ScreenSaver.Lock && ssh-add -D
\ No newline at end of file
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+
+ssh-add -D
+dbus-send --type=method_call --dest=org.gnome.ScreenSaver /org/gnome/ScreenSaver org.gnome.ScreenSaver.Lock
diff --git a/ssh-agent.service b/ssh-agent.service
new file mode 100644
index 0000000..9428410
--- /dev/null
+++ b/ssh-agent.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH key agent
+
+[Service]
+Type=simple
+Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
+ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
+
+[Install]
+WantedBy=default.target