From 4a9a71bad1c88a5779b20e42c4d895260bc6985d Mon Sep 17 00:00:00 2001
From: Andreas Schaafsma <andreas@subsonics.nl>
Date: Sat, 28 Feb 2026 16:35:41 +0100
Subject: [PATCH] commit working state

---
 modules/nixos/desktop-environment/default.nix | 26 +++++++++++++++++++
 .../drivebystation-nix/configuration.nix      |  7 ++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/modules/nixos/desktop-environment/default.nix b/modules/nixos/desktop-environment/default.nix
index e4e46af..a00b89c 100644
--- a/modules/nixos/desktop-environment/default.nix
+++ b/modules/nixos/desktop-environment/default.nix
@@ -48,11 +48,37 @@ in {
         enable = true;
       };
       services.desktopManager.gnome.enable = true;
+      services.gnome.gnome-remote-desktop.enable = true;
+      systemd.services.gnome-remote-desktop = { 
+        wantedBy = [ "graphical.target" ]; # for starting the unit automatically at boot
+      };
+      services.displayManager.autoLogin.enable = false;
+      networking.firewall.allowedTCPPorts = [ 
+        3389 
+        3390 
+      ];
       environment.systemPackages = with pkgs; [
         gnome-tweaks
         gnome-software
         gnomeExtensions.pop-shell
         gnome-remote-desktop
+        glib-networking # Required gnome-remote-desktop dependency
+      ];
+      systemd.user.services.gnome-remote-desktop.environment = {
+        VK_ICD_FILENAMES = "/dev/null";
+        LIBGL_ALWAYS_SOFTWARE = "1";
+      };
+
+      systemd.services.gnome-remote-desktop.environment = {
+        VK_ICD_FILENAMES = "/dev/null";
+        LIBGL_ALWAYS_SOFTWARE = "1";
+      };
+      environment.sessionVariables.XDG_DATA_DIRS = lib.mkAfter [
+        "${pkgs.gnome-remote-desktop}/share"
+      ];
+      environment.pathsToLink = [
+        "/share/gsettings-schemas"
+        "/share"
       ];
     })
 
diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix
index 66c08f2..0a5c5e9 100644
--- a/systems/x86_64-linux/drivebystation-nix/configuration.nix
+++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix
@@ -47,10 +47,10 @@
 
   services = {
     # Enable Gnome Session
-    displayManager.gdm.enable = false;
+    displayManager.gdm.enable = true;
     displayManager.sddm.enable = false;
-    # displayManager.sddm.wayland.enable = true;
-    displayManager.cosmic-greeter.enable = true;
+    displayManager.sddm.wayland.enable = false;
+    displayManager.cosmic-greeter.enable = false;
     displayManager.defaultSession = "gnome";
     
     xserver = {
@@ -179,6 +179,7 @@
   };
 
 
+
   systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.