1 files changed, 10 insertions, 13 deletions

diff --git a/ymir.nix b/ymir.nix
index c0faba6b..192bc27b 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -852,20 +852,17 @@ in rec {
   services.uucp = {
     enable = true;
     nodeName = "ymir";
-    remoteNodes = [ "odin" "hel" ];
-    sshUser = {
-      openssh.authorizedKeys.keys = [ ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKT/BsAMLJs9NYhKIso4J3EF+VzRBm3c+qCQ5ONKc/1s uucp@odin''
-                                      ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOWBybBQKbPucqBgULQ1phv7IKFWl1Xc4drkCx3D5mIz uucp@hel''
-                                    ];
+    remoteNodes = {
+      "odin" = {
+        publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKT/BsAMLJs9NYhKIso4J3EF+VzRBm3c+qCQ5ONKc/1s uucp@odin"];
+        hostnames = ["odin.asgard.yggdrasil"];
+      };
+      "hel" = {
+        publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOWBybBQKbPucqBgULQ1phv7IKFWl1Xc4drkCx3D5mIz uucp@hel"];
+        hostnames = ["hel.midgard.yggdrasil"];
+      };
     };
-    sshConfig = ''
-      Host odin
-        Hostname odin.asgard.yggdrasil
-        IdentityFile ~/.ssh/odin
-      Host hel
-        Hostname hel.midgard.yggdrasil
-        IdentityFile ~/.ssh/hel
-    '';
+
     commandPath = ["${pkgs.rmail}/bin" "${pkgs.push2bin}/bin"];
     defaultCommands = ["rmail" "push2bin"];
   };