move solaar rules to udev package

2 files changed, 5 insertions, 32 deletions

diff --git a/hosts/shinji/42-logitech-unify-permissions.rules b/hosts/shinji/42-logitech-unify-permissions.rules
deleted file mode 100644
index e52c9b0..0000000
--- a/hosts/shinji/42-logitech-unify-permissions.rules
+++ /dev/null
@@ -1,31 +0,0 @@
-# This rule was added by Solaar.
-#
-# Allows non-root users to have raw access to Logitech devices.
-# Allowing users to write to the device is potentially dangerous
-# because they could perform firmware updates.
-
-ACTION != "add", GOTO="solaar_end"
-SUBSYSTEM != "hidraw", GOTO="solaar_end"
-
-# USB-connected Logitech receivers and devices
-ATTRS{idVendor}=="046d", GOTO="solaar_apply"
-
-# Lenovo nano receiver
-ATTRS{idVendor}=="17ef", ATTRS{idProduct}=="6042", GOTO="solaar_apply"
-
-# Bluetooth-connected Logitech devices
-KERNELS == "0005:046D:*", GOTO="solaar_apply"
-
-GOTO="solaar_end"
-
-LABEL="solaar_apply"
-
-# Allow any seated user to access the receiver.
-# uaccess: modern ACL-enabled udev
-TAG+="uaccess"
-
-# Grant members of the "plugdev" group access to receiver (useful for SSH users)
-#MODE="0660", GROUP="plugdev"
-
-LABEL="solaar_end"
-# vim: ft=udevrules
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index d502703..c40aba7 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -3,6 +3,8 @@
 {
   lib,
   pkgs,
+  inputs,
+  system,
   ...
 }: {
   imports = [
@@ -46,7 +48,9 @@
   };
 
   # logitech mouse udev
-  services.udev.extraRules = lib.fileContents ./42-logitech-unify-permissions.rules;
+  services.udev.packages = [
+    inputs.self.packages.${system}.solaar-udev-rules
+  ];
 
   # packages
   environment.systemPackages = with pkgs; [