From cada59a1f9d9863792f8eb38c611db0dfbba89e4 Mon Sep 17 00:00:00 2001
From: Paul Mourer <paul.mourer@onxmaps.com>
Date: Wed, 1 Jan 2025 11:32:04 -0700
Subject: [PATCH] move window cluster

---
 config/base.keymap       |  2 +-
 config/shared/setup.dtsi |  5 ++++-
 draw/corne.svg           | 28 ++++++++++++++++------------
 draw/corne.yaml          |  8 ++++----
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/config/base.keymap b/config/base.keymap
index 5076d38..9720bf8 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -68,7 +68,7 @@
 //          ╭───────────────────┬───────────────────┬───────────────────┬───────────────────┬───────────────────╮                                           ╭───────────────────┬───────────────────┬───────────────────┬───────────────────┬───────────────────╮
               ___                 &kp LA(LS(N7))      &kp LA(LS(N8))      &kp LA(LS(N9))      ___                                                             ___                 ___                 ___                 ___                 ___                
 //          ├───────────────────┼───────────────────┼───────────────────┼───────────────────┼───────────────────┤                                           ├───────────────────┼───────────────────┼───────────────────┼───────────────────┼───────────────────┤
-              ___                 &kp LA(LS(N4))      &kp LA(LS(N5))      &kp LA(LS(N6))      ___                                                             ___                 ___                 ___                 ___                 ___                
+              ___                 &kp LA(LS(N4))      &kp LA(LS(N5))      &kp LA(LS(N6))      ___                                                                                                  MOVE                                       ___                
 //          ├───────────────────┼───────────────────┼───────────────────┼───────────────────┼───────────────────┤                                           ├───────────────────┼───────────────────┼───────────────────┼───────────────────┼───────────────────┤
               ___                 &kp LA(LS(N1))      &kp LA(LS(N2))      &kp LA(LS(N3))      ___                                                             ___                 ___                 ___                 ___                 ___                
 //          ╰───────────────────┴───────────────────┴───────────────────┼───────────────────┼───────────────────┼───────────────────╮   ╭───────────────────┼───────────────────┼───────────────────┼───────────────────┴───────────────────┴───────────────────╯
diff --git a/config/shared/setup.dtsi b/config/shared/setup.dtsi
index 24286de..99ee247 100644
--- a/config/shared/setup.dtsi
+++ b/config/shared/setup.dtsi
@@ -41,8 +41,11 @@ MAKE_HRM(hmr, &kp, &kp, KEYS_L THUMBS)  // right-hand HRMs
 // reusable arrow keys ← ↓ ↑ →
 #define ARROWS  &kp LEFT &kp DOWN &kp UP &kp RIGHT
 
-// space move cluster
+// space move focus cluster
 #define FOCUS &kp LA(H) &kp LA(J) &kp LA(K) &kp LA(L)
 
+// space move window cluster
+#define MOVE &kp LS(LA(H)) &kp LS(LA(J)) &kp LS(LA(K)) &kp LS(LA(L))
+
 // tab change
 #define TABS &kp LC(LBKT) &kp LC(RBKT)
\ No newline at end of file
diff --git a/draw/corne.svg b/draw/corne.svg
index db5ea4f..6350750 100644
--- a/draw/corne.svg
+++ b/draw/corne.svg
@@ -783,21 +783,25 @@ svg.keymap { font-family: 'JetBrains Mono'; }</style>
 <rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key trans side"/>
 <rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key trans"/>
 </g>
-<g transform="translate(518, 107)" class="key trans keypos-15">
-<rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key trans side"/>
-<rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key trans"/>
+<g transform="translate(518, 107)" class="key keypos-15">
+<rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key side"/>
+<rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key"/>
+<text x="0" y="-4" class="key tap">⇧+⎇+H</text>
 </g>
-<g transform="translate(580, 99)" class="key trans keypos-16">
-<rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key trans side"/>
-<rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key trans"/>
+<g transform="translate(580, 99)" class="key keypos-16">
+<rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key side"/>
+<rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key"/>
+<text x="0" y="-4" class="key tap">⇧+⎇+J</text>
 </g>
-<g transform="translate(640, 92)" class="key trans keypos-17">
-<rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key trans side"/>
-<rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key trans"/>
+<g transform="translate(640, 92)" class="key keypos-17">
+<rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key side"/>
+<rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key"/>
+<text x="0" y="-4" class="key tap">⇧+⎇+K</text>
 </g>
-<g transform="translate(702, 99)" class="key trans keypos-18">
-<rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key trans side"/>
-<rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key trans"/>
+<g transform="translate(702, 99)" class="key keypos-18">
+<rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key side"/>
+<rect rx="4" ry="4" x="-26" y="-28" width="51" height="45" class="key"/>
+<text x="0" y="-4" class="key tap">⇧+⎇+L</text>
 </g>
 <g transform="translate(762, 114)" class="key trans keypos-19">
 <rect rx="6" ry="6" x="-28" y="-28" width="57" height="57" class="key trans side"/>
diff --git a/draw/corne.yaml b/draw/corne.yaml
index 0eff6de..21e4d0a 100644
--- a/draw/corne.yaml
+++ b/draw/corne.yaml
@@ -127,10 +127,10 @@ layers:
   - {t: ⎇+⇧+5, s: ⎇+⇧+%}
   - {t: ⎇+⇧+6, s: ⎇+⇧+^}
   - {type: trans}
-  - {type: trans}
-  - {type: trans}
-  - {type: trans}
-  - {type: trans}
+  - ⇧+⎇+H
+  - ⇧+⎇+J
+  - ⇧+⎇+K
+  - ⇧+⎇+L
   - {type: trans}
   - {type: trans}
   - {t: ⎇+⇧+1, s: ⎇+⇧+!}