lol

Merge pull request #146605 from FlorianFranzen/zsa-udev

zsa-udev-rules: unstable-2020-12-16 -> 2.1.3

authored by

0x4A6F and committed by
GitHub
c92ba869 a0c37f06

+5 -9
-3
nixos/modules/hardware/keyboard/zsa.nix
··· 5 5 cfg = config.hardware.keyboard.zsa; 6 6 in 7 7 { 8 - # TODO: make group configurable like in https://github.com/NixOS/nixpkgs/blob/0b2b4b8c4e729535a61db56468809c5c2d3d175c/pkgs/tools/security/nitrokey-app/udev-rules.nix ? 9 8 options.hardware.keyboard.zsa = { 10 9 enable = mkOption { 11 10 type = types.bool; ··· 14 13 Enables udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I. 15 14 You need it when you want to flash a new configuration on the keyboard 16 15 or use their live training in the browser. 17 - Access to the keyboard is granted to users in the "plugdev" group. 18 16 You may want to install the wally-cli package. 19 17 ''; 20 18 }; ··· 22 20 23 21 config = mkIf cfg.enable { 24 22 services.udev.packages = [ pkgs.zsa-udev-rules ]; 25 - users.groups.plugdev = {}; 26 23 }; 27 24 }
+5 -6
pkgs/os-specific/linux/zsa-udev-rules/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub }: 2 2 3 - stdenv.mkDerivation { 3 + stdenv.mkDerivation rec { 4 4 pname = "zsa-udev-rules"; 5 - version = "unstable-2020-12-16"; 5 + version = "2.1.3"; 6 6 7 - # TODO: use version and source from nixpkgs/pkgs/development/tools/wally-cli/default.nix after next release 8 7 src = fetchFromGitHub { 9 8 owner = "zsa"; 10 9 repo = "wally"; 11 - rev = "e5dde3c700beab39fb941c6941e55535bf9b2af6"; 12 - sha256 = "0pkybi32r1hrmpa1mc8qlzhv7xy5n5rr5ah25lbr0cipp1bda417"; 10 + rev = "${version}-linux"; 11 + sha256 = "mZzXKFKlO/jAitnqzfvmIHp46A+R3xt2gOhVC3qN6gM="; 13 12 }; 14 13 15 - # it only installs files 14 + # Only copies udevs rules 16 15 dontConfigure = true; 17 16 dontBuild = true; 18 17 dontFixup = true;