diff --git a/common/tooling/default.nix b/common/tooling/default.nix
index 400920c..f553836 100644
--- a/common/tooling/default.nix
+++ b/common/tooling/default.nix
@@ -135,7 +135,11 @@ in
         };
       };
 
-      programs.ssh.startAgent = true;
+      programs.ssh = {
+        startAgent = true;
+        enableAskPassword = graphical;
+        askPassword = lib.mkIf graphical (lib.getExe pkgs.lxqt.lxqt-openssh-askpass);
+      };
       programs.thefuck.enable = true;
     };
 
diff --git a/secrets/nextcloud_pass.age b/secrets/nextcloud_pass.age
index 6d38f40..a72ab77 100644
Binary files a/secrets/nextcloud_pass.age and b/secrets/nextcloud_pass.age differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index ea4d903..1560964 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,6 +1,7 @@
 let
   laptop_pub = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCy7X5ByG4/9y2XkQSnXcpMGnV5WPGUd+B6FaYCDNmPQ7xIZEteS+kCpu9oiMP6C/H/FT+i9DZvCflkzgdFAyujYLKRYaZbZ3K6F60qN0rkJ0z/ZO5c6rqwIwR6BEoB7dq5inkyH9fZ8/SI+PXxELmeWF9ehT7kkQC+o9Ujpcjd7ZuZllbAz4UQZFRbbpwdVJCEDenu9/63yuYbvMupgGk0edaTiFT0Q9MSzs/3pNP8xlAxmmZ3HzSjeF7gUzBF7CaIroTeguiUjSVybUEx48P8fy878t7dUZf4anEno9MS0B3aqfZvCKuuPdAUdeBfCbFHRqN7GuCylFIXGPe95Mxl grimmauld@grimmauld-nixos";
+  laptop_pub_ed = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJhM1Fk5ix4OZAdlfCxL891KxeEKpyIFrP5yYkC9mg7E grimmauld@grimmauld-nixos";
 in
 {
-  "nextcloud_pass.age".publicKeys = [ laptop_pub ];
+  "nextcloud_pass.age".publicKeys = [ laptop_pub laptop_pub_ed ];
 }
diff --git a/specific/grimm-nixos-laptop/configuration.nix b/specific/grimm-nixos-laptop/configuration.nix
index b48d468..f42e3d6 100644
--- a/specific/grimm-nixos-laptop/configuration.nix
+++ b/specific/grimm-nixos-laptop/configuration.nix
@@ -5,7 +5,7 @@
     ./hardware-configuration.nix
   ];
 
-  age.identityPaths = [ "/home/grimmauld/.ssh/id_rsa" ];
+  age.identityPaths = [ "/home/grimmauld/.ssh/id_ed25519" ];
 
   networking.hostName = "grimmauld-nixos";
 
diff --git a/sway/default.nix b/sway/default.nix
index caf1ae1..e4a1ae3 100644
--- a/sway/default.nix
+++ b/sway/default.nix
@@ -227,7 +227,8 @@ in
           for_window [app_id="swaymux"] floating enable
           for_window [app_id="rmenu"] floating enable
           for_window [app_id="firefox.*" title="Picture-in-Picture"] floating enable
-          for_window [app_id="lxqt-policykit-agent"] floating enable;
+          for_window [app_id="lxqt-policykit-agent"] floating enable
+          for_window [title="OpenSSH Authentication Passphrase request"] floating enable
         '';
 
         modes.resize.keybinds = {