From b6799c6505a79d074f2deb6c5c5f7ec197ef8564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 09:07:08 -0400 Subject: [PATCH 01/14] feat: add inverted punctuation --- behaviors/mod-morph.dtsi | 12 +++++++ config/urchin.keymap | 2 +- layouts/canadian-multilingual-standard.dtsi | 38 +++++++++++---------- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/behaviors/mod-morph.dtsi b/behaviors/mod-morph.dtsi index 2e75e3e..5f7822c 100644 --- a/behaviors/mod-morph.dtsi +++ b/behaviors/mod-morph.dtsi @@ -75,3 +75,15 @@ ZMK_MOD_MORPH(sap_dap, bindings = <&kp SAPOS>, <&kp DAPOS>; mods = <(MOD_LSFT|MOD_RSFT)>; ) + +// tap: question mark | shift + tap: inverted question mark +ZMK_MOD_MORPH(ques_iques, + bindings = <&kp QUEST>, <&kp QUEST_INV>; + mods = <(MOD_LSFT|MOD_RSFT)>; +) + +// tap: exclamation mark | shift + tap: inverted exclamation mark +ZMK_MOD_MORPH(excl_iexcl, + bindings = <&kp EXCL>, <&kp EXCL_INV>; + mods = <(MOD_LSFT|MOD_RSFT)>; +) diff --git a/config/urchin.keymap b/config/urchin.keymap index ba6850d..aba19cd 100644 --- a/config/urchin.keymap +++ b/config/urchin.keymap @@ -95,7 +95,7 @@ ZMK_LAYER(Symbols, // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮ &kp HASH &kp AT &kp LBRAC &kp RBRAC &kp PLUS XXX &kp TILDS &GRA &kp DLLR &soft_off // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ - &slsh_bslsh &dash_tilde &kp LPAR &hml SL RPAR &kp EQUAL &CAR &kp QUEST &kp EXCL &kp AMPS &kp PIP + &slsh_bslsh &dash_tilde &kp LPAR &hml SL RPAR &kp EQUAL &CAR &ques_iques &excl_iexcl &kp AMPS &kp PIP // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ &kp STAR &kp PRCNT &kp LBKET &kp RBKET &kp UNDER XXX &kp LETHAN &kp GRTHAN &kp LAQUO &kp RAQUO // ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯ diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi index 1682d76..4452390 100644 --- a/layouts/canadian-multilingual-standard.dtsi +++ b/layouts/canadian-multilingual-standard.dtsi @@ -6,24 +6,26 @@ /* Canadian Multilingual Standard Mappings */ -#define SLSH GRAVE // / -#define ASLSH RA(SLASH) // / on iOS -#define SAPOS LS(COMMA) // ' -#define DAPOS LS(DOT) // " -#define DEG RA(SEMI) // ° -#define LBRAC RA(N7) // { -#define RBRAC RA(N8) // } -#define LBKET RA(N9) // [ -#define RBKET RA(N0) // ] -#define QUEST LS(N6) // ? -#define PIP RA(GRAVE) // | -#define TILDS RA(RBKT) // ~ -#define LETHAN RA(COMMA) // ≤ -#define GRTHAN RA(DOT) // ≥ -#define ACC_AI RA(SLASH) // ´ -#define ACC_CI LBKT // ^ -#define ACC_GR RA(LBKT) // ` -#define ACC_TR LS(LBKT) // ¨ +#define SLSH GRAVE // / +#define ASLSH RA(SLASH) // / on iOS +#define SAPOS LS(COMMA) // ' +#define DAPOS LS(DOT) // " +#define DEG RA(SEMI) // ° +#define LBRAC RA(N7) // { +#define RBRAC RA(N8) // } +#define LBKET RA(N9) // [ +#define RBKET RA(N0) // ] +#define QUEST LS(N6) // ? +#define PIP RA(GRAVE) // | +#define TILDS RA(RBKT) // ~ +#define LETHAN RA(COMMA) // ≤ +#define GRTHAN RA(DOT) // ≥ +#define ACC_AI RA(SLASH) // ´ +#define ACC_CI LBKT // ^ +#define ACC_GR RA(LBKT) // ` +#define ACC_TR LS(LBKT) // ¨ +#define INV_QUEST RC(LS(MINUS)) // ¿ +#define INV_EXCL RC(LS(N1)) // ¡ /* Fractions */ #define MATH_1_4 RC(N4) // ¼ From 94ef6d3e61b53f305a399e35e122d1e82ea858f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 21:16:34 -0400 Subject: [PATCH 02/14] feat: add dead tilde and acute on accent layer --- config/urchin.keymap | 2 +- layouts/canadian-multilingual-standard.dtsi | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/urchin.keymap b/config/urchin.keymap index aba19cd..5676c5d 100644 --- a/config/urchin.keymap +++ b/config/urchin.keymap @@ -33,7 +33,7 @@ ZMK_LAYER(Colemak, ZMK_LAYER(ColeAcc, // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮ - XXX XXX &E_TR COL XXX XXX XXX &I_TR COL &O_TR COL &U_TR COL &KPT ACC_TR COL + &DTILD &ACUTE &E_TR COL XXX XXX XXX &I_TR COL &O_TR COL &U_TR COL &KPT ACC_TR COL // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ &A_GR COL &E_CI COL &E_CU COL &hrmeg SL COL XXX XXX &hrmic SL COL &O_CI COL &U_CI COL &KPT ACC_GR COL // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi index 4452390..149a40f 100644 --- a/layouts/canadian-multilingual-standard.dtsi +++ b/layouts/canadian-multilingual-standard.dtsi @@ -18,6 +18,8 @@ #define QUEST LS(N6) // ? #define PIP RA(GRAVE) // | #define TILDS RA(RBKT) // ~ +#define DTILD RC(RBKT) // ~ dead +#define ACUTE RC(SEMI) // ´ dead #define LETHAN RA(COMMA) // ≤ #define GRTHAN RA(DOT) // ≥ #define ACC_AI RA(SLASH) // ´ From 501b580eafbe96a36fd6e3f817b4076588a00e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 21:26:34 -0400 Subject: [PATCH 03/14] fix: inverted marks are not standard keymaps --- behaviors/mod-morph.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/behaviors/mod-morph.dtsi b/behaviors/mod-morph.dtsi index 5f7822c..017070e 100644 --- a/behaviors/mod-morph.dtsi +++ b/behaviors/mod-morph.dtsi @@ -78,12 +78,12 @@ ZMK_MOD_MORPH(sap_dap, // tap: question mark | shift + tap: inverted question mark ZMK_MOD_MORPH(ques_iques, - bindings = <&kp QUEST>, <&kp QUEST_INV>; + bindings = <&kp QUEST>, <&QUEST_INV>; mods = <(MOD_LSFT|MOD_RSFT)>; ) // tap: exclamation mark | shift + tap: inverted exclamation mark ZMK_MOD_MORPH(excl_iexcl, - bindings = <&kp EXCL>, <&kp EXCL_INV>; + bindings = <&kp EXCL>, <&EXCL_INV>; mods = <(MOD_LSFT|MOD_RSFT)>; ) From d291deaf3439f983d0e4c24bf32025b578b48dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 21:27:20 -0400 Subject: [PATCH 04/14] fix: tilde and acute must return to base layer --- config/urchin.keymap | 2 +- layouts/canadian-multilingual-standard.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/urchin.keymap b/config/urchin.keymap index 5676c5d..d1ff4d0 100644 --- a/config/urchin.keymap +++ b/config/urchin.keymap @@ -33,7 +33,7 @@ ZMK_LAYER(Colemak, ZMK_LAYER(ColeAcc, // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮ - &DTILD &ACUTE &E_TR COL XXX XXX XXX &I_TR COL &O_TR COL &U_TR COL &KPT ACC_TR COL +&KPT ACC_TI COL &KPT ACC_AC COL &E_TR COL XXX XXX XXX &I_TR COL &O_TR COL &U_TR COL &KPT ACC_TR COL // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ &A_GR COL &E_CI COL &E_CU COL &hrmeg SL COL XXX XXX &hrmic SL COL &O_CI COL &U_CI COL &KPT ACC_GR COL // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi index 149a40f..58433be 100644 --- a/layouts/canadian-multilingual-standard.dtsi +++ b/layouts/canadian-multilingual-standard.dtsi @@ -18,13 +18,13 @@ #define QUEST LS(N6) // ? #define PIP RA(GRAVE) // | #define TILDS RA(RBKT) // ~ -#define DTILD RC(RBKT) // ~ dead -#define ACUTE RC(SEMI) // ´ dead #define LETHAN RA(COMMA) // ≤ #define GRTHAN RA(DOT) // ≥ +#define ACC_AC RC(SEMI) // ´ #define ACC_AI RA(SLASH) // ´ #define ACC_CI LBKT // ^ #define ACC_GR RA(LBKT) // ` +#define ACC_TI RC(RBKT) // ~ #define ACC_TR LS(LBKT) // ¨ #define INV_QUEST RC(LS(MINUS)) // ¿ #define INV_EXCL RC(LS(N1)) // ¡ From 5d8f5783e0a3af70014f3a1ca02b5b5ece7068fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 21:37:39 -0400 Subject: [PATCH 05/14] fix: inverted marks macro are not invoked with correct name --- behaviors/mod-morph.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/behaviors/mod-morph.dtsi b/behaviors/mod-morph.dtsi index 017070e..155a08c 100644 --- a/behaviors/mod-morph.dtsi +++ b/behaviors/mod-morph.dtsi @@ -78,12 +78,12 @@ ZMK_MOD_MORPH(sap_dap, // tap: question mark | shift + tap: inverted question mark ZMK_MOD_MORPH(ques_iques, - bindings = <&kp QUEST>, <&QUEST_INV>; + bindings = <&kp QUEST>, <&INV_QUES>; mods = <(MOD_LSFT|MOD_RSFT)>; ) // tap: exclamation mark | shift + tap: inverted exclamation mark ZMK_MOD_MORPH(excl_iexcl, - bindings = <&kp EXCL>, <&EXCL_INV>; + bindings = <&kp EXCL>, <&INV_EXCL>; mods = <(MOD_LSFT|MOD_RSFT)>; ) From 2a7a629fe67863616f1d42314a00e7de0f882259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 21:44:33 -0400 Subject: [PATCH 06/14] fix: inverted question mark is still not invoked with correct name --- behaviors/mod-morph.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/behaviors/mod-morph.dtsi b/behaviors/mod-morph.dtsi index 155a08c..d4cf1f4 100644 --- a/behaviors/mod-morph.dtsi +++ b/behaviors/mod-morph.dtsi @@ -78,7 +78,7 @@ ZMK_MOD_MORPH(sap_dap, // tap: question mark | shift + tap: inverted question mark ZMK_MOD_MORPH(ques_iques, - bindings = <&kp QUEST>, <&INV_QUES>; + bindings = <&kp QUEST>, <&INV_QUEST>; mods = <(MOD_LSFT|MOD_RSFT)>; ) From f093d3eba6e920f41fc09190dbea691be0850052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 21:46:01 -0400 Subject: [PATCH 07/14] feat: add spanish accents to keymap drawing --- images/keymaps/urchin_keymap.svg | 4 ++++ keymap-drawer/config.yaml | 6 +++++- keymap-drawer/urchin_keymap.yaml | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/images/keymaps/urchin_keymap.svg b/images/keymaps/urchin_keymap.svg index 0fbf1d7..131c2fe 100644 --- a/images/keymaps/urchin_keymap.svg +++ b/images/keymaps/urchin_keymap.svg @@ -733,9 +733,11 @@ path.combo { +~ +´ @@ -1593,10 +1595,12 @@ path.combo { ? +¿ ! +¡ diff --git a/keymap-drawer/config.yaml b/keymap-drawer/config.yaml index 99f3f60..3792fde 100644 --- a/keymap-drawer/config.yaml +++ b/keymap-drawer/config.yaml @@ -400,8 +400,10 @@ parse_config: "&E_TR 0": "Ë", "&I_CI 0": "Î", "&I_TR 0": "Ï", + "&KPT ACC_AC 0": "´", "&KPT ACC_CI 0": "^", "&KPT ACC_GR 0": "`", + "&KPT ACC_TI 0": "~", "&KPT ACC_TR 0": "¨", "&OE_L 0": "Œ", "&O_CI 0": "Ô", @@ -450,13 +452,15 @@ parse_config: "&KPT ACC_CI 4": "^", "&KPT ACC_GR 4": "`", "&KPT ACC_TR 4": "¨", + "&INV_QUEST": "¿", + "&INV_EXCL": "¡", "&OE_L 4": "Œ", "&O_CI 4": "Ô", "&O_TR 4": "Ö", "&U_CI 4": "Û", "&U_GR 4": "Ù", "&U_TR 4": "Ü", - "&kp QUEST": "?", + "&QUEST": "?", "&kp RA(COMMA)": "<", "&kp RA(DOT)": ">", "&GRA": "`", diff --git a/keymap-drawer/urchin_keymap.yaml b/keymap-drawer/urchin_keymap.yaml index e4901bb..fd197b6 100644 --- a/keymap-drawer/urchin_keymap.yaml +++ b/keymap-drawer/urchin_keymap.yaml @@ -36,8 +36,8 @@ layers: - {t: '$$material:backspace$$', s: $$delete$$} - {t: '$$tabler:space$$', h: Symbols, s: $$nbsp$$} Colemak Accents: - - '' - - '' + - '~' + - ´ - Ë - '' - '' @@ -227,8 +227,8 @@ layers: - {t: ), h: SHIFT} - '=' - ^ - - '?' - - '!' + - {t: '?', s: ¿} + - {t: '!', s: ¡} - '&' - '|' - '*' From f58977fb1d58de99a615ac45def34b19e8b7175f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 21:56:17 -0400 Subject: [PATCH 08/14] fix: quest keymap is gone --- behaviors/mod-morph.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/behaviors/mod-morph.dtsi b/behaviors/mod-morph.dtsi index d4cf1f4..8aa77e2 100644 --- a/behaviors/mod-morph.dtsi +++ b/behaviors/mod-morph.dtsi @@ -78,7 +78,7 @@ ZMK_MOD_MORPH(sap_dap, // tap: question mark | shift + tap: inverted question mark ZMK_MOD_MORPH(ques_iques, - bindings = <&kp QUEST>, <&INV_QUEST>; + bindings = <&QUEST>, <&INV_QUEST>; mods = <(MOD_LSFT|MOD_RSFT)>; ) From e20c4e85088d8499efc899e46bc702ad015970aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 22:04:06 -0400 Subject: [PATCH 09/14] fix: kp all marks keycodes --- behaviors/mod-morph.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/behaviors/mod-morph.dtsi b/behaviors/mod-morph.dtsi index 8aa77e2..d1f723f 100644 --- a/behaviors/mod-morph.dtsi +++ b/behaviors/mod-morph.dtsi @@ -78,12 +78,12 @@ ZMK_MOD_MORPH(sap_dap, // tap: question mark | shift + tap: inverted question mark ZMK_MOD_MORPH(ques_iques, - bindings = <&QUEST>, <&INV_QUEST>; + bindings = <&kp QUEST>, <&kp INV_QUEST>; mods = <(MOD_LSFT|MOD_RSFT)>; ) // tap: exclamation mark | shift + tap: inverted exclamation mark ZMK_MOD_MORPH(excl_iexcl, - bindings = <&kp EXCL>, <&INV_EXCL>; + bindings = <&kp EXCL>, <&kp INV_EXCL>; mods = <(MOD_LSFT|MOD_RSFT)>; ) From 4649b65bb818b6ee752b3ad61bd020089120a0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 22:35:25 -0400 Subject: [PATCH 10/14] fix: try to fix inverted marks keypresses --- layouts/canadian-multilingual-standard.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi index 58433be..33fd485 100644 --- a/layouts/canadian-multilingual-standard.dtsi +++ b/layouts/canadian-multilingual-standard.dtsi @@ -26,8 +26,8 @@ #define ACC_GR RA(LBKT) // ` #define ACC_TI RC(RBKT) // ~ #define ACC_TR LS(LBKT) // ¨ -#define INV_QUEST RC(LS(MINUS)) // ¿ -#define INV_EXCL RC(LS(N1)) // ¡ +#define INV_QUEST RC(MINUS) // ¿ +#define INV_EXCL RS(RC(N1)) // ¡ /* Fractions */ #define MATH_1_4 RC(N4) // ¼ From c8e179bdd8581a13edbb4321c8bc405cbae58e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 23:11:35 -0400 Subject: [PATCH 11/14] fix: try fix keycodes for inverted marks --- layouts/canadian-multilingual-standard.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi index 33fd485..0b67fba 100644 --- a/layouts/canadian-multilingual-standard.dtsi +++ b/layouts/canadian-multilingual-standard.dtsi @@ -26,8 +26,8 @@ #define ACC_GR RA(LBKT) // ` #define ACC_TI RC(RBKT) // ~ #define ACC_TR LS(LBKT) // ¨ -#define INV_QUEST RC(MINUS) // ¿ -#define INV_EXCL RS(RC(N1)) // ¡ +#define INV_QUEST RC(UNDER) // ¿ +#define INV_EXCL RC(EXCL) // ¡ /* Fractions */ #define MATH_1_4 RC(N4) // ¼ From 564d4980de51526ab34c344be611d99a2124f4eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 28 Oct 2024 23:16:46 -0400 Subject: [PATCH 12/14] fix: updated inverted marks keymap drawings --- keymap-drawer/config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keymap-drawer/config.yaml b/keymap-drawer/config.yaml index 3792fde..59f2c8d 100644 --- a/keymap-drawer/config.yaml +++ b/keymap-drawer/config.yaml @@ -452,15 +452,15 @@ parse_config: "&KPT ACC_CI 4": "^", "&KPT ACC_GR 4": "`", "&KPT ACC_TR 4": "¨", - "&INV_QUEST": "¿", - "&INV_EXCL": "¡", + "&kp INV_QUEST": "¿", + "&kp INV_EXCL": "¡", "&OE_L 4": "Œ", "&O_CI 4": "Ô", "&O_TR 4": "Ö", "&U_CI 4": "Û", "&U_GR 4": "Ù", "&U_TR 4": "Ü", - "&QUEST": "?", + "&kp QUEST": "?", "&kp RA(COMMA)": "<", "&kp RA(DOT)": ">", "&GRA": "`", From b2b8c5cd7ffa55a2a928dff2fccbdc86a07dcac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Tue, 29 Oct 2024 21:45:58 -0400 Subject: [PATCH 13/14] style: format urchin keymap --- config/urchin.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/urchin.keymap b/config/urchin.keymap index d1ff4d0..7cbf8cf 100644 --- a/config/urchin.keymap +++ b/config/urchin.keymap @@ -95,7 +95,7 @@ ZMK_LAYER(Symbols, // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮ &kp HASH &kp AT &kp LBRAC &kp RBRAC &kp PLUS XXX &kp TILDS &GRA &kp DLLR &soft_off // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ - &slsh_bslsh &dash_tilde &kp LPAR &hml SL RPAR &kp EQUAL &CAR &ques_iques &excl_iexcl &kp AMPS &kp PIP + &slsh_bslsh &dash_tilde &kp LPAR &hml SL RPAR &kp EQUAL &CAR &ques_iques &excl_iexcl &kp AMPS &kp PIP // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ &kp STAR &kp PRCNT &kp LBKET &kp RBKET &kp UNDER XXX &kp LETHAN &kp GRTHAN &kp LAQUO &kp RAQUO // ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯ From 60026524581fb54dab8688e8203661252b32def6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Tue, 29 Oct 2024 21:52:11 -0400 Subject: [PATCH 14/14] fix: delete sp_nbsp_sym --- behaviors/mod-morph.dtsi | 6 ------ config/corne.keymap | 2 +- config/urchin.keymap | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/behaviors/mod-morph.dtsi b/behaviors/mod-morph.dtsi index d1f723f..9315b78 100644 --- a/behaviors/mod-morph.dtsi +++ b/behaviors/mod-morph.dtsi @@ -46,12 +46,6 @@ ZMK_MOD_MORPH(num_esc_clk, mods = <(MOD_LSFT|MOD_LCTL)>; ) -// hold: symbol layer | tap: space | shift + tap: non-breaking space -ZMK_MOD_MORPH(sp_nbsp_sym, - bindings = << SYM SPACE>, <&kp RALT(SPACE)>; - mods = <(MOD_LSFT)>; -) - // tap: period | shift + tap: colon ZMK_MOD_MORPH(dot_col, bindings = <&kp DOT>, <&kp COLON>; diff --git a/config/corne.keymap b/config/corne.keymap index 32069c1..825bb0a 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -26,7 +26,7 @@ ZMK_LAYER(Colemak, // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ &kp Z &kp X &kp C &kp D &kp V &kp K &kp H &kp COMMA &kp DOT &to CAC // ╰───────────┴───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┴────────────╯ - &to MOU < NAV RET &num_esc_clk &bspc_del &sp_nbsp_sym &mt RALT TAB + &to MOU < NAV RET &num_esc_clk &bspc_del < SYM SPACE &mt RALT TAB // ╰───────────┴────────────┴────────────╯ ╰───────────┴─────────────┴─────────────╯ ) diff --git a/config/urchin.keymap b/config/urchin.keymap index 7cbf8cf..e74831e 100644 --- a/config/urchin.keymap +++ b/config/urchin.keymap @@ -27,7 +27,7 @@ ZMK_LAYER(Colemak, // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤ &kp Z &kp X &kp C &kp D &kp V &kp K &kp H &kp COMMA &kp DOT &to CAC // ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯ - < NAV RET &num_esc_clk &bspc_del &sp_nbsp_sym + < NAV RET &num_esc_clk &bspc_del < SYM SPACE // ╰────────────┴────────────╯ ╰───────────┴─────────────╯ )