From 0bc3b35901ce35127fbd87fb9bf8d01aea54c83e Mon Sep 17 00:00:00 2001
From: DarrenVictoriano <26513979+DarrenVictoriano@users.noreply.github.com>
Date: Fri, 7 Feb 2025 20:14:25 -0800
Subject: [PATCH] resolve conflivt
---
images/config_keymap-drawer.yaml | 294 ++++++-------------------------
images/corne.svg | 37 +---
images/corne.yaml | 41 ++---
3 files changed, 82 insertions(+), 290 deletions(-)
diff --git a/images/config_keymap-drawer.yaml b/images/config_keymap-drawer.yaml
index 8004603..7bd05c3 100644
--- a/images/config_keymap-drawer.yaml
+++ b/images/config_keymap-drawer.yaml
@@ -422,7 +422,6 @@ parse_config:
QUES: "?"
zmk_remove_keycode_prefix: []
zmk_keycode_map:
-<<<<<<< HEAD
# Modifiers
LCTRL: $$mdi:apple-keyboard-control$$
LALT: $$mdi:apple-keyboard-option$$
@@ -446,12 +445,6 @@ parse_config:
PG_UP: $$mdi:transfer-up$$
PG_DN: $$mdi:transfer-down$$
-
- C_VOL_UP: Vol Up
- C_VOL_DN: Vol Down
- C_AL_CALC: Calc
-
- # ESC: Esc
ESC: $$mdi:keyboard-esc$$
TAB: $$mdi:keyboard-tab$$
SPACE: $$mdi:keyboard-space$$
@@ -469,262 +462,81 @@ parse_config:
C_NEXT: $$mdi:skip-next$$
C_PREV: $$mdi:skip-previous$$
C_PP: $$mdi:play-pause$$
-
+
# Sound
C_MUTE: $$mdi:volume-off$$
C_VOL_UP: $$mdi:volume-high$$
C_VOL_DN: $$mdi:volume-low$$
-
+
# Bluetooth
BT_CLR: $$mdi:bluetooth-off$$
BT_SEL: $$mdi:bluetooth-connect$$
# Symbols
- AMPERSAND: "&"
AMPS: "&"
+ AMPERSAND: "&"
APOS: "'"
APOSTROPHE: "'"
-||||||| 6290dee
- C_VOL_UP: Vol Up
- C_VOL_DN: Vol Down
- C_AL_CALC: Calc
- LCTRL: Ctrl
- RCTRL: Ctrl
- LALT: Alt
- RALT: Alt
- LGUI: Gui
- RGUI: Gui
- LSHFT: Shift
- RSHFT: Shift
- ESC: Esc
- SPACE: ␣
- BSPC: ⌫
- RET: ⏎
- TAB: ↹
- DEL: ⌦
- PG_UP: Page Up
- PG_DN: Page Down
- INS: Insert
- HOME: Home
- END: End
- CAPS: Caps Lock
- PSCRN: Print Scrn
- PAUSE_BREAK: Pause Break
- UP: ↑
- DOWN: ↓
- LEFT: ←
- RIGHT: →
- C_PP: ⏯
- C_NEXT: ⏭️
- C_PREV: ⏮️
- APOS: "'"
- APOSTROPHE: "'"
-=======
- # Symbols
- EXCLAMATION: "!"
- EXCL: "!"
- AT_SIGN: "@"
- AT: "@"
- HASH: "#"
- POUND: "#"
- DOLLAR: $
- DLLR: $
- PERCENT: "%"
- PRCNT: "%"
- CARET: ^
- AMPERSAND: "&"
- AMPS: "&"
->>>>>>> 45eeb5190bd770f17493466a21991d913b3833c8
ASTERISK: "*"
ASTRK: "*"
- STAR: "*"
- LEFT_PARENTHESIS: (
- LPAR: (
- RIGHT_PARENTHESIS: )
- RPAR: )
- EQUAL:
- tap: "="
- shifted: "+"
- PLUS: +
- MINUS:
- tap: "-"
- shifted: "_"
- UNDERSCORE: _
- UNDER: _
- SLASH:
- tap: "/"
- shifted: "?"
- FSLH:
- tap: "/"
- shifted: "?"
- QUESTION: "?"
- QMARK: "?"
- BACKSLASH:
- tap: '\'
- shifted: "|"
- BSLH:
- tap: '\'
- shifted: "|"
- PIPE: "|"
- NON_US_BACKSLASH: \
- PIPE2: "|"
- NON_US_BSLH: "|"
- SEMICOLON:
- tap: ";"
- shifted: ":"
- SEMI:
- tap: ";"
- shifted: ":"
+ AT: "@"
+ AT_SIGN: "@"
+ BACKSLASH: \
+ BSLH: \
+ CARET: ^
COLON: ":"
- SINGLE_QUOTE:
- tap: "'"
- shifted: '"'
- SQT:
- tap: "'"
- shifted: '"'
- APOSTROPHE: <
- APOS: .
+ COMMA: ","
+ DLLR: $
+ DOLLAR: $
+ DOT: .
DOUBLE_QUOTES: '"'
DQT: '"'
-
- LESS_THAN: <
- LT: <
- DOT:
- tap: "."
- shifted: ">"
- COMMA:
- tap: ","
- shifted: "<"
+ EQUAL: "="
+ EXCL: "!"
+ EXCLAMATION: "!"
+ FSLH: /
+ GRAVE: "`"
GREATER_THAN: ">"
GT: ">"
- LEFT_BRACKET:
- tap: "["
- shifted: "{"
- LBKT:
- tap: "["
- shifted: "{"
- LEFT_BRACE: "{"
+ HASH: "#"
+ LBKT: "["
LBRC: "{"
- RIGHT_BRACKET:
- tap: "]"
- shifted: "}"
- RBKT:
- tap: "]"
- shifted: "}"
- RIGHT_BRACE: "}"
- RBRC: "}"
- GRAVE:
- tap: "`"
- shifted: "~"
- TILDE: "~"
+ LEFT_BRACE: "{"
+ LEFT_BRACKET: "["
+ LEFT_PARENTHESIS: (
+ LESS_THAN: <
+ LPAR: (
+ LT: <
+ MINUS: "-"
+ NON_US_BACKSLASH: \
+ NON_US_BSLH: "|"
NON_US_HASH: "#"
NUHS: "#"
+ PERCENT: "%"
+ PERIOD: .
+ PIPE: "|"
+ PIPE2: "|"
+ PLUS: +
+ POUND: "#"
+ PRCNT: "%"
+ QMARK: "?"
+ QUESTION: "?"
+ RBKT: "]"
+ RBRC: "}"
+ RIGHT_BRACE: "}"
+ RIGHT_BRACKET: "]"
+ RIGHT_PARENTHESIS: )
+ RPAR: )
+ SEMI: ;
+ SEMICOLON: ;
+ SINGLE_QUOTE: "'"
+ SLASH: /
+ SQT: "'"
+ STAR: "*"
+ TILDE: "~"
TILDE2: "~"
-
- # Numbers
- N1:
- tap: 1
- shifted: "!"
- N2:
- tap: 2
- shifted: "@"
- N3:
- tap: 3
- shifted: "#"
- N4:
- tap: 4
- shifted: "$"
- N5:
- tap: 5
- shifted: "%"
- N6:
- tap: 6
- shifted: "^"
- N7:
- tap: 7
- shifted: "&"
- N8:
- tap: 8
- shifted: "*"
- N9:
- tap: 9
- shifted: "("
- N0:
- tap: 0
- shifted: ")"
-
- # Modifiers
- LCTRL: $$mdi:apple-keyboard-control$$
- LALT: $$mdi:apple-keyboard-option$$
- LSHIFT: $$mdi:apple-keyboard-shift$$
- LSHFT: $$mdi:apple-keyboard-shift$$
- LCMD: $$mdi:apple-keyboard-command$$
- RCTRL: $$mdi:apple-keyboard-control$$
- RALT: $$mdi:apple-keyboard-option$$
- RSHIFT: $$mdi:apple-keyboard-shift$$
- RSHFT: $$mdi:apple-keyboard-shift$$
- RCMD: $$mdi:apple-keyboard-command$$
- LS(LC(LALT)): $$mdi:triangle$$ # Meh
-
- # Arrows
- UP: $$mdi:arrow-up-bold$$
- DOWN: $$mdi:arrow-down-bold$$
- LEFT: $$mdi:arrow-left-bold$$
- RIGHT: $$mdi:arrow-right-bold$$
- PG_UP: $$mdi:transfer-up$$
- PG_DN: $$mdi:transfer-down$$
-
- # Whitespace
- ENTER:
- type: enter
- tap: $$mdi:keyboard-return$$
- ESC: $$mdi:keyboard-esc$$
- TAB: $$mdi:keyboard-tab$$
- LS(TAB): $$mdi:keyboard-tab-reverse$$
- SPACE: $$mdi:keyboard-space$$
- BACKSPACE:
- type: backspace
- tap: $$mdi:backspace$$
- BSPC:
- type: backspace
- tap: $$mdi:backspace$$
- DELETE: $$mdi:backspace-reverse-outline$$
- DEL: $$mdi:backspace-reverse-outline$$
-
- # Locks
- CAPSLOCK: $$mdi:apple-keyboard-caps$$
- CAPS: $$mdi:apple-keyboard-caps$$
-
- # Sound
- C_MUTE: $$mdi:volume-off$$
- C_VOL_UP: $$mdi:volume-high$$
- C_VOL_DN: $$mdi:volume-low$$
-
- # Media
- C_NEXT: $$mdi:skip-next$$
- C_PREV: $$mdi:skip-previous$$
- C_PP: $$mdi:play-pause$$
-
- # Bluetooth
- BT_CLR: $$mdi:bluetooth-off$$
- BT_SEL: $$mdi:bluetooth-connect$$
-
- # Settings
- C_BRI_UP: $$mdi:brightness-5$$
- C_BRI_DN: $$mdi:brightness-7$$
-
- # System
- C_POWER: $$mdi:power-standby$$
- C_AL_LOCK: $$mdi:lock$$
- K_CANCEL: $$mdi:close-box$$
-
- # Zoom
- RG(RS(A)):
- tap: $$mdi:microphone$$
- hold: zoom
- RG(RS(V)):
- tap: $$mdi:video$$
- hold: zoom
+ UNDER: _
+ UNDERSCORE: _
zmk_combos:
combo_tab:
draw_separate: true
@@ -761,4 +573,4 @@ parse_config:
combo_slsh:
draw_separate: true
zmk_preamble: "#define KEYMAP_DRAWER"
- zmk_additional_includes: []
+ zmk_additional_includes: []
\ No newline at end of file
diff --git a/images/corne.svg b/images/corne.svg
index 2e58c47..f71da82 100644
--- a/images/corne.svg
+++ b/images/corne.svg
@@ -27,12 +27,12 @@
-
+
@@ -365,11 +365,10 @@ rect.held, rect.combo.held {
;
-:
-RET
+
@@ -406,17 +405,14 @@ rect.held, rect.combo.held {
,
-<
.
->
/
-?
@@ -460,56 +456,46 @@ rect.held, rect.combo.held {
1
-!
2
-@
3
-#
4
-$
5
-%
6
-^
7
-&
8
-*
9
-(
0
-)
-
+DELETE
@@ -556,7 +542,7 @@ rect.held, rect.combo.held {
-RET
+
@@ -673,11 +659,10 @@ rect.held, rect.combo.held {
=
-+
-
+DELETE
@@ -686,7 +671,6 @@ rect.held, rect.combo.held {
`
-~
@@ -699,7 +683,6 @@ rect.held, rect.combo.held {
[
-{
@@ -712,7 +695,6 @@ rect.held, rect.combo.held {
]
-}
@@ -721,7 +703,6 @@ rect.held, rect.combo.held {
\
-|
@@ -729,7 +710,7 @@ rect.held, rect.combo.held {
-RET
+
@@ -747,7 +728,6 @@ rect.held, rect.combo.held {
'
-"
@@ -760,7 +740,6 @@ rect.held, rect.combo.held {
-
-_
diff --git a/images/corne.yaml b/images/corne.yaml
index a5b63b4..c2a48f0 100644
--- a/images/corne.yaml
+++ b/images/corne.yaml
@@ -1,9 +1,10 @@
layout: {qmk_keyboard: corne_rotated, layout_name: LAYOUT_split_3x6_3}
layers:
- default: [↹, Q, W, E, R, T, Y, U, I, O, P, '$$mdi:backspace-outline$$', '$$mdi:apple-keyboard-control$$', A, S, D, F, G, H, J, K, L, ;, ENTER, '$$mdi:apple-keyboard-shift$$',
- Z, X, C, V, B, N, M, ',', ., /, '$$mdi:apple-keyboard-shift$$', '$$mdi:apple-keyboard-command$$', lower, ␣, ␣, raise, '$$mdi:apple-keyboard-option$$']
+ default: ['$$mdi:keyboard-tab$$', Q, W, E, R, T, Y, U, I, O, P, '$$mdi:backspace-outline$$', '$$mdi:apple-keyboard-control$$', A, S, D, F, G, H, J, K, L, ;, '$$mdi:keyboard-return$$',
+ '$$mdi:apple-keyboard-shift$$', Z, X, C, V, B, N, M, ',', ., /, '$$mdi:apple-keyboard-shift$$', '$$mdi:apple-keyboard-command$$', lower, '$$mdi:keyboard-space$$',
+ '$$mdi:keyboard-space$$', raise, '$$mdi:apple-keyboard-option$$']
lower:
- - ESCAPE
+ - $$mdi:keyboard-esc$$
- '1'
- '2'
- '3'
@@ -18,42 +19,42 @@ layers:
- $$mdi:apple-keyboard-control$$
- ''
- ''
- - Ctl+Sft+↹
- - Ctl+↹
+ - Ctl+Sft+$$mdi:keyboard-tab$$
+ - Ctl+$$mdi:keyboard-tab$$
- Gui+Sft+J
- - LEFT ARROW
- - DOWN ARROW
- - UP ARROW
- - RIGHT ARROW
+ - $$mdi:arrow-left-bold$$
+ - $$mdi:arrow-down-bold$$
+ - $$mdi:arrow-up-bold$$
+ - $$mdi:arrow-right-bold$$
- ''
- - ENTER
+ - $$mdi:keyboard-return$$
- $$mdi:apple-keyboard-shift$$
- ''
- ''
- ''
- ''
- - Gui+Alt+␣
- - Vol Down
- - Vol Up
+ - Gui+Alt+$$mdi:keyboard-space$$
+ - $$mdi:volume-low$$
+ - $$mdi:volume-high$$
- ''
- ''
- ''
- $$mdi:apple-keyboard-shift$$
- $$mdi:apple-keyboard-command$$
- {t: lower, type: held}
- - ␣
- - ␣
+ - $$mdi:keyboard-space$$
+ - $$mdi:keyboard-space$$
- raise
- $$mdi:apple-keyboard-option$$
raise:
- - ESCAPE
+ - $$mdi:keyboard-esc$$
- '!'
- '@'
- '#'
- $
- '%'
- ^
- - AMPERSAND
+ - '&'
- '*'
- +
- '='
@@ -69,7 +70,7 @@ layers:
- '}'
- \
- '|'
- - ENTER
+ - $$mdi:keyboard-return$$
- $$mdi:apple-keyboard-shift$$
- ''
- ''
@@ -84,7 +85,7 @@ layers:
- $$mdi:apple-keyboard-shift$$
- $$mdi:apple-keyboard-command$$
- lower
- - ␣
- - ␣
+ - $$mdi:keyboard-space$$
+ - $$mdi:keyboard-space$$
- {t: raise, type: held}
- $$mdi:apple-keyboard-option$$