commit 13fcd8a9af9e7bd15577075bd8ae1b37999344d9
parent 72c11222823f11e1e9ec7fefd1c1324083f54d27
Author: Jack Sangdahl <jack@pngu.org>
Date: Mon, 8 Jul 2024 02:11:20 -0600
update combos and fix type
Diffstat:
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/img/layout.svg b/img/layout.svg
@@ -336,11 +336,11 @@ path.combo {
</g>
<g class="combo combopos-3">
<rect rx="6" ry="6" x="98" y="18" width="28" height="26" class="combo"/>
-<text x="112" y="32" class="combo tap">:</text>
+<text x="112" y="32" class="combo tap">+</text>
</g>
<g class="combo combopos-4">
<rect rx="6" ry="6" x="602" y="18" width="28" height="26" class="combo"/>
-<text x="616" y="32" class="combo tap">Ent</text>
+<text x="616" y="32" class="combo tap">_</text>
</g>
<g class="combo combopos-5">
<rect rx="6" ry="6" x="210" y="82" width="28" height="26" class="combo"/>
@@ -348,7 +348,7 @@ path.combo {
</g>
<g class="combo combopos-6">
<rect rx="6" ry="6" x="154" y="74" width="28" height="26" class="combo"/>
-<text x="168" y="88" class="combo tap">+</text>
+<text x="168" y="88" class="combo tap">:</text>
</g>
<g class="combo combopos-7">
<path d="M364,56 h-162 a6.0,6.0 0 0 0 -6.0,6.0 v10" class="combo"/>
@@ -372,7 +372,7 @@ path.combo {
</g>
<g class="combo combopos-11">
<rect rx="6" ry="6" x="546" y="74" width="28" height="26" class="combo"/>
-<text x="560" y="88" class="combo tap">_</text>
+<text x="560" y="88" class="combo tap">Ent</text>
</g>
<g class="combo combopos-12">
<rect rx="6" ry="6" x="602" y="74" width="28" height="26" class="combo"/>
diff --git a/readme.md b/readme.md
@@ -14,7 +14,7 @@ echo "users/waffle\nkeyboards/relic" >> ~/qmk_firmware/.git/info/exclude
qmk compile -kb relic -km waffle
```
the official [userspace feature](https://docs.qmk.fm/newbs_external_userspace)
-is used as this repository contains personal keyboards, which are not supported.
+is not used as this repository contains personal keyboards, which are not supported.
### layout
a simple 34-key layout that makes use of 2 (primary) layers, home-row mods, & combos for many symbols.
diff --git a/util/keymap.yaml b/util/keymap.yaml
@@ -56,13 +56,13 @@ combos:
- {p: [2, 3], k: "{}", l: ["BASE"]}
- {p: [3, 4], k: "|", l: ["BASE"]}
- {p: [6, 7], k: "[]", l: ["BASE"]}
- - {p: [1, 2], k: ":", l: ["BASE"]}
- - {p: [7, 8], k: "Ent", l: ["BASE"]}
+ - {p: [1, 2], k: "+", l: ["BASE"]}
+ - {p: [7, 8], k: "_", l: ["BASE"]}
- {p: [13, 14], k: "\\", l: ["BASE"]}
- - {p: [12, 13], k: "+", l: ["BASE"]}
+ - {p: [12, 13], k: ":", l: ["BASE"]}
- {p: [13, 16], k: "Cap Wrd", l: ["BASE"], align: top, offset: 0.1}
- {p: [15, 16], k: "'", l: ["BASE"]}
- {p: [5, 6], k: "\"", l: ["BASE"]}
- {p: [11, 12], k: "=", l: ["BASE"]}
- - {p: [16, 17], k: "_", l: ["BASE"]}
+ - {p: [16, 17], k: "Ent", l: ["BASE"]}
- {p: [17, 18], k: "-", l: ["BASE"]}
diff --git a/waffle/combos.def b/waffle/combos.def
@@ -2,15 +2,15 @@
// SPDX-License-Identifier: GPL-2.0-or-later
// name output keys
-CMB(fg_coln, KC_COLN, KC_W, KC_E)
+CMB(fg_plus, KC_PLUS, KC_W, KC_E)
CMB(er_cbkt, TD(CURLY_BRACKET), KC_E, KC_R)
CMB(rt_pipe, KC_PIPE, KC_R, KC_T)
CMB(yu_dqou, KC_DQUO, KC_Y, KC_U)
CMB(ui_brkt, TD(SQR_BRACKET), KC_U, KC_I)
-CMB(io_ent, KC_ENT, KC_I, KC_O)
-CMB(sd_eql, KC_EQL, LGUI_T(KC_S), LCTL_T(KC_D))
-CMB(df_plus, KC_PLUS, LCTL_T(KC_D), LSFT_T(KC_F))
+CMB(io_unds, KC_UNDS, KC_I, KC_O)
+CMB(sd_eqal, KC_EQL, LGUI_T(KC_S), LCTL_T(KC_D))
+CMB(df_coln, KC_COLN, LCTL_T(KC_D), LSFT_T(KC_F))
CMB(fg_bsls, KC_BSLS, LSFT_T(KC_F), KC_G)
CMB(hj_quot, KC_QUOT, KC_H, RSFT_T(KC_J))
-CMB(jk_unds, KC_UNDS, RSFT_T(KC_J), RCTL_T(KC_K))
+CMB(jk_entr, KC_ENT, RSFT_T(KC_J), RCTL_T(KC_K))
CMB(kl_mins, TD(EM_DASH_MINS), RCTL_T(KC_K), RGUI_T(KC_L))
