feat(keymap): add ing/and 'macombos'

Author: BerkeleyTrue

config/includes/combos.dtsi

@@ -27,12 +27,24 @@
 
 /*
   ╭─────────────────────────┬─────────────────────────╮
-  │ LT4 LT3 LT2 LT1 LT0     │     RT0 RT1 RT2 RT3 RT4 │
-  │ LM4 LM3 LM2  <--L̵M̵0̵-<CAPSWRD>-R̵M̵0̵-->  RT2 RM3 RM4 │
+  │ LT4 LT3 LT2 LT1  <----<ing>---->  RT1 RT2 RT3 RT4 │
+  │ LM4 LM3 LM2 LM1  <----<the>---->  RM1 RM2 RM3 RM4 │
   │ LB4 LB3 LB2 LB1 LB0     │     RB0 RB1 RB2 RB3 RB4 │
   ╰───────────╮ LH2 LH1 LH0 │ RH0 RH1 RH2 ╭───────────╯
               ╰─────────────┴─────────────╯
 */
+ZMK_COMBO(ing, &ing, LT0 RT0, DEF)
+ZMK_COMBO(the, &the, LM0 RM0, DEF)
+
+/*
+  ╭─────────────────────────┬─────────────────────────╮
+  │ LT4 LT3 LT2  <--L̶T̶0̶---<and>---R̶T̶0̶-->  RT2 RT3 RT4 │
+  │ LM4 LM3 LM2  <--L̶M̶1̶-<CAPSWRD>-R̵M̵0̵-->  RT2 RM3 RM4 │
+  │ LB4 LB3 LB2 LB1 LB0     │     RB0 RB1 RB2 RB3 RB4 │
+  ╰───────────╮ LH2 LH1 LH0 │ RH0 RH1 RH2 ╭───────────╯
+              ╰─────────────┴─────────────╯
+*/
+ZMK_COMBO(and,       &and,       LT1 RT1, DEF)
 ZMK_COMBO(caps_word, &caps_word, LM1 RM1, DEF)
 
 /*
@@ -111,17 +123,6 @@ ZMK_COMBO(ent, &kp RET, RB2 RB3, DEF)
 ZMK_COMBO(tilde, &kp TILDE, LB4 LB3, DEF)
 ZMK_COMBO(grave, &kp GRAVE, RB3 RB4, DEF)
 
-
-/*
-  ╭─────────────────────────┬─────────────────────────╮
-  │ LT4 LT3 LT2 LT1 LT0     │     RT0 RT1 RT2 RT3 RT4 │
-  │ LM4 LM3 LM2 LM1 LM0     │     RM0 RM1 RM2 RM3 RM4 │
-  │ LB4 LB3 LB2 LB1 ------<the>------ RB1 RB2 RB3 RB4 │
-  ╰───────────╮ LH2 LH1 LH0 │ RH0 RH1 RH2 ╭───────────╯
-              ╰─────────────┴─────────────╯
-*/
-ZMK_COMBO(the, &the, LB0 RB0, DEF)
-
 /*
   ╭──────────────┬───┬──────┬─────────────────────────╮
   │ LT4 LT3 LT2  #   ^      │      $   *  RT2 RT3 RT4 │

config/includes/macros.dtsi

@@ -18,5 +18,23 @@
       tap-ms = <5>;
       bindings = <&macro_tap &kp T>, <&macro_release &kp LSHFT>, <&macro_tap &kp H &kp E &kp SPACE>;
     )
+
+    // 'and' macro
+    // holding the left shift, this will type 'And'
+    // otherwise, it will type 'and'
+    ZMK_MACRO(and,
+      wait-ms = <5>;
+      tap-ms = <5>;
+      bindings = <&macro_tap &kp A>, <&macro_release &kp LSHFT>, <&macro_tap &kp N &kp D &kp SPACE>;
+    )
+
+    // 'ing' macro
+    // holding the left shift, this will type 'Ing'
+    // otherwise, it will type 'ing'
+    ZMK_MACRO(ing,
+      wait-ms = <5>;
+      tap-ms = <5>;
+      bindings = <&macro_tap &kp I>, <&macro_release &kp LSHFT>, <&macro_tap &kp N &kp G &kp SPACE>;
+    )
   };
 };