diff --git a/dots/.bash_profile b/dots/.bash_profile
index f0807c0d..306012a3 100644
--- a/dots/.bash_profile
+++ b/dots/.bash_profile
@@ -2,7 +2,6 @@
 # shellcheck disable=SC1090
 [[ -f ~/.bashrc ]] && . ~/.bashrc
 
-export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/ssh-agent.socket"
 export _JAVA_AWT_WM_NONREPARENTING=1
 
 if [[ -z "${DISPLAY}" ]] && [[ "${XDG_VTNR}" -eq 1 ]]; then
diff --git a/dots/.bashrc b/dots/.bashrc
index 04e65d1a..3e413cf2 100644
--- a/dots/.bashrc
+++ b/dots/.bashrc
@@ -97,12 +97,6 @@ export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab
 # Zettelkasten {{{
 export ZK_PATH="$HOME/.zk"
 
-# SSH Agent {{{
-if [[ -z "${SSH_CONNECTION}" ]]; then
-    export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
-fi
-# }}}
-
 
 # Codi
 # Usage: codi [filetype] [filename]
diff --git a/dots/.config/systemd/user/ssh-agent.service b/dots/.config/systemd/user/ssh-agent.service
deleted file mode 100644
index 6caa34de..00000000
--- a/dots/.config/systemd/user/ssh-agent.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[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
diff --git a/home/modules/keepassxc/default.nix b/home/modules/keepassxc/default.nix
index 73a31cc5..532363e6 100644
--- a/home/modules/keepassxc/default.nix
+++ b/home/modules/keepassxc/default.nix
@@ -15,6 +15,7 @@ in
       enable = true;
       settings = {
         Browser.Enabled = true;
+        SSHAgent.Enabled = true;
       };
     };
   };
diff --git a/home/modules/ssh/default.nix b/home/modules/ssh/default.nix
index c5bea019..f4c11f7d 100644
--- a/home/modules/ssh/default.nix
+++ b/home/modules/ssh/default.nix
@@ -14,6 +14,13 @@ in
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [ sshfs ];
 
+    services.ssh-agent.enable = true;
+
+    systemd.user.services.ssh-agent.Service.Environment = [
+      "SSH_ASKPASS=${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass"
+      "SSH_ASKPASS_REQUIRE=prefer"
+    ];
+
     programs.ssh = {
       enable = true;
       enableDefaultConfig = false;