From 549ca19dced334e9c8b0f43dbdeae09ba6c40ede Mon Sep 17 00:00:00 2001
From: jasmine <its.jassy@pm.me>
Date: Thu, 19 Jun 2025 11:37:20 +0800
Subject: [PATCH] update comboes

---
 assets/img/keymaps/ferris-sajenim.svg         | 64 ++++++++++++-------
 assets/keymap-drawer/ferris-sajenim.yaml      | 10 ++-
 .../ferris/sweep/keymaps/sajenim/combos.def   |  9 +--
 3 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/assets/img/keymaps/ferris-sajenim.svg b/assets/img/keymaps/ferris-sajenim.svg
index fd22919..e22c624 100644
--- a/assets/img/keymaps/ferris-sajenim.svg
+++ b/assets/img/keymaps/ferris-sajenim.svg
@@ -287,78 +287,98 @@ path.combo { stroke: #7f7f7f; }
 <text x="0" y="24" class="key hold">Num</text>
 </g>
 <g class="combo combopos-0">
+<rect rx="6" ry="6" x="98" y="24" width="28" height="26" class="combo"/>
+<text x="112" y="37" class="combo tap">Lead</text>
+</g>
+<g class="combo combopos-1">
+<rect rx="6" ry="6" x="490" y="23" width="28" height="26" class="combo"/>
+<text x="504" y="36" class="combo tap">[</text>
+</g>
+<g class="combo combopos-2">
+<rect rx="6" ry="6" x="546" y="24" width="28" height="26" class="combo"/>
+<text x="560" y="37" class="combo tap">]</text>
+</g>
+<g class="combo combopos-3">
 <rect rx="6" ry="6" x="14" y="96" width="28" height="26" class="combo"/>
 <text x="28" y="109" class="combo tap">1</text>
 </g>
-<g class="combo combopos-1">
+<g class="combo combopos-4">
 <rect rx="6" ry="6" x="70" y="61" width="28" height="26" class="combo"/>
 <text x="84" y="74" class="combo tap">2</text>
 </g>
-<g class="combo combopos-2">
+<g class="combo combopos-5">
 <rect rx="6" ry="6" x="126" y="43" width="28" height="26" class="combo"/>
 <text x="140" y="56" class="combo tap">3</text>
 </g>
-<g class="combo combopos-3">
+<g class="combo combopos-6">
 <rect rx="6" ry="6" x="182" y="59" width="28" height="26" class="combo"/>
 <text x="196" y="72" class="combo tap">4</text>
 </g>
-<g class="combo combopos-4">
+<g class="combo combopos-7">
 <rect rx="6" ry="6" x="238" y="67" width="28" height="26" class="combo"/>
 <text x="252" y="80" class="combo tap">5</text>
 </g>
-<g class="combo combopos-5">
+<g class="combo combopos-8">
 <rect rx="6" ry="6" x="406" y="67" width="28" height="26" class="combo"/>
 <text x="420" y="80" class="combo tap">6</text>
 </g>
-<g class="combo combopos-6">
+<g class="combo combopos-9">
 <rect rx="6" ry="6" x="462" y="59" width="28" height="26" class="combo"/>
 <text x="476" y="72" class="combo tap">7</text>
 </g>
-<g class="combo combopos-7">
+<g class="combo combopos-10">
 <rect rx="6" ry="6" x="518" y="43" width="28" height="26" class="combo"/>
 <text x="532" y="56" class="combo tap">8</text>
 </g>
-<g class="combo combopos-8">
+<g class="combo combopos-11">
 <rect rx="6" ry="6" x="574" y="61" width="28" height="26" class="combo"/>
 <text x="588" y="74" class="combo tap">9</text>
 </g>
-<g class="combo combopos-9">
+<g class="combo combopos-12">
 <rect rx="6" ry="6" x="630" y="96" width="28" height="26" class="combo"/>
 <text x="644" y="109" class="combo tap">0</text>
 </g>
-<g class="combo combopos-10">
+<g class="combo combopos-13">
 <rect rx="6" ry="6" x="98" y="80" width="28" height="26" class="combo"/>
 <text x="112" y="93" class="combo tap">Tab</text>
 </g>
-<g class="combo combopos-11">
+<g class="combo combopos-14">
 <rect rx="6" ry="6" x="154" y="79" width="28" height="26" class="combo"/>
 <text x="168" y="92" class="combo tap">C-w</text>
 </g>
-<g class="combo combopos-12">
+<g class="combo combopos-15">
 <rect rx="6" ry="6" x="490" y="79" width="28" height="26" class="combo"/>
 <text x="504" y="92" class="combo tap">Esc</text>
 </g>
-<g class="combo combopos-13">
+<g class="combo combopos-16">
 <rect rx="6" ry="6" x="546" y="80" width="28" height="26" class="combo"/>
 <text x="560" y="93" class="combo tap">Ent</text>
 </g>
-<g class="combo combopos-14">
+<g class="combo combopos-17">
 <rect rx="6" ry="6" x="98" y="136" width="28" height="26" class="combo"/>
 <text x="112" y="149" class="combo tap">:</text>
 </g>
-<g class="combo combopos-15">
+<g class="combo combopos-18">
 <rect rx="6" ry="6" x="154" y="135" width="28" height="26" class="combo"/>
-<text x="168" y="148" class="combo tap">
-<tspan x="168" dy="-0.6em">OS</tspan><tspan x="168" dy="1.2em">Shift</tspan>
+<text x="168" y="148" class="combo tap">M-a</text>
+</g>
+<g class="combo combopos-19">
+<rect rx="6" ry="6" x="210" y="147" width="28" height="26" class="combo"/>
+<text x="224" y="160" class="combo tap">
+<tspan x="224" dy="-0.6em">OS</tspan><tspan x="224" dy="1.2em">Shift</tspan>
 </text>
 </g>
-<g class="combo combopos-16">
+<g class="combo combopos-20">
+<rect rx="6" ry="6" x="434" y="147" width="28" height="26" class="combo"/>
+<text x="448" y="160" class="combo tap">
+<tspan x="448" dy="-0.6em">OS</tspan><tspan x="448" dy="1.2em">Shift</tspan>
+</text>
+</g>
+<g class="combo combopos-21">
 <rect rx="6" ry="6" x="490" y="135" width="28" height="26" class="combo"/>
-<text x="504" y="148" class="combo tap">
-<tspan x="504" dy="-0.6em">OS</tspan><tspan x="504" dy="1.2em">Shift</tspan>
-</text>
+<text x="504" y="148" class="combo tap">M1-a</text>
 </g>
-<g class="combo combopos-17">
+<g class="combo combopos-22">
 <rect rx="6" ry="6" x="546" y="136" width="28" height="26" class="combo"/>
 <text x="560" y="149" class="combo tap">\</text>
 </g>
diff --git a/assets/keymap-drawer/ferris-sajenim.yaml b/assets/keymap-drawer/ferris-sajenim.yaml
index f5c25c5..6fd258a 100644
--- a/assets/keymap-drawer/ferris-sajenim.yaml
+++ b/assets/keymap-drawer/ferris-sajenim.yaml
@@ -27,6 +27,9 @@ layers:
     - [{h: Nav, t: Repeat, type: trans}, {t: Spc, type: trans}, {t: Bspc, type: trans}, {h: Num, t: Magic, type: trans}]
 
 combos:
+  - {p: [1, 2],     k: "Lead",     l: ["CANARY"]}
+  - {p: [6, 7],     k: "[",        l: ["CANARY"]}
+  - {p: [7, 8],     k: "]",        l: ["CANARY"]}
   - {p: [0, 10],    k: "1",        l: ["CANARY"]}
   - {p: [1, 11],    k: "2",        l: ["CANARY"]}
   - {p: [2, 12],    k: "3",        l: ["CANARY"]}
@@ -42,7 +45,8 @@ combos:
   - {p: [16, 17],   k: "Esc",      l: ["CANARY"]}
   - {p: [17, 18],   k: "Ent",      l: ["CANARY"]}
   - {p: [21, 22],   k: ":",        l: ["CANARY"]}
-  - {p: [22, 23],   k: "OS Shift", l: ["CANARY"]}
-  - {p: [26, 27],   k: "OS Shift", l: ["CANARY"]}
+  - {p: [22, 23],   k: "M-a",      l: ["CANARY"]}
+  - {p: [23, 24],   k: "OS Shift", l: ["CANARY"]}
+  - {p: [25, 26],   k: "OS Shift", l: ["CANARY"]}
+  - {p: [26, 27],   k: "M1-a",      l: ["CANARY"]}
   - {p: [27, 28],   k: "\\",       l: ["CANARY"]}
-
diff --git a/keyboards/ferris/sweep/keymaps/sajenim/combos.def b/keyboards/ferris/sweep/keymaps/sajenim/combos.def
index 8b35b75..f92fbd1 100644
--- a/keyboards/ferris/sweep/keymaps/sajenim/combos.def
+++ b/keyboards/ferris/sweep/keymaps/sajenim/combos.def
@@ -13,7 +13,7 @@ COMB(NUM_9,           KC_9,           KC_U,          HRM_I)
 COMB(NUM_0,           KC_0,           KC_QUOT,       HRM_A)
 
 // top row
-COMB(wl_tmux,         C(KC_B),        KC_W,          KC_L)
+COMB(ly_lead,         QK_LEAD,        KC_L,          KC_Y)
 COMB(fo_lbrc,         KC_LBRC,        KC_F,          KC_O)
 COMB(ou_rbrc,         KC_RBRC,        KC_O,          KC_U)
 
@@ -27,10 +27,11 @@ SUBS(nei_write,       "\e:w\n",       HRM_N,         HRM_E,         HRM_I)
 
 // bottom row
 COMB(jv_coln,         KC_COLN,        KC_J,          KC_V)
-COMB(vd_shift,        OSM(MOD_LSFT),  KC_V,          SYM_D)
+COMB(vd_xmonad,       G(KC_A),        KC_V,          SYM_D)
+COMB(dk_shift,        OSM(MOD_LSFT),  SYM_D,         KC_K)
 
-COMB(h_slash_shift,   OSM(MOD_RSFT),  SYM_H,         KC_SLSH)
-COMB(h_comm_lead,     QK_LEAD,        SYM_H,         KC_COMM)
+COMB(xh_shift,        OSM(MOD_RSFT),  KC_X,          SYM_H)
+COMB(h_slash_wterm,   A(KC_A),        SYM_H,         KC_SLSH)
 COMB(slsh_comm_bsls,  KC_BSLS,        KC_SLSH,       KC_COMM)
 
 /* vim: set filetype=c: */