Overhaul uucp

1 files changed, 12 insertions, 17 deletions

diff --git a/hel.nix b/hel.nix
index 0c1ae69a..c6f02471 100644
--- a/hel.nix
+++ b/hel.nix
@@ -202,25 +202,20 @@
     uucp = {
       enable = true;
       nodeName = "hel";
-      remoteNodes = ["odin" "ymir"];
-      sshUser = {
-        openssh.authorizedKeys.keys = [ ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir''
-                                        ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKcDj49TqmflGTmtGBqDawxmCBWW1txj61CZ7KT0hTHK uucp@odin''
-                                      ];
+      remoteNodes = {
+        "odin" = {
+          publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKcDj49TqmflGTmtGBqDawxmCBWW1txj61CZ7KT0hTHK uucp@odin"];
+          hostnames = ["odin.asgard.yggdrasil"];
+          commands = lib.mkForce ["recv-media" "notify-gkleen"];
+        };
+        "ymir" = {
+          publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir"];
+          hostnames = ["ymir.yggdrasil.li" "ymir.niflheim.yggdrasil"];
+        };
       };
-      sshConfig = ''
-        Host odin
-          Hostname odin.asgard.yggdrasil
-          IdentityFile ~/.ssh/odin
-        Host ymir
-          Hostname ymir.niflheim.yggdrasil
-          IdentityFile ~/.ssh/ymir
-      '';
+      
       commandPath = [ "${pkgs.callPackage ./hel/recv-media.nix {}}/bin" config.security.wrapperDir ];
-      defaultCommands = [];
-      commands = {
-        "odin" = ["recv-media" "notify-gkleen"];
-      };
+      defaultCommands = lib.mkForce [];
     };
     
     postfix = {