back to capslock on accents hrm with cancel on exit

JeffDess · Aug 19, 2023 · 9e6f54a · 9e6f54a
1 parent 22a37f6
commit 9e6f54a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/behaviors/hold-tap.dtsi b/behaviors/hold-tap.dtsi
@@ -1,6 +1,7 @@
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include "../zmk-nodefree-config/helper.h"
+#include "../zmk-nodefree-config/keypos_def/keypos_36keys.h"
 
 /* Home Row Mods */
 
@@ -37,7 +38,7 @@ ZMK_BEHAVIOR(hrme, hold_tap,
     tapping-term-ms = <150>;
     quick-tap-ms = <125>;
     global-quick-tap;
-    bindings = <&caps_word>, <&E_GR>;
+    bindings = <&kp>, <&E_GR>;
 )
 
 // homerow mods for î
@@ -46,5 +47,5 @@ ZMK_BEHAVIOR(hrmi, hold_tap,
     tapping-term-ms = <150>;
     quick-tap-ms = <125>;
     global-quick-tap;
-    bindings = <&caps_word>, <&I_CI>;
+    bindings = <&kp>, <&I_CI>;
 )
diff --git a/config/corne.keymap b/config/corne.keymap
@@ -35,7 +35,7 @@ ZMK_LAYER_5COL(accent,
 // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
      XXX         XXX         &TREM E     XXX          XXX            XXX         &TREM I       &TREM O       &TREM U      &TREMA
 // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
-     &A_GR       &CIRC E     &E_CU       &hrme 0 0    XXX            XXX         &hrmi 0 0     &O_CI         &U_CI        &GRA
+     &A_GR       &CIRC E     &E_CU      &hrme CAPS 0  XXX            XXX         &hrmi CAPS 0  &O_CI         &U_CI        &GRA
 // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
      &A_CI       XXX         &CEDIL      XXX          XXX            XXX         XXX           XXX           &U_GR        &CAR
 // ╰───────────┴───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┴────────────╯

diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi
@@ -36,7 +36,7 @@ ZMK_BEHAVIOR(O_CI,  macro, bindings = <&fr_o_cf>, <&to DEF>;)           // Ô
 ZMK_BEHAVIOR(U_CI,  macro, bindings = <&fr_u_cf>, <&to DEF>;)           // Û
 ZMK_BEHAVIOR(U_GR,  macro, bindings = <&fr_u_gr>, <&to DEF>;)           // Ù
 ZMK_BEHAVIOR(CEDIL, macro, bindings = <&kp RBKT>, <&to DEF>;)           // Ç
-ZMK_BEHAVIOR(CANCEL_CAPSWORD, macro, bindings = <&kp PAUSE_BREAK>;)
+ZMK_BEHAVIOR(CANCEL_CAPSLOCK, macro, bindings = <&macro_release &CAPS>;)
 ZMK_BEHAVIOR(CAR,   macro, bindings = // ^ directly
     <&macro_tap &kp LBKT &kp SPACE>,
     <&to DEF>;
@@ -79,7 +79,7 @@ ZMK_BEHAVIOR(CIRC, macro_one_param, bindings = // ^ to input
     <&kp LBKT>,
     <&macro_param_1to1>,
     <&macro_tap &kp MACRO_PLACEHOLDER>,
-    <&CANCEL_CAPSWORD>,
+    <&CANCEL_CAPSLOCK>,
     <&to DEF>;
 )