From c0bfedefa311252e239e8609e110f130b2b2b166 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 6 Jan 2020 14:11:15 +0100
Subject: address warnings

---
 custom/uucp.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'custom')

diff --git a/custom/uucp.nix b/custom/uucp.nix
index 3ee52269..7fccb7e5 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -46,31 +46,31 @@ let
   nodeCfg = {
     options = {
       commands = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = cfg.defaultCommands;
         description = "Commands to allow for this remote";
       };
 
       protocols = mkOption {
-        type = types.string;
-	default = cfg.defaultProtocols;
-	description = "UUCP protocols to use for this remote";
+        type = types.separatedString "";
+	      default = cfg.defaultProtocols;
+	      description = "UUCP protocols to use for this remote";
       };
 
       publicKeys = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         description = "SSH public keys for this node";
       };
 
       generateKey = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [ "-t" "ed25519" "-N" "" ];
         description = "Arguments to pass to `ssh-keygen` to generate a keypair for communication with this host";
       };
 
       hostnames = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         description = "Hostnames to try in order when connecting";
       };
@@ -125,19 +125,19 @@ in {
       };
 
       defaultCommands = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = ["rmail"];
         description = "Commands allowed for remotes without explicit override";
       };
 
       defaultProtocols = mkOption {
-        type = types.string;
-	default = "te";
-	description = "UUCP protocol to use within ssh unless overriden";
+        type = types.separatedString "";
+	      default = "te";
+	      description = "UUCP protocol to use within ssh unless overriden";
       };
 
       incomingProtocols = mkOption {
-        type = types.string;
+        type = types.separatedString "";
         default = "te";
         description = "UUCP protocols to use when called";
       };
@@ -209,7 +209,7 @@ in {
       };
 
       extraConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = ''
           run-uuxqt 1
         '';
@@ -217,11 +217,11 @@ in {
       };
 
       extraSys = mkOption {
-        type = types.string;
+        type = types.lines;
         default = ''
           protocol-parameter g packet-size 4096
         '';
-	description = "Extra configuration to prepend verbatim to `/etc/uucp/sys`";
+	      description = "Extra configuration to prepend verbatim to `/etc/uucp/sys`";
       };
     };
   };
-- 
cgit v1.2.3