From 3fd3c9b2f5610c65ca2845d941053721eb18db42 Mon Sep 17 00:00:00 2001
From: Daniel Loos <loosdaniel@gmail.com>
Date: Sun, 11 May 2025 18:03:00 +0200
Subject: [PATCH] update control layer

---
 README.md   | 16 ++++++++--
 keymap.svg  | 90 ++++++++++++++++++++++++++---------------------------
 keymap.yaml | 11 +++----
 3 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index e6a24de..05d568a 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,19 @@ Features:
 - brackets and punctuation on default layer
 - Symbol layer with numpad
 - function layer with vim navigation
-- home row mod?
-- thumb cluster with control keys and tab dances
+- hold character to use `Ctrl` layer
+- character combos to switch tabs, windows, and wrokspaces
+- thumb cluster for modifiers and layer switching
 
 ![](keymap.svg)
+
+## Layers
+
+| L1  | L2            | L3           |
+| --- | ------------- | ------------ |
+|     | control layer | symbol layer |
+
+- switch layers using left thumb cluster
+- hold key to activate layer temporarily (e.g. just one symbol)
+- double tap key to activate layer persistently (e.g. navigation for a while), removing muscle strain.
+- Alternatively, holding a character key will yield its `ctrl` variant, e.g. hold `c` to copy, removing the need to hold the ctrl modifier
diff --git a/keymap.svg b/keymap.svg
index db016b1..a2fedfd 100644
--- a/keymap.svg
+++ b/keymap.svg
@@ -332,32 +332,32 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g class="combo combopos-0">
 <rect rx="6" ry="6" x="602" y="18" width="28" height="26" class="combo"/>
-<text x="616" y="32" class="combo tap">paste</text>
+<text x="616" y="32" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">wins</tspan>
+</text>
 </g>
 <g class="combo combopos-1">
 <rect rx="6" ry="6" x="602" y="74" width="28" height="26" class="combo"/>
-<text x="616" y="88" class="combo tap">copy</text>
+<text x="616" y="88" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">tab</tspan>
+</text>
 </g>
 <g class="combo combopos-2">
 <rect rx="6" ry="6" x="602" y="130" width="28" height="26" class="combo"/>
-<text x="616" y="144" class="combo tap">cut</text>
+<text x="616" y="144" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">wspace</tspan>
+</text>
 </g>
 <g class="combo combopos-3">
-<rect rx="6" ry="6" x="658" y="18" width="28" height="26" class="combo"/>
-<text x="672" y="32" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">wins</tspan>
+<rect rx="6" ry="6" x="154" y="18" width="28" height="26" class="combo"/>
+<text x="168" y="32" class="combo tap">
+<tspan x="168" dy="-0.6em">mouse</tspan><tspan x="168" dy="1.2em">prev</tspan>
 </text>
 </g>
 <g class="combo combopos-4">
-<rect rx="6" ry="6" x="658" y="74" width="28" height="26" class="combo"/>
-<text x="672" y="88" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">tab</tspan>
-</text>
-</g>
-<g class="combo combopos-5">
-<rect rx="6" ry="6" x="658" y="130" width="28" height="26" class="combo"/>
-<text x="672" y="144" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">wspace</tspan>
+<rect rx="6" ry="6" x="154" y="130" width="28" height="26" class="combo"/>
+<text x="168" y="144" class="combo tap">
+<tspan x="168" dy="-0.6em">mouse</tspan><tspan x="168" dy="1.2em">next</tspan>
 </text>
 </g>
 </g>
@@ -541,32 +541,32 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g class="combo combopos-0">
 <rect rx="6" ry="6" x="602" y="18" width="28" height="26" class="combo"/>
-<text x="616" y="32" class="combo tap">paste</text>
+<text x="616" y="32" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">wins</tspan>
+</text>
 </g>
 <g class="combo combopos-1">
 <rect rx="6" ry="6" x="602" y="74" width="28" height="26" class="combo"/>
-<text x="616" y="88" class="combo tap">copy</text>
+<text x="616" y="88" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">tab</tspan>
+</text>
 </g>
 <g class="combo combopos-2">
 <rect rx="6" ry="6" x="602" y="130" width="28" height="26" class="combo"/>
-<text x="616" y="144" class="combo tap">cut</text>
+<text x="616" y="144" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">wspace</tspan>
+</text>
 </g>
 <g class="combo combopos-3">
-<rect rx="6" ry="6" x="658" y="18" width="28" height="26" class="combo"/>
-<text x="672" y="32" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">wins</tspan>
+<rect rx="6" ry="6" x="154" y="18" width="28" height="26" class="combo"/>
+<text x="168" y="32" class="combo tap">
+<tspan x="168" dy="-0.6em">mouse</tspan><tspan x="168" dy="1.2em">prev</tspan>
 </text>
 </g>
 <g class="combo combopos-4">
-<rect rx="6" ry="6" x="658" y="74" width="28" height="26" class="combo"/>
-<text x="672" y="88" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">tab</tspan>
-</text>
-</g>
-<g class="combo combopos-5">
-<rect rx="6" ry="6" x="658" y="130" width="28" height="26" class="combo"/>
-<text x="672" y="144" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">wspace</tspan>
+<rect rx="6" ry="6" x="154" y="130" width="28" height="26" class="combo"/>
+<text x="168" y="144" class="combo tap">
+<tspan x="168" dy="-0.6em">mouse</tspan><tspan x="168" dy="1.2em">next</tspan>
 </text>
 </g>
 </g>
@@ -756,32 +756,32 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g class="combo combopos-0">
 <rect rx="6" ry="6" x="602" y="18" width="28" height="26" class="combo"/>
-<text x="616" y="32" class="combo tap">paste</text>
+<text x="616" y="32" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">wins</tspan>
+</text>
 </g>
 <g class="combo combopos-1">
 <rect rx="6" ry="6" x="602" y="74" width="28" height="26" class="combo"/>
-<text x="616" y="88" class="combo tap">copy</text>
+<text x="616" y="88" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">tab</tspan>
+</text>
 </g>
 <g class="combo combopos-2">
 <rect rx="6" ry="6" x="602" y="130" width="28" height="26" class="combo"/>
-<text x="616" y="144" class="combo tap">cut</text>
+<text x="616" y="144" class="combo tap">
+<tspan x="616" dy="-0.6em">tog</tspan><tspan x="616" dy="1.2em">wspace</tspan>
+</text>
 </g>
 <g class="combo combopos-3">
-<rect rx="6" ry="6" x="658" y="18" width="28" height="26" class="combo"/>
-<text x="672" y="32" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">wins</tspan>
+<rect rx="6" ry="6" x="154" y="18" width="28" height="26" class="combo"/>
+<text x="168" y="32" class="combo tap">
+<tspan x="168" dy="-0.6em">mouse</tspan><tspan x="168" dy="1.2em">prev</tspan>
 </text>
 </g>
 <g class="combo combopos-4">
-<rect rx="6" ry="6" x="658" y="74" width="28" height="26" class="combo"/>
-<text x="672" y="88" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">tab</tspan>
-</text>
-</g>
-<g class="combo combopos-5">
-<rect rx="6" ry="6" x="658" y="130" width="28" height="26" class="combo"/>
-<text x="672" y="144" class="combo tap">
-<tspan x="672" dy="-0.6em">tog</tspan><tspan x="672" dy="1.2em">wspace</tspan>
+<rect rx="6" ry="6" x="154" y="130" width="28" height="26" class="combo"/>
+<text x="168" y="144" class="combo tap">
+<tspan x="168" dy="-0.6em">mouse</tspan><tspan x="168" dy="1.2em">next</tspan>
 </text>
 </g>
 </g>
diff --git a/keymap.yaml b/keymap.yaml
index 49242a6..81bcabf 100644
--- a/keymap.yaml
+++ b/keymap.yaml
@@ -72,9 +72,8 @@ layers:
         "Super",
       ]
 combos:
-  - { tk: ["U", "I"], k: "paste" }
-  - { tk: ["J", "K"], k: "copy" }
-  - { tk: ["M", ", ;"], k: "cut" }
-  - { tk: ["I", "O"], k: "tog wins" }
-  - { tk: ["K", "L"], k: "tog tab" }
-  - { tk: [", ;", ". :"], k: "tog wspace" }
+  - { tk: ["U", "I"], k: "tog wins" }
+  - { tk: ["J", "K"], k: "tog tab" }
+  - { tk: ["M", ", ;"], k: "tog wspace" }
+  - { tk: ["W", "E"], k: "mouse prev" }
+  - { tk: ["X", "C"], k: "mouse next" }