From 4537e7c815354facbab3e61bf8d8de4092d34857 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Thu, 11 Mar 2021 11:25:59 +0100
Subject: [PATCH] Use RDP instead of X forwarding for 0ad

---
 machines/urithiru/default.nix | 2 +-
 modules/zeroad.nix            | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/machines/urithiru/default.nix b/machines/urithiru/default.nix
index 7b7af1d6..2aa5e162 100644
--- a/machines/urithiru/default.nix
+++ b/machines/urithiru/default.nix
@@ -24,7 +24,7 @@
     teeworlds.enable = false;
     zeroad = {
       enable = true;
-      asServer = false;
+      asServer = true;
     };
     zfs = {
       enable = true;
diff --git a/modules/zeroad.nix b/modules/zeroad.nix
index c2a712bc..a8cf937d 100644
--- a/modules/zeroad.nix
+++ b/modules/zeroad.nix
@@ -23,10 +23,14 @@
     home-manager.users.charlotte = { pkgs, ... }: {
       home.packages = [ pkgsFor0AD.zeroad ];
     };
+
     networking.firewall = lib.mkIf config.chvp.zeroad.asServer {
       allowedTCPPorts = [ 20595 ];
       allowedUDPPorts = [ 20595 ];
     };
-    services.openssh.forwardX11 = lib.mkDefault config.chvp.zeroad.asServer;
+    services.xrdp = lib.mkIf config.chvp.zeroad.asServer {
+      enable = true;
+      defaultWindowManager = "${pkgsFor0AD.zeroad}/bin/0ad";
+    };
   };
 }