From f0fc7be94791ee3d7d7d7a45dd51bfc0faf50881 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 8 May 2024 08:31:25 +0200
Subject: [PATCH] new fancy ssh key

---
 common/tooling/default.nix                    |   6 +++++-
 secrets/nextcloud_pass.age                    | Bin 484 -> 594 bytes
 secrets/secrets.nix                           |   3 ++-
 specific/grimm-nixos-laptop/configuration.nix |   2 +-
 sway/default.nix                              |   3 ++-
 5 files changed, 10 insertions(+), 4 deletions(-)

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 6d38f401d841f09bcfc7a3061753e9c8d12adc09..a72ab77a3323062db0a1f2d4ba1f2374840bb884 100644
GIT binary patch
literal 594
zcmXxgyUvqf007X<fyBvGO=IFzk$Wj78sUdh?m~eAPTUF<N@+i?U5%S=4nBbS-@s7^
zqr0<<4h}woF)?xSJi-aH6i(~-JT+}`tREiF8Pa1A{A30|4xd3d17#kL1GJajhIRr<
ze0Jq9D2)q}xM{H1KJ#Q$IeF(EM}~Ak!pVHx<?OED+G#v3QJSHKifAe5f=GK&l7n46
z*gQG{m)8j`8<c)SSbeT;IOSp=>^#=?T$Aija-d8=L^jqEM>naEEi~X-Cv$4LmFu7u
zbi8l4UQ`>!KlF)P#TuDvS<3M`8m&!7$)t2AQ2wyi%6cgjx^aY3zpQA_aVlQ4_Ts7_
zNL491XKM|3=Jhmz`@kc@!7Q&x!P`V2FT2FzJrOyqxRLG+s7{TLldX9RCefumlU+2}
zKK3}X5ehnPGa}R%gXPr0)zr>qu+HUzFfiONyQMsG^A!}v47X{}qCX*6aq%=VaTjy;
z|8|<-6ooM}D+0hDW(z4?li|hPvvXw0UJQW*(>ZNU!TNx%*wh#m@?7SMw-%OAr{f?z
zCc#eb18oY_tr`~5sXmyt-Bh+Nc}7NZ!x;4X5`tlPCXKa}`D~=CE`wAY2siXDvCWC!
zmB=EKd2KsCxmFVm?f{jqUR=MqetzT5*Lxr1?~m@@`u*e6pPQe*Jca$o)$4bEUp@%F
R-MH<(6@PuW|Fd|{`~xZz%BlbW

delta 454
zcmWm3J&co3003a47Y7_199$eOaWNsi9+bAPlL3wb1s+%a3SA7)!sDNo0xe6Eo1Ba$
zCML$s-8eY9>E>b_osDsEaniULzxDfa^6kdc2S;@h5N;t=uy4~U5a607Ots8oZ#Tvz
zWo}EWbI^7JXQ<1I*?H&}RofSF!lMrCVjgcL49TGoIV_t8C<t}kJhbKL;A;(+P4twQ
z=?T~8Eh^@4&PKGrf_-b3uA%7N0(Ch$I%ACdA7bSDu}}f92f`{Z>xhLrJX(xUit2Tg
zD@{h$Is$WMxf?*9E-jAH;*GoG>lSMVNws1(mJhmS8O-~&<*m}BFqb)!56n~>+e5}z
z3`pA3%v4jnEk;9UJLI-OcWiZv6fw<36{k+yJupa-_Pp9kA!CFwB`Ycygk7IuNVqXT
zxMhvWfG9cIgu??RgjrrFp>u&<;)vILXU&rQnn`M}aZ`LoW4&JQRJ@cfmfCD0tJGA&
z@k()<wkX7CF@^N#VURePDVYW_u9H=Tf$}@NdHww->ji)1zV<)d{&g3U&p(qN@BH}s
a^YOD=uim`9_WQ}-vwO~?mw(>fKm7-u4xMEH

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 = {