From d2dd2960e6ad9f3e80f5e9b8aca30ce358c6d72e Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Sat, 9 Apr 2022 13:52:20 -0400 Subject: [PATCH 1/6] --- config/flea.keymap | 6 +++++- config/macros.dtsi | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 config/macros.dtsi diff --git a/config/flea.keymap b/config/flea.keymap index def04f7..06ba45a 100644 --- a/config/flea.keymap +++ b/config/flea.keymap @@ -4,6 +4,7 @@ */ #include +#include "macros.dtsi" #include #include @@ -89,6 +90,9 @@ COMBO(left_brace, &kp LBRC, 2 11, DEF_L UPP_L SYM_L NUM_L) COMBO(right_brace, &kp RBRC, 5 14, DEF_L UPP_L SYM_L NUM_L) + /* Symbols */ + COMBO(esc, &kp ESC, 1 2, DEF_L) + /* Convenience */ COMBO(esc, &kp ESC, 1 2, DEF_L) COMBO(ent, &kp ENTER, 13 14, DEF_L) @@ -125,7 +129,7 @@ label = "Nav"; bindings = < // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ - &kp F2 &kp F3 &kp F4 &kp F5 &kp PG_UP &kp HOME &kp UARW &kp END + &kp F2 &kp F3 &kp F4 &kp F5 &kp PG_UP &kp HOME &kp END &none &sk LGUI &sk LALT &sk LCTRL &sk LSHFT &kp LC(Z) &kp PG_DN &kp LARW &kp DARW &kp UARW &kp RARW &kp F1 &kp LC(X) &kp LC(C) &kp LC(V) &kp TAB &kp DARW &key_repeat &caps_word // ╰─────────────┴─────────────┴─────────────╮ ╭─────────────┴─────────────┴─────────────╯ diff --git a/config/macros.dtsi b/config/macros.dtsi new file mode 100644 index 0000000..89bb55f --- /dev/null +++ b/config/macros.dtsi @@ -0,0 +1,5 @@ + ZMK_MACRO(lte, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LT &kp EQUAL>; + ) From f2d8aec09f28291b198aae8cf05805b215ff0f32 Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Sat, 9 Apr 2022 13:56:18 -0400 Subject: [PATCH 2/6] --- config/flea.keymap | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/flea.keymap b/config/flea.keymap index 06ba45a..b6a66c6 100644 --- a/config/flea.keymap +++ b/config/flea.keymap @@ -4,7 +4,6 @@ */ #include -#include "macros.dtsi" #include #include @@ -26,6 +25,9 @@ }; / { + +#include "macros.dtsi" + ZMK_MACRO(mo_nav, wait-ms = <0>; tap-ms = <0>; From f96ee700f7016ee221d8398a941523c25e5793e3 Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Sat, 9 Apr 2022 14:05:36 -0400 Subject: [PATCH 3/6] --- config/flea.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/flea.keymap b/config/flea.keymap index b6a66c6..579e1a6 100644 --- a/config/flea.keymap +++ b/config/flea.keymap @@ -93,7 +93,7 @@ COMBO(right_brace, &kp RBRC, 5 14, DEF_L UPP_L SYM_L NUM_L) /* Symbols */ - COMBO(esc, &kp ESC, 1 2, DEF_L) + COMBO(lte, lte, 1 2, SYM_L) /* Convenience */ COMBO(esc, &kp ESC, 1 2, DEF_L) From ebe9ca5c9f5dff3507b7373ef769094dd2330dcd Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Sat, 9 Apr 2022 14:10:05 -0400 Subject: [PATCH 4/6] --- config/flea.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/flea.keymap b/config/flea.keymap index 579e1a6..4a445b2 100644 --- a/config/flea.keymap +++ b/config/flea.keymap @@ -93,7 +93,7 @@ COMBO(right_brace, &kp RBRC, 5 14, DEF_L UPP_L SYM_L NUM_L) /* Symbols */ - COMBO(lte, lte, 1 2, SYM_L) + COMBO(lte, <e, 0 9, SYM_L) /* Convenience */ COMBO(esc, &kp ESC, 1 2, DEF_L) From 3642c0555b0896c4467b630331c1727cb171df38 Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Sat, 9 Apr 2022 14:20:20 -0400 Subject: [PATCH 5/6] --- config/flea.keymap | 4 +++- config/macros.dtsi | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/config/flea.keymap b/config/flea.keymap index 4a445b2..62c7e5b 100644 --- a/config/flea.keymap +++ b/config/flea.keymap @@ -93,7 +93,9 @@ COMBO(right_brace, &kp RBRC, 5 14, DEF_L UPP_L SYM_L NUM_L) /* Symbols */ - COMBO(lte, <e, 0 9, SYM_L) + COMBO(leq, &leq, 9 19, SYM_L) + COMBO(eq, &eq, 10 20, SYM_L) + COMBO(geq, &geq, 11 21, SYM_L) /* Convenience */ COMBO(esc, &kp ESC, 1 2, DEF_L) diff --git a/config/macros.dtsi b/config/macros.dtsi index 89bb55f..7b90aad 100644 --- a/config/macros.dtsi +++ b/config/macros.dtsi @@ -1,5 +1,17 @@ - ZMK_MACRO(lte, + ZMK_MACRO(leq, wait-ms = <30>; tap-ms = <40>; bindings = <&kp LT &kp EQUAL>; ) + + ZMK_MACRO(eq, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp EQUAL &kp EQUAL>; + ) + + ZMK_MACRO(geq, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp GT &kp EQUAL>; + ) From 254776be5327094d40c8475f3c5d542650dafe60 Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Sat, 9 Apr 2022 14:33:59 -0400 Subject: [PATCH 6/6] cleanup --- config/flea.keymap | 47 +-------------------------------------------- config/general.dtsi | 20 +++++++++++++++++++ config/macros.dtsi | 27 ++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 46 deletions(-) create mode 100644 config/general.dtsi diff --git a/config/flea.keymap b/config/flea.keymap index 62c7e5b..53f1d9a 100644 --- a/config/flea.keymap +++ b/config/flea.keymap @@ -3,58 +3,13 @@ * SPDX-License-Identifier: MIT */ -#include -#include -#include +#include "general.dtsi" -/* Layers */ -#define DEF_L 0 -#define NAV_L 1 -#define UPP_L 2 -#define SYM_L 3 -#define NUM_L 4 - -/* Behavior Settings */ -&caps_word { - continue-list = ; -}; - -&sk { - release-after-ms = <60000>; -}; - / { #include "macros.dtsi" - ZMK_MACRO(mo_nav, - wait-ms = <0>; - tap-ms = <0>; - bindings - = <¯o_tap &kp K_CANCEL> - , <¯o_press &mo NAV_L> - , <¯o_pause_for_release> - , <¯o_release &mo NAV_L>;) - - ZMK_MACRO(mo_upp, - wait-ms = <0>; - tap-ms = <0>; - bindings - = <¯o_tap &kp K_CANCEL> - , <¯o_press &mo UPP_L> - , <¯o_pause_for_release> - , <¯o_release &mo UPP_L>;) - - ZMK_MACRO(mo_sym, - wait-ms = <0>; - tap-ms = <0>; - bindings - = <¯o_tap &kp K_CANCEL> - , <¯o_press &mo SYM_L> - , <¯o_pause_for_release> - , <¯o_release &mo SYM_L>;) - combos { compatible = "zmk,combos"; diff --git a/config/general.dtsi b/config/general.dtsi new file mode 100644 index 0000000..9a8ef28 --- /dev/null +++ b/config/general.dtsi @@ -0,0 +1,20 @@ +#include +#include +#include + + +/* Layers */ +#define DEF_L 0 +#define NAV_L 1 +#define UPP_L 2 +#define SYM_L 3 +#define NUM_L 4 + +/* Behavior Settings */ +&caps_word { + continue-list = ; +}; + +&sk { + release-after-ms = <60000>; +}; diff --git a/config/macros.dtsi b/config/macros.dtsi index 7b90aad..318e439 100644 --- a/config/macros.dtsi +++ b/config/macros.dtsi @@ -1,3 +1,30 @@ + ZMK_MACRO(mo_nav, + wait-ms = <0>; + tap-ms = <0>; + bindings + = <¯o_tap &kp K_CANCEL> + , <¯o_press &mo NAV_L> + , <¯o_pause_for_release> + , <¯o_release &mo NAV_L>;) + + ZMK_MACRO(mo_upp, + wait-ms = <0>; + tap-ms = <0>; + bindings + = <¯o_tap &kp K_CANCEL> + , <¯o_press &mo UPP_L> + , <¯o_pause_for_release> + , <¯o_release &mo UPP_L>;) + + ZMK_MACRO(mo_sym, + wait-ms = <0>; + tap-ms = <0>; + bindings + = <¯o_tap &kp K_CANCEL> + , <¯o_press &mo SYM_L> + , <¯o_pause_for_release> + , <¯o_release &mo SYM_L>;) + ZMK_MACRO(leq, wait-ms = <30>; tap-ms = <40>;