diff options
| author | ene <ene@sils.li> | 2023-04-07 11:04:40 +0200 |
|---|---|---|
| committer | ene <ene@sils.li> | 2023-04-07 11:04:40 +0200 |
| commit | dd3200e5dc1361971850ce636fe05d8c7a985355 (patch) | |
| tree | a04c27771b354ca954dfd9c5b00322f9463e7ed8 /system | |
| parent | Feat(hm/packages): Add brave and ungoogled-chromium (diff) | |
| download | nixos-config-dd3200e5dc1361971850ce636fe05d8c7a985355.tar.gz nixos-config-dd3200e5dc1361971850ce636fe05d8c7a985355.zip | |
Style(treewide): Format with Alejandra
Diffstat (limited to '')
| -rw-r--r-- | system/hardware/default.nix | 47 | ||||
| -rw-r--r-- | system/locale/default.nix | 2 |
2 files changed, 24 insertions, 25 deletions
diff --git a/system/hardware/default.nix b/system/hardware/default.nix index ed97e178..ca3c4a71 100644 --- a/system/hardware/default.nix +++ b/system/hardware/default.nix @@ -17,33 +17,32 @@ }; }; }; - services.udev.extraRules = - '' - # Rules for Oryx web flashing and live training -KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev" -KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev" + services.udev.extraRules = '' + # Rules for Oryx web flashing and live training + KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev" -# Legacy rules for live training over webusb (Not needed for firmware v21+) - # Rule for all ZSA keyboards - SUBSYSTEM=="usb", ATTR{idVendor}=="3297", GROUP="plugdev" - # Rule for the Moonlander - SUBSYSTEM=="usb", ATTR{idVendor}=="3297", ATTR{idProduct}=="1969", GROUP="plugdev" - # Rule for the Ergodox EZ - SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="1307", GROUP="plugdev" - # Rule for the Planck EZ - SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="6060", GROUP="plugdev" + # Legacy rules for live training over webusb (Not needed for firmware v21+) + # Rule for all ZSA keyboards + SUBSYSTEM=="usb", ATTR{idVendor}=="3297", GROUP="plugdev" + # Rule for the Moonlander + SUBSYSTEM=="usb", ATTR{idVendor}=="3297", ATTR{idProduct}=="1969", GROUP="plugdev" + # Rule for the Ergodox EZ + SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="1307", GROUP="plugdev" + # Rule for the Planck EZ + SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="6060", GROUP="plugdev" -# Wally Flashing rules for the Ergodox EZ -ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" -ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666" -KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666" + # Wally Flashing rules for the Ergodox EZ + ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" + ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666" + KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666" -# Wally Flashing rules for the Moonlander and Planck EZ -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", \ - MODE:="0666", \ - SYMLINK+="stm32_dfu" - ''; + # Wally Flashing rules for the Moonlander and Planck EZ + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", \ + MODE:="0666", \ + SYMLINK+="stm32_dfu" + ''; } # vim: ts=2 diff --git a/system/locale/default.nix b/system/locale/default.nix index e237df1a..6684f828 100644 --- a/system/locale/default.nix +++ b/system/locale/default.nix @@ -19,6 +19,6 @@ # Layout console = { - keyMap = "us"; # TODO add a config switch for this + keyMap = "us"; # TODO add a config switch for this }; } |