3 files changed, 27 insertions, 4 deletions

diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index e14ce5e9..3de31418 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -118,6 +118,7 @@ in
               DeviceType = ${data.interfaceType}
               Device = /dev/net/tun
               Interface = tinc.${network}
+              ExperimentalProtocol = no
               ${data.extraConfig}
             '';
           };
diff --git a/custom/uucp.nix b/custom/uucp.nix
index 51caf13c..ed452f22 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -6,7 +6,7 @@ let
   portSpec = name: ''
     port ${name}
     type pipe
-    protocol e
+    protocol ${if builtins.hasAttr name config.services.uucp.protocols then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol}
     reliable true
     command ${pkgs.openssh}/bin/ssh -x -o batchmode=yes ${name}
   '';
@@ -15,9 +15,9 @@ let
     time Any
     port ${name}
     chat ""
-    protocol e
+    protocol ${if builtins.hasAttr name config.services.uucp.protocols then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol}
     command-path ${concatStringsSep " " config.services.uucp.commandPath}
-    commands ${concatStringsSep " " (if config.services.uucp.commands ? name then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)}
+    commands ${concatStringsSep " " (if builtins.hasAttr name config.services.uucp.commands then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)}
   '';
 in {
   options = {
@@ -77,6 +77,18 @@ in {
         description = "Override commands for specific remotes";
       };
 
+      defaultProtocol = mkOption {
+        type = types.string;
+        default = "e";
+        description = "UUCP protocol to use within ssh unless overriden";
+      };
+
+      protocols = mkOption {
+        type = types.attrsOf types.string;
+        default = {};
+        description = "UUCP protocols to use for specific remotes";
+      };
+
       spoolDir = mkOption {
         type = types.path;
         default = "/var/spool/uucp";
@@ -127,6 +139,14 @@ in {
         default = "";
         description = "Extra configuration to append verbatim to `/etc/uucp/config'";
       };
+
+      extraSys = mkOption {
+        type = types.string;
+        default = ''
+          protocol-parameter g packet-size 4096
+        '';
+        description = "Extra configuration to prepend verbatim to `/etc/uucp/sys`";
+      };
     };
   };
 
@@ -183,7 +203,7 @@ in {
       '' + concatStringsSep "\n" (map portSpec config.services.uucp.remoteNodes);
     };
     environment.etc."uucp/sys" = {
-      text = concatStringsSep "\n" (map sysSpec config.services.uucp.remoteNodes);
+      text = config.services.uucp.extraSys + "\n" + concatStringsSep "\n" (map sysSpec 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"];
diff --git a/custom/zsh.nix b/custom/zsh.nix
index 7279cf4f..826a3511 100644
--- a/custom/zsh.nix
+++ b/custom/zsh.nix
@@ -31,6 +31,8 @@ in rec {
       tmux
       zsh-users/zsh-syntax-highlighting
       systemd
+      pass
+      mosh
     EOBUNDLES
 
     if [[ -e ~/.zsh-theme ]]; then