From 73401353e437347bdc097561df6fbcb811e27ddd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 8 Apr 2026 21:28:22 +0000
Subject: [PATCH 1/2] Initial plan


From 1bbf6094b33e1e51dd23da4f2515fe6023a9e63a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 8 Apr 2026 21:29:48 +0000
Subject: [PATCH 2/2] revert: restore rdp.nix to pre-PR#147 working state with
 || true fix

- Remove systemd.services."gnome-remote-desktop".wantedBy = lib.mkForce []
  (was preventing the service from ever auto-starting)
- Remove systemctl start gnome-remote-desktop.service || true
  (was creating a systemd deadlock with before = ["gnome-remote-desktop.service"])
- Remove pkgs.systemd from setup script path
- Remove grdctl --system rdp disable-view-only || true
- Add || true to grdctl --system rdp enable (suppress harmless EROFS warning)

Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/75c67389-947f-437d-95ba-427504935156

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

diff --git a/modules/rdp.nix b/modules/rdp.nix
index 8ba2c36..21bdf3a 100755
--- a/modules/rdp.nix
+++ b/modules/rdp.nix
@@ -13,11 +13,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
   # Enable the GNOME Remote Desktop service at the system level
   services.gnome.gnome-remote-desktop.enable = true;
 
-  # Prevent the system-level service from auto-starting via GDM's target ordering.
-  # This avoids the "Session Already Running" GDM dialog when free is auto-logged-in.
-  # We start the service explicitly from the setup script after configuration is complete.
-  systemd.services."gnome-remote-desktop".wantedBy = lib.mkForce [];
-
   # Open RDP port in the firewall
   networking.firewall.allowedTCPPorts = [ 3389 ];
 
@@ -44,7 +39,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
       pkgs.openssl
       pkgs.hostname
       pkgs.gawk
-      pkgs.systemd
     ];
     script = ''
       # Ensure directory structure exists
@@ -117,14 +111,9 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
 
       chmod 600 "$CRED_FILE"
 
-      grdctl --system rdp enable
+      # Enable RDP backend and set credentials
+      grdctl --system rdp enable || true
       grdctl --system rdp set-credentials sovran "$PASSWORD"
-      grdctl --system rdp disable-view-only || true
-
-      # Start the service now that everything is configured.
-      # The service won't auto-start (wantedBy is empty), so we start it explicitly
-      # after TLS certs and credentials are fully configured.
-      systemctl start gnome-remote-desktop.service || true
 
       echo "GNOME Remote Desktop RDP configured successfully"
     '';