diff --git a/hosts/fw.cloonar.com/configuration.nix b/hosts/fw.cloonar.com/configuration.nix
index 293e8e4..e792ef3 100644
--- a/hosts/fw.cloonar.com/configuration.nix
+++ b/hosts/fw.cloonar.com/configuration.nix
@@ -23,6 +23,7 @@
     ./modules/podman.nix
     ./modules/omada.nix
     ./modules/ddclient.nix
+    -/modules/wol.nix
 
     # git
     ./modules/gitea.nix
@@ -70,6 +71,7 @@
     htop                # to see the system load
     tcpdump             # view network traffic
     vim                 # my preferred editor
+    wol
     inotify-tools
   ];
 
diff --git a/hosts/fw.cloonar.com/modules/wol.nix b/hosts/fw.cloonar.com/modules/wol.nix
new file mode 100644
index 0000000..067ccf8
--- /dev/null
+++ b/hosts/fw.cloonar.com/modules/wol.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+let
+  wolScript = stdenv.mkDerivation {
+    name = "wol-script";
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+    outputHash = sha256;
+    builder = writeShellScript "wol-lease" ''
+      IP=$(cat /var/lib/kea/dhcp4.leases | grep $1 | awk -F, '{print $1}' | tail -n 1);
+      MAC=$(cat /var/lib/kea/dhcp4.leases | grep $1 | awk -F, '{print $2}' | tail -n 1);
+      ${pkgs.wol}/bin/wol -i $IP $MAC
+    '';
+  };
+in
+{
+  environment.systemPackages = [ 
+    wolScript
+  ];
+}
diff --git a/hosts/nb-new.cloonar.com/configuration.nix b/hosts/nb-new.cloonar.com/configuration.nix
index 99e76ee..cf5542f 100644
--- a/hosts/nb-new.cloonar.com/configuration.nix
+++ b/hosts/nb-new.cloonar.com/configuration.nix
@@ -120,7 +120,6 @@ in {
     git-filter-repo
     ykfde
     nix-prefetch-git
-    unstable.rustdesk-flutter
   ];
 
   environment.variables = {
diff --git a/hosts/nb-new.cloonar.com/hardware-configuration.nix b/hosts/nb-new.cloonar.com/hardware-configuration.nix
index 1d4d4cf..44e5fd2 100644
--- a/hosts/nb-new.cloonar.com/hardware-configuration.nix
+++ b/hosts/nb-new.cloonar.com/hardware-configuration.nix
@@ -18,7 +18,7 @@
     {
       device = "none";
       fsType = "tmpfs";
-      options = [ "size=3G" "mode=755" ];
+      options = [ "size=16G" "mode=755" ];
     };
 
   fileSystems."/nix" =
diff --git a/hosts/nb-new.cloonar.com/modules/sway/rustdesk.nix b/hosts/nb-new.cloonar.com/modules/sway/rustdesk.nix
new file mode 100644
index 0000000..2109d84
--- /dev/null
+++ b/hosts/nb-new.cloonar.com/modules/sway/rustdesk.nix
@@ -0,0 +1,19 @@
+
+{ pkgs, ... }:
+let
+  rustDeskDesktopItem = pkgs.makeDesktopItem {
+    name = "rustdesk-xorg";
+    desktopName = "RustDesk Xorg";
+    icon = "rustdesk";
+    exec = "env -u WAYLAND_DISPLAY rustdesk";
+    genericName = "Remote Desktop";
+    categories = [ "Network" ];
+    mimeTypes = [ "x-scheme-handler/rustdesk" ];
+  };
+in
+{
+  environment.systemPackages = [ 
+    pkgs.rustdesk
+    rustDeskDesktopItem
+  ];
+}
diff --git a/hosts/nb-new.cloonar.com/modules/sway/sway.nix b/hosts/nb-new.cloonar.com/modules/sway/sway.nix
index d6caf79..0f3ecb4 100644
--- a/hosts/nb-new.cloonar.com/modules/sway/sway.nix
+++ b/hosts/nb-new.cloonar.com/modules/sway/sway.nix
@@ -26,6 +26,7 @@ in {
     ./social.nix
     ./signal-work.nix
     ./parsec.nix
+    ./rustdesk.nix
     ./thunderbird.nix
   ];
 
@@ -127,6 +128,7 @@ in {
     wayland
     wl-clipboard
     wofi
+    wol
     wtype
     yubikey-manager-qt
   ];