diff --git a/nixos/essential.nix b/nixos/essential.nix
index 7bf5559a..9006932c 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -43,6 +43,7 @@ in
     git-sync
     glxinfo
     gnumake
+    gparted
     htop
     inotify-tools
     iotop
diff --git a/nixos/extra.nix b/nixos/extra.nix
index 32b27c59..d7178a64 100644
--- a/nixos/extra.nix
+++ b/nixos/extra.nix
@@ -5,6 +5,7 @@
 
   environment.systemPackages = with pkgs; [
     android-studio
+    gradle
     ffmpeg
     asciidoctor
     roomeqwizard
diff --git a/nixos/machines/nixquick.nix b/nixos/machines/nixquick.nix
index ad77c686..30ad5e60 100644
--- a/nixos/machines/nixquick.nix
+++ b/nixos/machines/nixquick.nix
@@ -51,7 +51,7 @@
 
   services.xrdp.enable = true;
   services.xrdp.defaultWindowManager = "startplasma-x11";
-  networking.firewall.allowedTCPPorts = [ 3389 ];
+  services.xrdp.openFirewall = true;
 
   system.stateVersion = "23.11";
 }
diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix
index 08a82591..a6d30e81 100644
--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -89,6 +89,10 @@
   # High-DPI console
   console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
 
+  services.xrdp.enable = true;
+  services.xrdp.defaultWindowManager = "startplasma-x11";
+  services.xrdp.openFirewall = true;
+
   system.stateVersion = "20.03";
 
   users.extraUsers.dean.home = "/shared/dean";