resolve conflivt

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: "*"
+    AT: "@"
-    LEFT_PARENTHESIS: (
+    AT_SIGN: "@"
-    LPAR: (
+    BACKSLASH: \
-    RIGHT_PARENTHESIS: )
+    BSLH: \
-    RPAR: )
+    CARET: ^
-    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: ":"
     COLON: ":"
-    SINGLE_QUOTE:
+    COMMA: ","
-      tap: "'"
+    DLLR: $
-      shifted: '"'
+    DOLLAR: $
-    SQT:
+    DOT: .
-      tap: "'"
-      shifted: '"'
-    APOSTROPHE: <
-    APOS: .
     DOUBLE_QUOTES: '"'
     DQT: '"'
-
+    EQUAL: "="
-    LESS_THAN: <
+    EXCL: "!"
-    LT: <
+    EXCLAMATION: "!"
-    DOT:
+    FSLH: /
-      tap: "."
+    GRAVE: "`"
-      shifted: ">"
-    COMMA:
-      tap: ","
-      shifted: "<"
     GREATER_THAN: ">"
     GT: ">"
-    LEFT_BRACKET:
+    HASH: "#"
-      tap: "["
+    LBKT: "["
-      shifted: "{"
-    LBKT:
-      tap: "["
-      shifted: "{"
-    LEFT_BRACE: "{"
     LBRC: "{"
-    RIGHT_BRACKET:
+    LEFT_BRACE: "{"
-      tap: "]"
+    LEFT_BRACKET: "["
-      shifted: "}"
+    LEFT_PARENTHESIS: (
-    RBKT:
+    LESS_THAN: <
-      tap: "]"
+    LPAR: (
-      shifted: "}"
+    LT: <
-    RIGHT_BRACE: "}"
+    MINUS: "-"
-    RBRC: "}"
+    NON_US_BACKSLASH: \
-    GRAVE:
+    NON_US_BSLH: "|"
-      tap: "`"
-      shifted: "~"
-    TILDE: "~"
     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: "~"
-
+    UNDER: _
-    # Numbers
+    UNDERSCORE: _
-    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
   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: []