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