diff --git a/default/hypr/envs.conf b/default/hypr/envs.conf
index 92d15446..8194110c 100644
--- a/default/hypr/envs.conf
+++ b/default/hypr/envs.conf
@@ -27,3 +27,6 @@ env = XCOMPOSEFILE,~/.XCompose
 ecosystem {
   no_update_news = true
 }
+
+# ssh-agent
+env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket
\ No newline at end of file
diff --git a/install/config/all.sh b/install/config/all.sh
index 4118e403..226575d2 100644
--- a/install/config/all.sh
+++ b/install/config/all.sh
@@ -7,6 +7,7 @@ run_logged $OMARCHY_INSTALL/config/timezones.sh
 run_logged $OMARCHY_INSTALL/config/increase-sudo-tries.sh
 run_logged $OMARCHY_INSTALL/config/increase-lockout-limit.sh
 run_logged $OMARCHY_INSTALL/config/ssh-flakiness.sh
+run_logged $OMARCHY_INSTALL/config/ssh-agent.sh
 run_logged $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
 run_logged $OMARCHY_INSTALL/config/xcompose.sh
 run_logged $OMARCHY_INSTALL/config/mise-ruby.sh
diff --git a/install/config/ssh-agent.sh b/install/config/ssh-agent.sh
new file mode 100644
index 00000000..378fc881
--- /dev/null
+++ b/install/config/ssh-agent.sh
@@ -0,0 +1,23 @@
+# add ssh keys to ssh-agent
+mkdir -p ~/.ssh
+echo 'AddKeysToAgent yes' | tee ~/.ssh/config >/dev/null
+
+# Create systemd service for ssh-agent
+mkdir -p ~/.config/systemd/user
+tee ~/.config/systemd/user/ssh-agent.service >/dev/null <<EOF
+[Unit]
+Description=SSH key agent
+
+[Service]
+Type=simple
+Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
+# DISPLAY required for ssh-askpass to work
+Environment=DISPLAY=:0
+ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
+
+[Install]
+WantedBy=default.target
+EOF
+
+# Start ssh-agent automatically for user
+sudo systemctl enable --user ssh-agent.service
\ No newline at end of file