From f5be97a2f49987832de8fc371fad11088ade780e Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@subzero.xyz>
Date: Wed, 3 Dec 2025 15:35:05 +0100
Subject: [PATCH] =?UTF-8?q?=E2=80=A2=20feat(nix):=20enable=20gnome-remote-?=
 =?UTF-8?q?desktop=20and=20xrdp=20services=20=E2=80=A2=20fix(nix):=20repla?=
 =?UTF-8?q?ce=20ollama=20with=20obsidian=20in=20system=20packages=20?=
 =?UTF-8?q?=E2=80=A2=20feat(nix):=20add=20cheese,=20freerdp,=20and=20rustd?=
 =?UTF-8?q?esk-flutter=20to=20GUI=20modules=20=E2=80=A2=20refactor(nix):?=
 =?UTF-8?q?=20reorganize=20gnome=20extensions=20and=20services=20configura?=
 =?UTF-8?q?tion=20=E2=80=A2=20chore(nix):=20configure=20xrdp=20to=20use=20?=
 =?UTF-8?q?mkDefault=20and=20add=20firewall=20rules=20for=20RDP=20?=
 =?UTF-8?q?=E2=80=A2=20feat(nix):=20enable=20gnome-remote-desktop=20with?=
 =?UTF-8?q?=20proper=20port=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/nixos/services/gui/default.nix | 16 +++++++++++-----
 systems/x86_64-linux/x1/default.nix    |  3 +--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index 5226815..58d19bf 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -125,25 +125,28 @@ in
         bat
         cardpeek
         ccache
+        cheese
         chromium
         clang
         dive
         easyeffects
         file
         firefox
+        freerdp
         gh
         gimp
         git
         gnome-browser-connector
-        cheese
+        gnome-remote-desktop
+        gnome-session
         gnome-software
         gnomeExtensions.appindicator
         gnomeExtensions.autohide-battery
+        gnomeExtensions.clipboard-history
         gnomeExtensions.dash-to-panel
         gnomeExtensions.easyeffects-preset-selector
         gnomeExtensions.hibernate-status-button
         gnomeExtensions.vitals
-        gnomeExtensions.clipboard-history
         gnupg
         go
         jq
@@ -159,6 +162,7 @@ in
         pstree
         remmina
         ripgrep
+        rustdesk-flutter
         rustup
         statix
         thunderbird
@@ -167,8 +171,6 @@ in
         wl-clipboard
         yubikey-personalization
         zellij
-        gnome-remote-desktop
-        rustdesk-flutter
       ]
       ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
         with pkgs;
@@ -208,8 +210,12 @@ in
     };
 
     # remote desktop
-    services.xrdp.enable = true;
+    services.xrdp.enable = lib.mkDefault false;
     services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
     services.xrdp.openFirewall = true;
+
+    services.gnome.gnome-remote-desktop.enable = lib.mkDefault true;
+    networking.firewall.allowedTCPPorts = [ 3389 ];
+    networking.firewall.allowedUDPPorts = [ 3389 ];
   };
 }
diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix
index 653fd59..956c831 100644
--- a/systems/x86_64-linux/x1/default.nix
+++ b/systems/x86_64-linux/x1/default.nix
@@ -12,7 +12,6 @@ with lib.metacfg;
   ];
 
   services.rustdesk-server.signal.enable = false;
-services.gnome.gnome-remote-desktop.enable = true;
 
   services.tailscale.enable = true;
 
@@ -102,7 +101,7 @@ services.gnome.gnome-remote-desktop.enable = true;
     kubectx
     libcamera
     logseq
-    ollama
+    obsidian
     piper-tts
     tipp10
     uv