From 34f0140d51394f31e09128995986e943fbd73f68 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 8 Feb 2025 00:39:18 -0600 Subject: [PATCH 1/3] feat: added moonlander --- modules/nixos/hardware/moonlander/default.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/nixos/hardware/moonlander/default.nix diff --git a/modules/nixos/hardware/moonlander/default.nix b/modules/nixos/hardware/moonlander/default.nix new file mode 100644 index 0000000..e68674f --- /dev/null +++ b/modules/nixos/hardware/moonlander/default.nix @@ -0,0 +1,28 @@ +{ + environment.etc."udev/rules.d/50-zsa.rules".text = '' + # 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" + + # 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" + + # Keymapp / Wally Flashing rules for the Moonlander and Planck EZ + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu" + # Keymapp Flashing rules for the Voyager + SUBSYSTEMS=="usb", ATTRS{idVendor}=="3297", MODE:="0666", SYMLINK+="ignition_dfu" + ''; +} From adad4502565b51f23f52af63a55bf8784b8e919f Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 8 Feb 2025 00:39:47 -0600 Subject: [PATCH 2/3] feat: added moonlander --- modules/nixos/hardware/moonlander/default.nix | 37 ++++++------------- 1 file changed, 12 insertions(+), 25 deletions(-) mode change 100644 => 100755 modules/nixos/hardware/moonlander/default.nix diff --git a/modules/nixos/hardware/moonlander/default.nix b/modules/nixos/hardware/moonlander/default.nix old mode 100644 new mode 100755 index e68674f..0047fcd --- a/modules/nixos/hardware/moonlander/default.nix +++ b/modules/nixos/hardware/moonlander/default.nix @@ -1,28 +1,15 @@ +{ pkgs, ... }: { - environment.etc."udev/rules.d/50-zsa.rules".text = '' - # 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" + hardware.keyboard.zsa.enable = true; - # 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" - - # Keymapp / Wally Flashing rules for the Moonlander and Planck EZ - SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu" - # Keymapp Flashing rules for the Voyager - SUBSYSTEMS=="usb", ATTRS{idVendor}=="3297", MODE:="0666", SYMLINK+="ignition_dfu" - ''; + environment = { + enableAllTerminfo = true; + systemPackages = builtins.attrValues { + inherit (pkgs) + zsa-udev-rules + keymapp + kontroll + ; + }; + }; } From bfe585abe13fe569b961d679d0f3d4b945f03fed Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 8 Feb 2025 00:41:50 -0600 Subject: [PATCH 3/3] feat: removed goldwarder --- modules/nixos/programs/goldwarden/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 modules/nixos/programs/goldwarden/default.nix diff --git a/modules/nixos/programs/goldwarden/default.nix b/modules/nixos/programs/goldwarden/default.nix old mode 100644 new mode 100755 index 0be283b..00ea95e --- a/modules/nixos/programs/goldwarden/default.nix +++ b/modules/nixos/programs/goldwarden/default.nix @@ -1,3 +1,3 @@ { - programs.goldwarden.enable = true; + # programs.goldwarden.enable = true; }