movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #146605 from FlorianFranzen/zsa-udev

Browse source 
zsa-udev-rules: unstable-2020-12-16 -> 2.1.3
This commit is contained in:
0x4A6F 2021-12-09 21:03:35 +01:00 • committed by GitHub
commit c92ba86931
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/hardware/keyboard/zsa.nix
View file

@ -5,7 +5,6 @@ let
cfg = config.hardware.keyboard.zsa; cfg = config.hardware.keyboard.zsa;
in in
{ {
# TODO: make group configurable like in https://github.com/NixOS/nixpkgs/blob/0b2b4b8c4e729535a61db56468809c5c2d3d175c/pkgs/tools/security/nitrokey-app/udev-rules.nix ?
options.hardware.keyboard.zsa = { options.hardware.keyboard.zsa = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -14,7 +13,6 @@ in
Enables udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I. Enables udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I.
You need it when you want to flash a new configuration on the keyboard You need it when you want to flash a new configuration on the keyboard
or use their live training in the browser. or use their live training in the browser.
Access to the keyboard is granted to users in the "plugdev" group.
You may want to install the wally-cli package. You may want to install the wally-cli package.
''; '';
}; };
@ -22,6 +20,5 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.udev.packages = [ pkgs.zsa-udev-rules ]; services.udev.packages = [ pkgs.zsa-udev-rules ];
users.groups.plugdev = {};
}; };
} }

11
pkgs/os-specific/linux/zsa-udev-rules/default.nix
View file

@ -1,18 +1,17 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "zsa-udev-rules"; pname = "zsa-udev-rules";
version = "unstable-2020-12-16"; version = "2.1.3";
# TODO: use version and source from nixpkgs/pkgs/development/tools/wally-cli/default.nix after next release
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zsa"; owner = "zsa";
repo = "wally"; repo = "wally";
rev = "e5dde3c700beab39fb941c6941e55535bf9b2af6"; rev = "${version}-linux";
sha256 = "0pkybi32r1hrmpa1mc8qlzhv7xy5n5rr5ah25lbr0cipp1bda417"; sha256 = "mZzXKFKlO/jAitnqzfvmIHp46A+R3xt2gOhVC3qN6gM=";
}; };
# it only installs files # Only copies udevs rules
dontConfigure = true; dontConfigure = true;
dontBuild = true; dontBuild = true;
dontFixup = true; dontFixup = true;