From 7cb5924e931657bdd46dbe03dcc8e4a268434212 Mon Sep 17 00:00:00 2001
From: Jamie Ding <jding@roblox.com>
Date: Mon, 14 Mar 2022 01:12:07 +0000
Subject: [PATCH] right hand k/l shift

---
 app/boards/shields/mercury/mercury.keymap | 61 ++++++++++++-----------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/app/boards/shields/mercury/mercury.keymap b/app/boards/shields/mercury/mercury.keymap
index 08798eb4..f815b22d 100644
--- a/app/boards/shields/mercury/mercury.keymap
+++ b/app/boards/shields/mercury/mercury.keymap
@@ -10,7 +10,8 @@
 #define NAV 4
 #define MED 5
 #define SYS 6
-#define TRG 7
+#define TGL 7
+#define TGR 8
 
 #define COMBO_TIMEOUT 35
 
@@ -20,28 +21,9 @@
 
 / {
     behaviors {
-        hlt: hold_preferred_layer_tap {
+        lpl: layer_tap_positional_left {
             compatible = "zmk,behavior-hold-tap";
-            label = "HOLD_PREFERRED_LAYER_TAP";
-            #binding-cells = <2>;
-            flavor = "hold-preferred";
-            tapping-term-ms = <300>;
-            bindings = <&mo>, <&kp>;
-        };
-
-        mtp: mod_tap_positional {
-            compatible = "zmk,behavior-hold-tap";
-            label = "MOD_TAP_POSITIONAL";
-            #binding-cells = <2>;
-            flavor = "tap-unless-interrupted";
-            tapping-term-ms = <COMBO_TIMEOUT>;
-            bindings = <&kp>, <&kp>;
-            hold-trigger-key-positions = <2 3 4 14 15 16>;
-        };
-
-        ltp: layer_tap_positional {
-            compatible = "zmk,behavior-hold-tap";
-            label = "LAYER_TAP_POSITIONAL";
+            label = "LAYER_TAP_POSITIONAL_LEFT";
             #binding-cells = <2>;
             flavor = "tap-unless-interrupted";
             tapping-term-ms = <COMBO_TIMEOUT>;
@@ -49,6 +31,16 @@
             hold-trigger-key-positions = <2 3 4 14 15 16>;
         };
 
+        lpr: layer_tap_positional_right {
+            compatible = "zmk,behavior-hold-tap";
+            label = "LAYER_TAP_POSITIONAL_RIGHT";
+            #binding-cells = <2>;
+            flavor = "tap-unless-interrupted";
+            tapping-term-ms = <COMBO_TIMEOUT>;
+            bindings = <&mo>, <&kp>;
+            hold-trigger-key-positions = <19 20>;
+        };
+
         cht: combo_like_hold_tap {
             compatible = "zmk,behavior-hold-tap";
             label = "COMBO_LIKE_HOLD_TAP";
@@ -93,9 +85,9 @@
 
         windows_layer {
             bindings = <
-&none  &kp Q  &ltp TRG W  &ltp TRG E  &ltp FUN R  &kp T     /**/  &kp Y    &kp U    &kp I     &kp O    &kp P     &kp BKSP
-&none  &kp A  &ltp TRG S  &ltp TRG D  &ltp NUM F  &kp G     /**/  &kp H    &kp J    &kp K     &kp L    &kp SCLN  &cht RET QUOT
-&none  &kp Z  &kp X       &kp C       &kp V       &kp B     /**/  &kp N    &kp M    &kp CMMA  &kp DOT  &kp FSLH  &kp RSFT
+&none  &kp Q  &lpl TGL W  &lpl TGL E  &lpl FUN R  &kp T     /**/  &kp Y    &kp U    &kp I       &kp O       &kp P     &kp BKSP
+&none  &kp A  &lpl TGL S  &lpl TGL D  &lpl NUM F  &kp G     /**/  &kp H    &kp J    &lpr TGR K  &lpr TGR L  &kp SCLN  &cht RET QUOT
+&none  &kp Z  &kp X       &kp C       &kp V       &kp B     /**/  &kp N    &kp M    &kp CMMA    &kp DOT     &kp FSLH  &kp RSFT
                           &kp LGUI    &kp LALT    &kp LCTL  /**/  &kp SPC  &mo NAV  &mo MED
             >;
         };
@@ -154,12 +146,21 @@
             >;
         };
 
-        trigger_layer {
+        trigger_left_layer {
             bindings = <
-                &trans  &trans  &kp LSFT  &kp LSFT  &mo FUN  &trans     /**/  &trans  &trans  &trans  &trans  &trans  &trans
-                &trans  &trans  &kp LSFT  &kp LSFT  &mo NUM  &trans     /**/  &trans  &trans  &trans  &trans  &trans  &trans
-                &trans  &trans  &trans    &trans    &trans   &trans     /**/  &trans  &trans  &trans  &trans  &trans  &trans
-                                          &trans    &trans   &trans     /**/  &trans  &trans  &trans
+&trans  &trans  &kp LSFT  &kp LSFT  &mo FUN  &trans  /**/  &trans  &trans  &trans  &trans  &trans  &trans
+&trans  &trans  &kp LSFT  &kp LSFT  &mo NUM  &trans  /**/  &trans  &trans  &trans  &trans  &trans  &trans
+&trans  &trans  &trans    &trans    &trans   &trans  /**/  &trans  &trans  &trans  &trans  &trans  &trans
+                          &trans    &trans   &trans  /**/  &trans  &trans  &trans
+            >;
+        };
+
+        trigger_right_layer {
+            bindings = <
+&trans  &trans  &trans  &trans  &trans  &trans  /**/  &trans  &trans  &trans    &trans    &trans  &trans
+&trans  &trans  &trans  &trans  &trans  &trans  /**/  &trans  &trans  &kp RSFT  &kp RSFT  &trans  &trans
+&trans  &trans  &trans  &trans  &trans  &trans  /**/  &trans  &trans  &trans    &trans    &trans  &trans
+                        &trans  &trans  &trans  /**/  &trans  &trans  &trans
             >;
         };
     };