diff options
| -rw-r--r-- | home-manager/config/swayidle/default.nix | 43 | ||||
| -rw-r--r-- | system/hardware/default.nix | 47 | ||||
| -rw-r--r-- | system/locale/default.nix | 2 |
3 files changed, 45 insertions, 47 deletions
diff --git a/home-manager/config/swayidle/default.nix b/home-manager/config/swayidle/default.nix index f2d5cf81..43807e2a 100644 --- a/home-manager/config/swayidle/default.nix +++ b/home-manager/config/swayidle/default.nix @@ -3,30 +3,29 @@ pkgs, ... }: { - xdg.configFile."swayidle/config".source = ./config; -# services.swayidle = { -# enable = true; -# events = [ -# { -# event = "before-sleep"; -# command = "${pkgs.swaylock}/bin/swaylock -f "; -# } -# ]; -# timeouts = [ -# { -# timeout = 180; -# command = "${pkgs.swaylock}/bin/swaylock -fFu "; -# } -# { -# timeout = 360; -# # TODO systemctl is installed? -# command = "systemctl suspend-then-hibernate"; -# } -# ]; -# # systemdTarget = ""; # TODO this might be usefull -# }; + # services.swayidle = { + # enable = true; + # events = [ + # { + # event = "before-sleep"; + # command = "${pkgs.swaylock}/bin/swaylock -f "; + # } + # ]; + # timeouts = [ + # { + # timeout = 180; + # command = "${pkgs.swaylock}/bin/swaylock -fFu "; + # } + # { + # timeout = 360; + # # TODO systemctl is installed? + # command = "systemctl suspend-then-hibernate"; + # } + # ]; + # # systemdTarget = ""; # TODO this might be usefull + # }; } # vim: ts=2 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 }; } |