From c9b2836856021bc720151fe1e718570225e5e629 Mon Sep 17 00:00:00 2001
From: root <root@oven>
Date: Sun, 2 Jun 2024 21:46:55 +0200
Subject: [PATCH] pastila/oven: add mosh

---
 oven/configuration.nix    | 13 ++++++++++++-
 pastila/configuration.nix |  2 ++
 vars.nix                  |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/oven/configuration.nix b/oven/configuration.nix
index ca26c11..ac401cc 100644
--- a/oven/configuration.nix
+++ b/oven/configuration.nix
@@ -52,7 +52,14 @@ in
             toString vars.ovenNat.pastila.address + ":" + toString port.num;
           proto = port.proto;
           sourcePort = port.num;
-        }) vars.ovenNat.forwardPorts;
+        }) vars.ovenNat.forwardPorts
+	++
+	# mosh
+	[{
+	  destination = toString vars.ovenNat.pastila.address + ":60000-61000";
+	  proto = "udp";
+	  sourcePort = "60000:61000";
+	}];
     };
 
     firewall = {
@@ -62,6 +69,10 @@ in
       allowedUDPPorts =
         map (port: port.num)
           (builtins.filter (port: port.proto == "udp") vars.ovenNat.forwardPorts);
+      # mosh
+      allowedUDPPortRanges = [
+        { from = 60000; to = 61000; }
+      ];
     };
   };
 
diff --git a/pastila/configuration.nix b/pastila/configuration.nix
index 5846229..0d9c854 100644
--- a/pastila/configuration.nix
+++ b/pastila/configuration.nix
@@ -56,6 +56,8 @@ in
     map (port: port.num)
       (builtins.filter (port: port.proto == "udp") vars.ovenNat.forwardPorts);
 
+  programs.mosh.enable = true;
+
   environment.systemPackages = with pkgs; [
     irssi
     weechat
diff --git a/vars.nix b/vars.nix
index c465ec8..7bbf962 100644
--- a/vars.nix
+++ b/vars.nix
@@ -23,6 +23,8 @@
       # transmission
       { num = 51413; proto = "tcp"; }
       { num = 51413; proto = "udp"; }
+      # mosh
+      # see ad-hoc config in oven/configuration.nix
     ];
   };
   onlineNetDNS = [