1 files changed, 9 insertions, 15 deletions

diff --git a/odin.nix b/odin.nix
index 11a3c934..f92556de 100644
--- a/odin.nix
+++ b/odin.nix
@@ -78,22 +78,16 @@
   services.uucp = {
     enable = true;
     nodeName = "odin";
-    remoteNodes = [ "ymir" "hel" ];
-    sshUser = {
-      openssh.authorizedKeys.keys = [ ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKD8ycFGfVkBL9wjA5Kc33cl6Qt5K2505G/38oH8Cy/e uucp@hel''
-                                      ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGANj+LJ4CI6VrAgBRocKCGq74kZnwD1PdKr/gdlfVr1 uucp@ymir''
-                                    ];
+    remoteNodes = {
+      "ymir" = {
+        publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGANj+LJ4CI6VrAgBRocKCGq74kZnwD1PdKr/gdlfVr1 uucp@ymir"];
+        hostnames = ["ymir.yggdrasil.li" "ymir.niflheim.yggdrasil"];
+      };
+      "hel" = {
+        publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKD8ycFGfVkBL9wjA5Kc33cl6Qt5K2505G/38oH8Cy/e uucp@hel"];
+        hostnames = ["hel.asgard.yggdrasil" "hel.midgard.yggdrasil"];
+      };
     };
-    sshConfig = ''
-      Host ymir
-        Hostname ymir.niflheim.yggdrasil
-        IdentityFile ~/.ssh/ymir
-      Host hel
-        Hostname hel.midgard.yggdrasil
-        IdentityFile ~/.ssh/hel
-    '';
-    commandPath = ["${pkgs.rmail}/bin"];
-    defaultCommands = ["rmail"];
 
     media-server = {
       enable = true;