diff --git a/flake.nix b/flake.nix
index 8a7c4cb..8482899 100644
--- a/flake.nix
+++ b/flake.nix
@@ -100,6 +100,7 @@
           src = nixpkgs-unstable-raw;
           patches = [
             ./nixpkgs-patches/pr357897.patch
+            ./nixpkgs-patches/pr359282.patch
           ];
         };
         nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
diff --git a/nixpkgs-patches/pr359282.patch b/nixpkgs-patches/pr359282.patch
new file mode 100644
index 0000000..df16636
--- /dev/null
+++ b/nixpkgs-patches/pr359282.patch
@@ -0,0 +1,92 @@
+From 40b3e9f1d39626c1bf38a315e78a1aafd3f378d4 Mon Sep 17 00:00:00 2001
+From: Toast <39011842+toast003@users.noreply.github.com>
+Date: Tue, 26 Nov 2024 13:36:45 +0100
+Subject: [PATCH 1/2] handheld-daemon: 3.4.1 -> 3.5.7
+
+Also install hhd's hwdb file, since it is needed for buttons to work
+properly on the MSI Claw, among other things
+---
+ pkgs/by-name/ha/handheld-daemon/package.nix | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
+index 286566a2710a4..e21fe848b0942 100644
+--- a/pkgs/by-name/ha/handheld-daemon/package.nix
++++ b/pkgs/by-name/ha/handheld-daemon/package.nix
+@@ -8,14 +8,14 @@
+ }:
+ python3.pkgs.buildPythonApplication rec {
+   pname = "handheld-daemon";
+-  version = "3.4.1";
++  version = "3.5.7";
+   pyproject = true;
+ 
+   src = fetchFromGitHub {
+     owner = "hhd-dev";
+     repo = "hhd";
+     rev = "refs/tags/v${version}";
+-    hash = "sha256-hup9G4pTlTl68zLzhaDmH7nV8fp/I94Nuis68B8K2wY=";
++    hash = "sha256-nUHEPyTHU7LD6BZg+2cLl4M/ZPb5MQl6xxtJW1iZkEY=";
+   };
+ 
+   propagatedBuildInputs = with python3.pkgs; [
+@@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
+     setuptools
+     toybox
+     xlib
++    pyserial
+   ];
+ 
+   # This package doesn't have upstream tests.
+@@ -46,6 +47,7 @@ python3.pkgs.buildPythonApplication rec {
+ 
+   postInstall = ''
+     install -Dm644 $src/usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/
++    install -Dm644 $src/usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/
+   '';
+ 
+   meta = with lib; {
+
+From efc1301777818548a2f23f31248486e680502456 Mon Sep 17 00:00:00 2001
+From: Toast <39011842+toast003@users.noreply.github.com>
+Date: Tue, 26 Nov 2024 17:50:06 +0100
+Subject: [PATCH 2/2] handheld-daemon: 3.5.7 -> 3.6.1
+
+Version 3.6.0 added lsof as a dependency
+---
+ pkgs/by-name/ha/handheld-daemon/package.nix | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
+index e21fe848b0942..b99cd1c581476 100644
+--- a/pkgs/by-name/ha/handheld-daemon/package.nix
++++ b/pkgs/by-name/ha/handheld-daemon/package.nix
+@@ -5,17 +5,18 @@
+   lib,
+   python3,
+   toybox,
++  lsof
+ }:
+ python3.pkgs.buildPythonApplication rec {
+   pname = "handheld-daemon";
+-  version = "3.5.7";
++  version = "3.6.1";
+   pyproject = true;
+ 
+   src = fetchFromGitHub {
+     owner = "hhd-dev";
+     repo = "hhd";
+     rev = "refs/tags/v${version}";
+-    hash = "sha256-nUHEPyTHU7LD6BZg+2cLl4M/ZPb5MQl6xxtJW1iZkEY=";
++    hash = "sha256-IdpSRb66G+WzTv/BC29r2OjO1b4VdWbV6OSzOoiFAO0=";
+   };
+ 
+   propagatedBuildInputs = with python3.pkgs; [
+@@ -28,6 +29,7 @@ python3.pkgs.buildPythonApplication rec {
+     toybox
+     xlib
+     pyserial
++    lsof
+   ];
+ 
+   # This package doesn't have upstream tests.