From a51d38d7d90b4430d86c6d4276f7dd9e8762cfe3 Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Wed, 3 Jan 2024 08:16:15 -0600
Subject: [PATCH 1/2] nixos: configure xrdp

---
 hosts/common/optional/remote-desktop.nix | 14 ++++++++++++++
 hosts/pixnix/default.nix                 |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 hosts/common/optional/remote-desktop.nix

diff --git a/hosts/common/optional/remote-desktop.nix b/hosts/common/optional/remote-desktop.nix
new file mode 100644
index 0000000..fb0538e
--- /dev/null
+++ b/hosts/common/optional/remote-desktop.nix
@@ -0,0 +1,14 @@
+{
+  services = {
+    xserver = {
+      enable = true;
+      displayManager.sddm.enable = true;
+      desktopManager.plasma5.enable = true;
+    };
+    xrdp = {
+      enable = true;
+      defaultWindowManager = "startplasma-x11";
+      openFirewall = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/hosts/pixnix/default.nix b/hosts/pixnix/default.nix
index bfa20e3..b9b6cb6 100644
--- a/hosts/pixnix/default.nix
+++ b/hosts/pixnix/default.nix
@@ -13,6 +13,7 @@
     ../common/optional/libvirtd.nix
     ../common/optional/pipewire.nix
     ../common/optional/printing.nix
+    ../common/optional/remote-desktop.nix
     ../common/optional/sshd.nix
   ];
 

From 1d27766d74f73602ed55e3267507b6f7cb980f3c Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Thu, 4 Jan 2024 12:35:48 -0600
Subject: [PATCH 2/2] fixes for making xrdp work

---
 hosts/common/optional/gnome.nix          | 3 ++-
 hosts/common/optional/remote-desktop.nix | 9 ++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/hosts/common/optional/gnome.nix b/hosts/common/optional/gnome.nix
index bce4bbf..5c25500 100644
--- a/hosts/common/optional/gnome.nix
+++ b/hosts/common/optional/gnome.nix
@@ -6,6 +6,7 @@
         gdm = {
           enable = true;
           autoSuspend = false;
+          wayland = true;
         };
       };
       desktopManager = {
@@ -33,4 +34,4 @@
     hibernate.enable = false;
     hybrid-sleep.enable = false;
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/common/optional/remote-desktop.nix b/hosts/common/optional/remote-desktop.nix
index fb0538e..1c4eccb 100644
--- a/hosts/common/optional/remote-desktop.nix
+++ b/hosts/common/optional/remote-desktop.nix
@@ -1,14 +1,9 @@
 {
   services = {
-    xserver = {
-      enable = true;
-      displayManager.sddm.enable = true;
-      desktopManager.plasma5.enable = true;
-    };
     xrdp = {
       enable = true;
-      defaultWindowManager = "startplasma-x11";
+      defaultWindowManager = "/run/current-system/sw/bin/gnome-shell";
       openFirewall = true;
     };
   };
-}
\ No newline at end of file
+}