From 61fc330d10b415a2e454256930ea8daea3e3a6b8 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Mon, 27 Mar 2023 16:32:28 -0400 Subject: [PATCH] refactor(software/minipro): don't hardcode udev rules --- modules/modules/software/minipro.nix | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/modules/modules/software/minipro.nix b/modules/modules/software/minipro.nix index 095eb66..ecc705a 100644 --- a/modules/modules/software/minipro.nix +++ b/modules/modules/software/minipro.nix @@ -10,28 +10,7 @@ in udev = mkBoolOpt true; }; config = mkIf cfg.enable { - home.home.packages = with pkgs; [ minipro ]; - - # https://gitlab.com/DavidGriffith/minipro/-/tree/master/udev - services.udev.extraRules = mkIf cfg.udev '' - ACTION!="add|change", GOTO="minipro_rules_end" - SUBSYSTEM!="usb", GOTO="minipro_rules_end" - - # TL866A/CS - ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="e11c", ENV{ID_MINIPRO}="1" - - # TL866II+ - ATTRS{idVendor}=="a466", ATTRS{idProduct}=="0a53", ENV{ID_MINIPRO}="1" - - LABEL="minipro_rules_end" - - ACTION!="add|change", GOTO="minipro_rules_plugdev_end" - ENV{ID_MINIPRO}=="1", MODE="660", GROUP="plugdev" - LABEL="minipro_rules_plugdev_end" - - ACTION!="add|change", GOTO="minipro_rules_uaccess_end" - ENV{ID_MINIPRO}=="1", TAG+="uaccess" - LABEL="minipro_rules_uaccess_end" - ''; + home.home.packages = [ pkgs.minipro ]; + services.udev.packages = [ pkgs.minipro ]; }; }