diff options
Diffstat (limited to 'modules/workstation/hardware')
-rw-r--r-- | modules/workstation/hardware/keyboard/MAPPINGS | 7 | ||||
-rw-r--r-- | modules/workstation/hardware/keyboard/default.nix | 10 | ||||
-rw-r--r-- | modules/workstation/hardware/keyboard/events.dyon | 14 |
3 files changed, 1 insertions, 30 deletions
diff --git a/modules/workstation/hardware/keyboard/MAPPINGS b/modules/workstation/hardware/keyboard/MAPPINGS deleted file mode 100644 index 60ded39c8cf1..000000000000 --- a/modules/workstation/hardware/keyboard/MAPPINGS +++ /dev/null @@ -1,7 +0,0 @@ -Key remappings are spread across several different places, because they -have to be done differently depending on the remapping. - -Here is an overview of remapped keys: - -Caps Lock: Escape if pressed, Ctrl if held -Tab: Super-L if pressed, Tab if held diff --git a/modules/workstation/hardware/keyboard/default.nix b/modules/workstation/hardware/keyboard/default.nix index 092854d535b4..aed8ab73c87d 100644 --- a/modules/workstation/hardware/keyboard/default.nix +++ b/modules/workstation/hardware/keyboard/default.nix @@ -7,16 +7,8 @@ in { console.useXkbConfig = true; services.xserver.layout = "dvorak"; - services.xserver.xkbOptions = "ctrl:nocaps,compose:menu"; + services.xserver.xkbOptions = "caps:escape,compose:menu"; environment.variables.XKB_DEFAULT_LAYOUT = xcfg.layout; environment.variables.XKB_DEFAULT_OPTIONS = xcfg.xkbOptions; - - services.evscript.enable = true; - services.evscript.script = ./events.dyon; - - boot.postBootCommands = '' - # Remap tab to left super - /run/current-system/sw/bin/setkeycodes 0f 125 - ''; } diff --git a/modules/workstation/hardware/keyboard/events.dyon b/modules/workstation/hardware/keyboard/events.dyon deleted file mode 100644 index 96cc15450e46..000000000000 --- a/modules/workstation/hardware/keyboard/events.dyon +++ /dev/null @@ -1,14 +0,0 @@ -//! [events] -//! keys = ['ESC', 'TAB'] -fn main() ~ evdevs, uinput { - should_esc := false - should_tab := false - loop { - evts := next_events(evdevs) - for i { - evt := evts[i] - xcape(mut should_esc, evt, KEY_CAPSLOCK(), [KEY_ESC()]) - xcape(mut should_tab, evt, KEY_LEFTMETA(), [KEY_TAB()]) - } - } -} |