From 57ff7cbd2079d50b4200391a4cd1d408ecb276d3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 21 Feb 2026 14:47:24 +0100 Subject: [PATCH 1/2] feat(keyboard): add swapCapsLockAndEscape --- modules/system/keyboard.nix | 14 ++++++++++++++ tests/system-keyboard-mapping.nix | 3 +++ 2 files changed, 17 insertions(+) diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix index f4f6406..794567d 100644 --- a/modules/system/keyboard.nix +++ b/modules/system/keyboard.nix @@ -38,6 +38,12 @@ in description = "Whether to swap the left Command key and left Alt key."; }; + system.keyboard.swapCapsLockAndEscape = mkOption { + type = types.bool; + default = false; + description = "Whether to swap the Caps Lock key and Escape key."; + }; + system.keyboard.swapLeftCtrlAndFn = mkOption { type = types.bool; default = false; @@ -64,6 +70,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.swapCapsLockAndEscape { + HIDKeyboardModifierMappingSrc = 30064771129; + HIDKeyboardModifierMappingDst = 30064771113; + }) + (mkIf cfg.swapCapsLockAndEscape { + HIDKeyboardModifierMappingSrc = 30064771113; + HIDKeyboardModifierMappingDst = 30064771129; + }) (mkIf cfg.swapLeftCommandAndLeftAlt { HIDKeyboardModifierMappingSrc = 30064771299; HIDKeyboardModifierMappingDst = 30064771298; diff --git a/tests/system-keyboard-mapping.nix b/tests/system-keyboard-mapping.nix index 654ca0c..2a60724 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.swapCapsLockAndEscape = true; system.keyboard.swapLeftCommandAndLeftAlt = true; system.keyboard.swapLeftCtrlAndFn = true; @@ -12,9 +13,11 @@ echo checking keyboard mappings in /activate >&2 grep "hidutil property --set '{\"UserKeyMapping\":.*}'" ${config.out}/activate grep "\"HIDKeyboardModifierMappingSrc\":30064771129" ${config.out}/activate + grep "\"HIDKeyboardModifierMappingSrc\":30064771113" ${config.out}/activate grep "\"HIDKeyboardModifierMappingSrc\":30064771172" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771113" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771125" ${config.out}/activate + grep "\"HIDKeyboardModifierMappingDst\":30064771129" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771296" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771298" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771299" ${config.out}/activate From 3f0f0ece39c415eae080d1203994d5c5b5aef710 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 21 Feb 2026 14:53:40 +0100 Subject: [PATCH 2/2] feat(keyboard): add swapRightCommandAndRightOption --- modules/system/keyboard.nix | 14 ++++++++++++++ tests/system-keyboard-mapping.nix | 5 +++++ 2 files changed, 19 insertions(+) diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix index 794567d..7b2a5d6 100644 --- a/modules/system/keyboard.nix +++ b/modules/system/keyboard.nix @@ -38,6 +38,12 @@ in description = "Whether to swap the left Command key and left Alt key."; }; + system.keyboard.swapRightCommandAndRightOption = mkOption { + type = types.bool; + default = false; + description = "Whether to swap the right Command key and right Option key."; + }; + system.keyboard.swapCapsLockAndEscape = mkOption { type = types.bool; default = false; @@ -86,6 +92,14 @@ in HIDKeyboardModifierMappingSrc = 30064771298; HIDKeyboardModifierMappingDst = 30064771299; }) + (mkIf cfg.swapRightCommandAndRightOption { + HIDKeyboardModifierMappingSrc = 30064771303; + HIDKeyboardModifierMappingDst = 30064771302; + }) + (mkIf cfg.swapRightCommandAndRightOption { + HIDKeyboardModifierMappingSrc = 30064771302; + HIDKeyboardModifierMappingDst = 30064771303; + }) (mkIf cfg.swapLeftCtrlAndFn { HIDKeyboardModifierMappingSrc = 30064771296; HIDKeyboardModifierMappingDst = 1095216660483; diff --git a/tests/system-keyboard-mapping.nix b/tests/system-keyboard-mapping.nix index 2a60724..c3f26de 100644 --- a/tests/system-keyboard-mapping.nix +++ b/tests/system-keyboard-mapping.nix @@ -7,6 +7,7 @@ system.keyboard.nonUS.remapTilde = true; system.keyboard.swapCapsLockAndEscape = true; system.keyboard.swapLeftCommandAndLeftAlt = true; + system.keyboard.swapRightCommandAndRightOption = true; system.keyboard.swapLeftCtrlAndFn = true; test = '' @@ -22,6 +23,10 @@ grep "\"HIDKeyboardModifierMappingDst\":30064771298" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771299" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":30064771296" ${config.out}/activate + grep "\"HIDKeyboardModifierMappingSrc\":30064771303" ${config.out}/activate + grep "\"HIDKeyboardModifierMappingSrc\":30064771302" ${config.out}/activate + grep "\"HIDKeyboardModifierMappingDst\":30064771302" ${config.out}/activate + grep "\"HIDKeyboardModifierMappingDst\":30064771303" ${config.out}/activate grep "\"HIDKeyboardModifierMappingDst\":1095216660483" ${config.out}/activate ''; }