From e9ddd5bca61e02fa650df09faac45c6df38f3190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Berbain?= <raphael.berbain@gmail.com>
Date: Mon, 8 Jan 2024 16:39:51 +0100
Subject: [PATCH] revamp nav
---
config/keymap.dtsi | 8 ++++----
keymap-drawer/keymap.svg | 14 ++++++++------
keymap-drawer/keymap.yaml | 16 ++++++++--------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/config/keymap.dtsi b/config/keymap.dtsi
index dd5d42d..1545223 100644
--- a/config/keymap.dtsi
+++ b/config/keymap.dtsi
@@ -190,10 +190,10 @@
nav {
label = "nav";
bindings = <
-&trans ___ &kp HOME &kp UP &kp END &kp PG_UP &kp LA(LG(LEFT)) &kp LA(LG(RIGHT)) &kp LA(LG(F)) &kp LC(W) &kill_word &trans
-&trans ___ &kp LEFT &kp DOWN &kp RIGHT &kp PG_DN &kp LC(LA(LG(LEFT))) &kp LC(LA(LG(RIGHT))) &kp LC(Q) &kp LC(R) ___ &trans
-&trans &tmux_prev &tmux_next &kp LA(B) &kp LA(F) ___ ___ &sk LGUI &sk LALT &sk LCTRL &sk LSHFT &trans
- &trans &trans &shift &trans &trans &tog NAV
+&trans ___ &kp HOME &kp UP &kp END &kp PG_UP &kp LC(LA(UP)) &kp LC(LA(LG(LEFT))) &kp LC(LA(LG(RIGHT))) &kp LC(W) &kill_word &trans
+&trans ___ &kp LEFT &kp DOWN &kp RIGHT &kp PG_DN &kp LC(LA(LEFT)) &kp LC(LA(RIGHT)) &kp LC(LA(RET)) &kp LC(R) &kp LC(Q) &trans
+&trans &tmux_prev &tmux_next &kp LA(B) &kp LA(F) ___ &kp LC(LA(DOWN)) &sk LGUI &sk LALT &sk LCTRL &sk LSHFT &trans
+ &trans &trans &shift &trans &trans &tog NAV
>;
};
adjust {
diff --git a/keymap-drawer/keymap.svg b/keymap-drawer/keymap.svg
index 187540e..d70f4ce 100644
--- a/keymap-drawer/keymap.svg
+++ b/keymap-drawer/keymap.svg
@@ -841,15 +841,15 @@ path.combo {
</g>
<g transform="translate(532, 42)" class="key keypos-6">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">⌥⌘←</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 70%">LC(LA(UP))</tspan></text>
</g>
<g transform="translate(588, 35)" class="key keypos-7">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">⌥⌘→</text>
+<text x="0" y="0" class="key tap">⌃⌥⌘←</text>
</g>
<g transform="translate(644, 28)" class="key keypos-8">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">⌥⌘F</text>
+<text x="0" y="0" class="key tap">⌃⌥⌘→</text>
</g>
<g transform="translate(700, 35)" class="key keypos-9">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -888,15 +888,15 @@ path.combo {
</g>
<g transform="translate(532, 98)" class="key keypos-18">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">⌃⌥⌘←</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 60%">LC(LA(LEFT))</tspan></text>
</g>
<g transform="translate(588, 91)" class="key keypos-19">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">⌃⌥⌘→</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 60%">LC(LA(RIGHT))</tspan></text>
</g>
<g transform="translate(644, 84)" class="key keypos-20">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">⌃Q</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 64%">LC(LA(RET))</tspan></text>
</g>
<g transform="translate(700, 91)" class="key keypos-21">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -904,6 +904,7 @@ path.combo {
</g>
<g transform="translate(756, 105)" class="key keypos-22">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">⌃Q</text>
</g>
<g transform="translate(812, 105)" class="key trans keypos-23">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans"/>
@@ -934,6 +935,7 @@ path.combo {
</g>
<g transform="translate(532, 154)" class="key keypos-30">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 60%">LC(LA(DOWN))</tspan></text>
</g>
<g transform="translate(588, 147)" class="key keypos-31">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
diff --git a/keymap-drawer/keymap.yaml b/keymap-drawer/keymap.yaml
index 33222e1..6ed7ff7 100644
--- a/keymap-drawer/keymap.yaml
+++ b/keymap-drawer/keymap.yaml
@@ -179,9 +179,9 @@ layers:
- ↑
- ⤓
- ⇞
- - ⌥⌘←
- - ⌥⌘→
- - ⌥⌘F
+ - LC(LA(UP))
+ - ⌃⌥⌘←
+ - ⌃⌥⌘→
- ⌥W
- Esc+D
- {t: ▽, type: trans}
@@ -191,11 +191,11 @@ layers:
- ↓
- →
- ⇟
- - ⌃⌥⌘←
- - ⌃⌥⌘→
- - ⌃Q
+ - LC(LA(LEFT))
+ - LC(LA(RIGHT))
+ - LC(LA(RET))
- ⌃R
- - ''
+ - ⌃Q
- {t: ▽, type: trans}
- {t: ▽, type: trans}
- ⌃QP
@@ -203,7 +203,7 @@ layers:
- ⌥B
- ⌥F
- ''
- - ''
+ - LC(LA(DOWN))
- {t: ⌘, h: ' '}
- {t: ⌥, h: ' '}
- {t: ⌃, h: ' '}