diff --git a/modules/logitech.nix b/modules/logitech.nix
deleted file mode 100644
index e17aded..0000000
--- a/modules/logitech.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{delib, ...}:
-delib.module {
-  name = "logitech";
-
-  options = delib.singleEnableOption true;
-
-  nixos.ifEnabled = {
-    hardware.logitech.wireless.enable = true;
-    hardware.new-lg4ff.enable = true;
-  };
-}
diff --git a/modules/programs/core-cli.nix b/modules/programs/core-cli.nix
index c1abed4..92885db 100644
--- a/modules/programs/core-cli.nix
+++ b/modules/programs/core-cli.nix
@@ -18,7 +18,6 @@ delib.module {
       openssh
       p7zip
       pciutils
-      solaar
       sysstat
       unar
       wget
diff --git a/modules/systemd.nix b/modules/systemd.nix
index de615ee..cd8e294 100644
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@@ -9,5 +9,13 @@ delib.module {
         DefaultTimeoutStopSec=30s
       '';
     };
+
+    services.udev.extraRules = ''
+      # USB device rules for both dongle and mouse (Lamzu Maya)
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50d", MODE="0666", GROUP="input", TAG+="uaccess"
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50f", MODE="0666", GROUP="input", TAG+="uaccess"
+      KERNEL=="hidraw*", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50d", MODE="0666", GROUP="input", TAG+="uaccess"
+      KERNEL=="hidraw*", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50f", MODE="0666", GROUP="input", TAG+="uaccess"
+    '';
   };
 }