command-path

1 files changed, 10 insertions, 8 deletions

diff --git a/custom/uucp.nix b/custom/uucp.nix
index ef10c3ca..458e0e07 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -16,9 +16,7 @@ let
     port ${name}
     chat ""
     protocol e
-  '';
-  permissions = set: name: let commands = set."${name}"; in ''
-    MACHINE=${name} COMMANDS=${concatStringsSep ":" commands}
+    command-path ${concatStringsSep " " config.services.uucp.commandPath}
   '';
 in {
   options = {
@@ -50,12 +48,19 @@ in {
       };
 
       remoteNodes = mkOption {
-        type = types.attrsOf (types.listOf types.str);
+        type = types.listOf types.str;
         default = {};
         description = ''
           Ports to set up
           Names will probably need to be configured in sshConfig
-          Values are permitted commands
+        '';
+      };
+
+      commandPath = mkOption {
+        type = types.listOf types.path;
+        default = [ "${pkgs.rmail}/bin" ];
+        description = ''
+          Command search path for all systems
         '';
       };
 
@@ -158,9 +163,6 @@ in {
     environment.etc."uucp/sys" = {
       text = concatStringsSep "\n" (map sysSpec (builtins.attrNames config.services.uucp.remoteNodes));
     };
-    environment.etc."uucp/Permissions" = {
-      text = concatStringsSep "\n" (map (permissions config.services.uucp.remoteNodes) (builtins.attrNames config.services.uucp.remoteNodes));
-    };
 
     security.setuidOwners = map (p: {program = p; owner = "root"; group = "root"; setuid = true; setgid = false;}) ["uucico" "uuxqt" "cu" "uucp" "uuname" "uustat" "uux"];