1 files changed, 4 insertions, 56 deletions

diff --git a/config/cradio.keymap b/config/cradio.keymap
index 1967301..01f635d 100644
--- a/config/cradio.keymap
+++ b/config/cradio.keymap
@@ -30,58 +30,6 @@
   quick_tap_ms = <75>;
 };
 
-#define ZMK_HELPER_STRINGIFY(x) #x
-
-/* ZMK_BEHAVIOR */
-
-#define ZMK_BEHAVIOR_CORE_caps_word       compatible = "zmk,behavior-caps-word";       #binding-cells = <0>
-#define ZMK_BEHAVIOR_CORE_dynamic_macro   compatible = "zmk,behavior-dynamic-macro";   #binding-cells = <1>
-#define ZMK_BEHAVIOR_CORE_hold_tap        compatible = "zmk,behavior-hold-tap";        #binding-cells = <2>
-#define ZMK_BEHAVIOR_CORE_key_repeat      compatible = "zmk,behavior-key-repeat";      #binding-cells = <0>
-#define ZMK_BEHAVIOR_CORE_macro           compatible = "zmk,behavior-macro";           #binding-cells = <0>
-#define ZMK_BEHAVIOR_CORE_macro_one_param compatible = "zmk,behavior-macro-one-param"; #binding-cells = <1>
-#define ZMK_BEHAVIOR_CORE_macro_two_param compatible = "zmk,behavior-macro-two-param"; #binding-cells = <2>
-#define ZMK_BEHAVIOR_CORE_mod_morph       compatible = "zmk,behavior-mod-morph";       #binding-cells = <0>
-#define ZMK_BEHAVIOR_CORE_sticky_key      compatible = "zmk,behavior-sticky-key";      #binding-cells = <1>
-#define ZMK_BEHAVIOR_CORE_tap_dance       compatible = "zmk,behavior-tap-dance";       #binding-cells = <0>
-#define ZMK_BEHAVIOR_CORE_tri_state       compatible = "zmk,behavior-tri-state";       #binding-cells = <0>
-
-#define ZMK_BEHAVIOR(name, type, ...) \
-    / { \
-        behaviors { \
-            name: name { \
-                label = ZMK_HELPER_STRINGIFY(ZB_ ## name); \
-                ZMK_BEHAVIOR_CORE_ ## type; \
-                __VA_ARGS__ \
-            }; \
-        }; \
-    };
-
-#define KEYS_L 0 1 2 3 4 10 11 12 13 14 20 21 22 23 24
-#define KEYS_R 5 6 7 8 9 15 16 17 18 19 25 26 27 28 29
-#define THUMBS 30 31 32 33
-
-/* left-hand HRMs */
-ZMK_BEHAVIOR(ml, hold_tap,
-        flavor = "hold-preferred";
-        tapping-term-ms = <280>;
-        quick-tap-ms = <175>;
-        bindings = <&kp>, <&kp>;
-        hold-trigger-key-positions = <KEYS_R THUMBS>;
-        hold-trigger-on-release;             // delay positional check until key-release
-        global-quick-tap;
-        )
-
-/* right-hand HRMs */
-ZMK_BEHAVIOR(mr, hold_tap,
-        flavor = "hold-preferred";
-        tapping-term-ms = <280>;
-        quick-tap-ms = <100>;
-        bindings = <&kp>, <&kp>;
-        hold-trigger-key-positions = <KEYS_L THUMBS>;
-        hold-trigger-on-release;             // delay positional check until key-release
-        global-quick-tap;
-        )
 
 / { 
 
@@ -170,10 +118,10 @@ ZMK_BEHAVIOR(mr, hold_tap,
         compatible = "zmk,keymap";
         default_layer {
             bindings = <
-                  &kp Q      &kp W       &kp F        &kp P        &kp G                          &kp J                     &kp L       &kp U           &kp Y        &kp SCLN
-                  &ml LGUI A &ml LALT R  &ml LSHIFT S &ml LCTRL T  &ml LG(LA(LS(LCTRL))) D        &mr LG(LA(LS(LCTRL))) H   &mr LCTRL N &mr RSHIFT E    &mr LALT I   &mr LGUI O
-                  &kp Z      &kp X       &kp C        &kp V        &kp B                          &kp K                     &kp M       &kp CMMA        &kp DOT      &kp FSLH
-                                                      &lt FUN TAB  &lt NAV SPC                    &lt SYM RET               &lt NUM LSHIFT
+                  &kp Q      &kp W       &kp F        &kp P         &kp G                  &kp J              &kp L           &kp U        &kp Y        &kp SCLN
+                  &kp A      &kp R       &lt FUN S    &lt NAV T     &kp D                  &kp H              &lt SYM N       &lt NUM E    &kp I        &kp O
+                  &kp Z      &kp X       &kp C        &kp V         &kp B                  &kp K              &kp M           &kp CMMA     &kp DOT      &kp FSLH
+                                                      &mt LALT TAB  &mt LGUI SPC           &mt LSHIFT RET     &mt LCTRL BSPC
                 >;
         };