From e3916d48dde73d411e53b8ec311e82b0767c156e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 8 Apr 2026 20:43:35 +0000
Subject: [PATCH] Fix RDP on NixOS: declarative service masking instead of
 grdctl --system rdp disable

Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/0701acec-7c63-419b-be17-57a912daedaf

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
---
 modules/rdp.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/rdp.nix b/modules/rdp.nix
index 2c998ca..cd83008 100755
--- a/modules/rdp.nix
+++ b/modules/rdp.nix
@@ -113,9 +113,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
 
       chmod 600 "$CRED_FILE"
 
-      # Disable the system-level RDP endpoint so connections go through the user session
-      grdctl --system rdp disable || true
-
       echo "GNOME Remote Desktop RDP configured successfully"
     '';
   };
@@ -163,4 +160,9 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
 
   # Add free user to gnome-remote-desktop group so the user-level service can read credential files
   users.users.free.extraGroups = [ "gnome-remote-desktop" ];
+
+  # Prevent the system-level RDP service from starting — we use user-session sharing instead.
+  # We keep services.gnome.gnome-remote-desktop.enable = true for the grdctl binary,
+  # but prevent the system service from auto-starting (which causes the GDM "Session Already Running" conflict).
+  systemd.services."gnome-remote-desktop".wantedBy = lib.mkForce [];
 }