From eea497cb8a0b73d2dda84c9965701f6ead39c6ef Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Sat, 7 Dec 2024 00:08:07 +0100
Subject: [PATCH] Swap capsword w/ sticky lshift

---
 config/abyss.keymap | 24 ++++++++++++------------
 draw/keymap.svg     | 22 +++++++++-------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/config/abyss.keymap b/config/abyss.keymap
index 9185a91..7631dba 100644
--- a/config/abyss.keymap
+++ b/config/abyss.keymap
@@ -56,7 +56,7 @@
         left_shift: left_shift_morph {
             compatible = "zmk,behavior-mod-morph";
             #binding-cells = <0>;
-            bindings = <&kp LSHFT>, <&kp LEFT>;
+            bindings = <&caps_word>, <&kp LEFT>;
             mods = <(MOD_LSFT|MOD_RSFT)>;
             keep-mods = <(MOD_LSFT)>;
         };
@@ -103,11 +103,11 @@
             hold-trigger-on-release;
         };
 
-        lt_caps: layer_tap_cap {
+        ltsk: layer_tap_cap {
             compatible = "zmk,behavior-hold-tap";
             flavor = "balanced";
             #binding-cells = <2>;
-            bindings = <&mo>, <&caps_word>;
+            bindings = <&mo>, <&sk>;
             tapping-term-ms = <TAPPING_TERM>;
             quick-tap-ms = <QUICK_TAP>;
             hold-trigger-key-positions = <KEYR>;
@@ -127,15 +127,15 @@
 
         default_layer {
             bindings = <
-//              ╭─────────────┬─────────────┬─────────────┬─────────────╮  ╭───────────────┬──────────────┬─────────────┬─────────────╮
-                  &kp COMMA     &kp DOT       &kp P         &kp Y            &kp F           &kp G          &kp C         &kp R
-//╭─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤  ├───────────────┼──────────────┼─────────────┼─────────────┼─────────────╮
-    &hml LALT A   &hml LGUI O   &hml LSFT E   &hml LCTL U   &kp I            &kp D           &hmr RCTL H    &hmr RSFT T   &hmr RGUI N   &hmr RALT S
-//├─────────────┼─────────────┼─────────────┼─────────────┼─────────────╯  ╰───────────────┼──────────────┼─────────────┼─────────────┼─────────────┤
-    &kp SQT       &kp Q         &kp J         &kp K                                          &kp M          &kp W         &kp V         &kp L
-//╰───────────────────────────┼─────────────┼─────────────┼─────────────╮  ╭───────────────┼──────────────┼─────────────┼───────────────────────────╯
-                                &left_shift   &lt_spc SY 0  &lt OT TAB       &lt_caps OT 0  &lt_bspc SY 0  &up_del
-//                            ╰─────────────┴─────────────┴─────────────╯  ╰───────────────┴──────────────┴─────────────╯
+//              ╭─────────────┬─────────────┬─────────────┬─────────────╮  ╭─────────────────┬───────────────┬─────────────┬─────────────╮
+                  &kp COMMA     &kp DOT       &kp P         &kp Y            &kp F             &kp G           &kp C         &kp R
+//╭─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤  ├─────────────────┼───────────────┼─────────────┼─────────────┼─────────────╮
+    &hml LALT A   &hml LGUI O   &hml LSFT E   &hml LCTL U   &kp I            &kp D             &hmr RCTL H     &hmr RSFT T   &hmr RGUI N   &hmr RALT S
+//├─────────────┼─────────────┼─────────────┼─────────────┼─────────────╯  ╰─────────────────┼───────────────┼─────────────┼─────────────┼─────────────┤
+    &kp SQT       &kp Q         &kp J         &kp K                                            &kp M           &kp W         &kp V         &kp L
+//╰───────────────────────────┼─────────────┼─────────────┼─────────────╮  ╭─────────────────┼───────────────┼─────────────┼───────────────────────────╯
+                                &left_shift   &lt_spc SY 0  &lt OT TAB       &ltsk OT LSHIFT   &lt_bspc SY 0   &up_del
+//                            ╰─────────────┴─────────────┴─────────────╯  ╰─────────────────┴───────────────┴─────────────╯
             >;
         };
 
diff --git a/draw/keymap.svg b/draw/keymap.svg
index ea3797f..86a9b4f 100644
--- a/draw/keymap.svg
+++ b/draw/keymap.svg
@@ -233,7 +233,7 @@ path.combo {
 </g>
 <g transform="translate(180, 196)" class="key keypos-26">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">LSHFT</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 70%">&amp;caps_word</tspan></text>
 <text x="0" y="-24" class="key shifted">LEFT</text>
 </g>
 <g transform="translate(240, 196)" class="key keypos-27">
@@ -251,7 +251,7 @@ path.combo {
 </a></g>
 <g transform="translate(390, 196)" class="key keypos-29">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap"><tspan style="font-size: 70%">&amp;caps_word</tspan></text>
+<text x="0" y="0" class="key tap">LSHIFT</text>
 <a href="#others">
 <text x="0" y="24" class="key hold layer-activator">others</text>
 </a></g>
@@ -288,38 +288,34 @@ path.combo {
 <text x="660" y="140" class="combo tap">Z</text>
 </g>
 <g class="combo combopos-5">
-<rect rx="6" ry="6" x="16" y="127" width="28" height="26" class="combo"/>
-<text x="30" y="140" class="combo tap">:</text>
-</g>
-<g class="combo combopos-6">
 <rect rx="6" ry="6" x="136" y="43" width="28" height="26" class="combo"/>
 <text x="150" y="56" class="combo tap">[</text>
 </g>
-<g class="combo combopos-7">
+<g class="combo combopos-6">
 <rect rx="6" ry="6" x="526" y="43" width="28" height="26" class="combo"/>
 <text x="540" y="56" class="combo tap">]</text>
 </g>
-<g class="combo combopos-8">
+<g class="combo combopos-7">
 <rect rx="6" ry="6" x="196" y="43" width="28" height="26" class="combo"/>
 <text x="210" y="56" class="combo tap">(</text>
 </g>
-<g class="combo combopos-9">
+<g class="combo combopos-8">
 <rect rx="6" ry="6" x="466" y="43" width="28" height="26" class="combo"/>
 <text x="480" y="56" class="combo tap">)</text>
 </g>
-<g class="combo combopos-10">
+<g class="combo combopos-9">
 <rect rx="6" ry="6" x="256" y="71" width="28" height="26" class="combo"/>
 <text x="270" y="84" class="combo tap">{</text>
 </g>
-<g class="combo combopos-11">
+<g class="combo combopos-10">
 <rect rx="6" ry="6" x="406" y="71" width="28" height="26" class="combo"/>
 <text x="420" y="84" class="combo tap">}</text>
 </g>
-<g class="combo combopos-12">
+<g class="combo combopos-11">
 <rect rx="6" ry="6" x="166" y="127" width="28" height="26" class="combo"/>
 <text x="180" y="140" class="combo tap">-</text>
 </g>
-<g class="combo combopos-13">
+<g class="combo combopos-12">
 <rect rx="6" ry="6" x="496" y="127" width="28" height="26" class="combo"/>
 <text x="510" y="140" class="combo tap">_</text>
 </g>