diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-10-24 19:26:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 19:26:23 +0200 |
| commit | b346a283a8b04d8ca2a73c86c6fde53a5383f852 (patch) | |
| tree | 9fdb9bd0ba9e079cd8a74b03e0edc702be4bf0fe | |
| parent | 2a60ef1956ed7d000d3941d720e17a25450c6923 (diff) | |
| parent | bf0ac204bdf3d5b023ac039a661f9fd7c17d835c (diff) | |
Merge pull request #238 from c4710n/feature/swap-command-alt
add new option - system.keyboard.swapLeftCommandAndLeftAlt
| -rw-r--r-- | modules/system/keyboard.nix | 14 | ||||
| -rw-r--r-- | tests/system-keyboard-mapping.nix | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix index d4b7c8f..c637f04 100644 --- a/modules/system/keyboard.nix +++ b/modules/system/keyboard.nix @@ -32,6 +32,12 @@ in description = "Whether to remap the Tilde key on non-us keyboards."; }; + system.keyboard.swapLeftCommandAndLeftAlt = mkOption { + type = types.bool; + default = false; + description = "Whether to swap the left Command key and left Alt key."; + }; + system.keyboard.userKeyMapping = mkOption { internal = true; type = types.listOf (types.attrsOf types.int); @@ -52,6 +58,14 @@ in (mkIf cfg.remapCapsLockToControl { HIDKeyboardModifierMappingSrc = 30064771129; HIDKeyboardModifierMappingDst = 30064771296; }) (mkIf cfg.remapCapsLockToEscape { HIDKeyboardModifierMappingSrc = 30064771129; HIDKeyboardModifierMappingDst = 30064771113; }) (mkIf cfg.nonUS.remapTilde { HIDKeyboardModifierMappingSrc = 30064771172; HIDKeyboardModifierMappingDst = 30064771125; }) + (mkIf cfg.swapLeftCommandAndLeftAlt { + HIDKeyboardModifierMappingSrc = 30064771299; + HIDKeyboardModifierMappingDst = 30064771298; + }) + (mkIf cfg.swapLeftCommandAndLeftAlt { + HIDKeyboardModifierMappingSrc = 30064771298; + HIDKeyboardModifierMappingDst = 30064771299; + }) ]; system.activationScripts.keyboard.text = optionalString cfg.enableKeyMapping '' diff --git a/tests/system-keyboard-mapping.nix b/tests/system-keyboard-mapping.nix index 8af931f..b75efbd 100644 --- a/tests/system-keyboard-mapping.nix +++ b/tests/system-keyboard-mapping.nix @@ -5,6 +5,7 @@ system.keyboard.remapCapsLockToControl = true; system.keyboard.remapCapsLockToEscape = true; system.keyboard.nonUS.remapTilde = true; + system.keyboard.swapLeftCommandAndLeftAlt = true; test = '' echo checking keyboard mappings in /activate >&2 @@ -14,6 +15,7 @@ grep "\"HIDKeyboardModifierMappingDst\":30064771113" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771125" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771296" ${config.out}/activate + grep "\"HIDKeyboardModifierMappingDst\":30064771298" ${config.out}/activate + grep "\"HIDKeyboardModifierMappingDst\":30064771299" ${config.out}/activate ''; } - |