From 77fed4063b29ebb06c8b8e9c14877ca673616a77 Mon Sep 17 00:00:00 2001 From: englmaxi Date: Sun, 15 Sep 2024 16:12:36 +0200 Subject: [PATCH] Keymap update --- config/keymap/behaviors.dtsi | 82 ++++++++++++++++-- config/keymap/combos.dtsi | 14 ++-- config/keymap/keymap.dtsi | 61 +++++++------- config/keymap/macros.dtsi | 33 ++++++++ config/west.yml | 11 ++- keymap-drawer/akohekohe.svg | 129 +++++++++++++++++++--------- keymap-drawer/akohekohe.yaml | 45 +++++----- keymap-drawer/config.yaml | 158 +++++++++++++++++------------------ keymap-drawer/rommana.svg | 129 +++++++++++++++++++--------- keymap-drawer/rommana.yaml | 45 +++++----- keymap-drawer/sweep.svg | 129 +++++++++++++++++++--------- keymap-drawer/sweep.yaml | 45 +++++----- 12 files changed, 570 insertions(+), 311 deletions(-) diff --git a/config/keymap/behaviors.dtsi b/config/keymap/behaviors.dtsi index 422b08b..e81b3a7 100644 --- a/config/keymap/behaviors.dtsi +++ b/config/keymap/behaviors.dtsi @@ -1,3 +1,6 @@ +#include +#include + // overwrites &caps_word { continue-list = ; @@ -15,7 +18,6 @@ < { flavor = "balanced"; - quick-tap-ms = <220>; }; @@ -25,8 +27,8 @@ lt_del: layer_tap_del { compatible = "zmk,behavior-hold-tap"; #binding-cells = <2>; - flavor = "tap-preferred"; - tapping-term-ms = <200>; + flavor = "balanced"; + tapping-term-ms = <220>; quick-tap-ms = <220>; bindings = <&mo>, <&bspc_del>; }; @@ -34,12 +36,20 @@ lt_qt: layer_tap_qt { compatible = "zmk,behavior-hold-tap"; #binding-cells = <2>; - flavor = "tap-preferred"; - tapping-term-ms = <200>; + flavor = "balanced"; + tapping-term-ms = <220>; quick-tap-ms = <220>; bindings = <&mo>, <&qt_grv>; }; + lt_e: layer_tap_ad_e { + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + flavor = "balanced"; + tapping-term-ms = <220>; + bindings = <&mo>, <&ad_e>; + }; + ht_qu: hold_tap_qu { compatible = "zmk,behavior-hold-tap"; #binding-cells = <2>; @@ -70,6 +80,7 @@ behaviors { HM(hml, &kp, KEYS_R) HM(hml_hwu, &kp, KEYS_R, hold-while-undecided;) + HM(hml_m, &mkp, KEYS_R) HM(hmr, &kp, KEYS_L) HM(hmr_hwu, &kp, KEYS_L, hold-while-undecided;) }; @@ -128,8 +139,8 @@ SM(rbrc_gt, &kp DE_RBRC, &kp DE_GT) SM(brc_lgt, &brc_macro, &lgt_macro) - GM(p_tab_desk, &kp LC(LS(TAB)), &kp LC(LG(LEFT))) - GM(n_tab_desk, &kp LC(TAB), &kp LC(LG(RIGHT))) + SM(p_tab_desk, &kp LC(LS(TAB)), &kp LC(LG(LEFT))) + SM(n_tab_desk, &kp LC(TAB), &kp LC(LG(RIGHT))) MASKED(left_masked, (MOD_RSFT|MOD_LSFT), &kp LEFT) MASKED(u_masked, (MOD_RSFT|MOD_LSFT), &kp U) @@ -155,12 +166,16 @@ TD(bts_2, &bts 2, &bt BT_DISC 2) TD(kns_lock, &kp CLCK, &kp KP_NLCK, &kp SLCK) + + TD(pp_n, &kp C_PP, &kp C_NEXT) + + TD(close_reopen, &mt LA(F4) LC(W), &kp LC(LS(T))) }; }; -// swapper +// tri-state / { behaviors { alt_tabber: swapper { @@ -168,6 +183,57 @@ #binding-cells = <0>; bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>; ignored-key-positions = ; // arrow keys + timeout-ms = <5000>; + }; + }; + + behaviors { + sel_word: sel_word { + compatible = "zmk,behavior-tri-state"; + #binding-cells = <0>; + bindings = <&sel_word_base>, <&kp LS(LC(RIGHT))>, <&none>; + tap-ms = <0>; + }; + }; + + behaviors { + sel_line: sel_line { + compatible = "zmk,behavior-tri-state"; + #binding-cells = <0>; + bindings = <&sel_line_base>, <&sel_line_next>, <&none>; + tap-ms = <0>; + }; + }; +}; + +// antecedent-morph +/ { + behaviors { + ad_u: adaptive_u { + compatible = "zmk,behavior-antecedent-morph"; + #binding-cells = <0>; + defaults = <&kp U>; + bindings = <&kp DE_EQUAL>, <&kp DE_EQUAL>; + antecedents = ; + max-delay-ms = <1000>; + }; + + ad_comma: adaptive_comma { + compatible = "zmk,behavior-antecedent-morph"; + #binding-cells = <0>; + defaults = <&kp DE_COMMA>; + bindings = <&kp DE_EQUAL>; + antecedents = ; + max-delay-ms = <1000>; + }; + + ad_e: adaptive_e { + compatible = "zmk,behavior-antecedent-morph"; + #binding-cells = <0>; + defaults = <&kp E>; + bindings = <&kp DE_GT>, <&kp DE_GT>, <&kp DE_GT>; + antecedents = ; + max-delay-ms = <1000>; }; }; }; diff --git a/config/keymap/combos.dtsi b/config/keymap/combos.dtsi index ef25594..5d04b28 100644 --- a/config/keymap/combos.dtsi +++ b/config/keymap/combos.dtsi @@ -28,8 +28,8 @@ bindings = ; \ key-positions = ; \ layers = ; \ - require-prior-idle-ms = <150>; \ - __VA_ARGS__ \ + require-prior-idle-ms = <150>; \ + __VA_ARGS__ \ }; #define COMBO_TERM_FAST 30 @@ -61,11 +61,11 @@ COMBO(bslh, &kp DE_BSLH, LM2 LB2 , DEF, COMBO_TERM_FAST) COMBO(euro, &kp DE_EURO, LM3 LB3 , DEF, COMBO_TERM_FAST) - COMBO(plus, &kp DE_PLUS, RT1 RM1 , DEF, COMBO_TERM_FAST) - COMBO(star, &kp DE_STAR, RT2 RM2 , DEF, COMBO_TERM_FAST) + COMBO(plus, &kp DE_PLUS, RT1 RM1 , DEF NUM, COMBO_TERM_FAST) + COMBO(star, &kp DE_STAR, RT2 RM2 , DEF NUM, COMBO_TERM_FAST) COMBO(amps, &kp DE_AMPS, RT3 RM3 , DEF, COMBO_TERM_FAST) - COMBO(minus, &kp DE_MINUS, RM1 RB1 , DEF, COMBO_TERM_FAST) - COMBO(fslh, &kp DE_FSLH, RM2 RB2 , DEF, COMBO_TERM_FAST) + COMBO(minus, &kp DE_MINUS, RM1 RB1 , DEF NUM, COMBO_TERM_FAST) + COMBO(fslh, &kp DE_FSLH, RM2 RB2 , DEF NUM, COMBO_TERM_FAST) COMBO(pipe, &kp DE_PIPE, RM3 RB3 , DEF, COMBO_TERM_FAST) COMBO(z, &kp DE_Z, LB3 LB2 , DEF, COMBO_TERM_MID) @@ -93,5 +93,7 @@ COMBO(undo, &kp U_UND, LB3 LB2 , NAV, COMBO_TERM_MID) COMBO(redo, &kp U_RDO, LB2 LB1 , NAV, COMBO_TERM_MID) + + COMBO(mute, &kp C_MUTE, LT3 LT2 , NUM, COMBO_TERM_MID) }; }; diff --git a/config/keymap/keymap.dtsi b/config/keymap/keymap.dtsi index 1a38ba8..557c113 100644 --- a/config/keymap/keymap.dtsi +++ b/config/keymap/keymap.dtsi @@ -4,9 +4,6 @@ * SPDX-License-Identifier: MIT */ -#include -#include - #include #include #include @@ -23,13 +20,13 @@ #define INT 4 #define CT(KEY) &mt LC(KEY) KEY -#define CLOSE &mt LA(F4) LC(W) #define MEH LC(LS(LALT)) #define HYPER LC(LS(LA(LGUI))) #define U_RDO LC(DE_Y) #define U_PST LC(V) +#define U_PST_P LS(LC(V)) #define U_CPY LC(C) #define U_CUT LC(X) #define U_UND LC(DE_Z) @@ -55,14 +52,14 @@ default_layer { display-name = "DEF"; bindings = ; }; @@ -70,30 +67,30 @@ navigation_layer { display-name = "NAV"; bindings = ; }; number_layer { display-name = "NUM"; bindings = ; }; @@ -105,7 +102,7 @@ // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼────────────────┼─────────────┤ &bootloader, &kp F4, &kp F5, &kp F6, &kp F10, &out OUT_USB, &bts_0, &bts_1, &bts_2, &bootloader, \ // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼────────────────┼─────────────┤ - &none, &kp F1, &kp F2, &kp F3, &none, &none, &kns_lock, &kp PSCRN, &kp PAUSE_BREAK, &none, \ + &none, &kp F1, &kp F2, &kp F3, &none, &none, &kns_lock, &r_mods, &soft_off, &none, \ // ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┴────────────────┴─────────────╯ &none, &none, &none, &none // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ @@ -125,6 +122,6 @@ &trans, &trans, &trans, &trans \ // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ )>; - }; + }; }; }; diff --git a/config/keymap/macros.dtsi b/config/keymap/macros.dtsi index 81893ab..df0b033 100644 --- a/config/keymap/macros.dtsi +++ b/config/keymap/macros.dtsi @@ -25,6 +25,39 @@ , <&u_masked>; ) + ZMK_MACRO(r_mods, + bindings + = <¯o_release> + , <&kp LGUI &kp RGUI> + , <&kp LALT &kp RALT> + , <&kp LCTRL &kp RCTRL> + , <&kp LSHIFT &kp RSHIFT>; + ) + + ZMK_MACRO(sel_word_base, + wait-ms = <0>; + tap-ms = <0>; + bindings + = <&kp LC(RIGHT)> + , <&kp LC(LEFT)>; + ) + + ZMK_MACRO(sel_line_base, + wait-ms = <0>; + tap-ms = <0>; + bindings + = <&kp HOME> + , <&kp LS(END)>; + ) + + ZMK_MACRO(sel_line_next, + wait-ms = <1>; + tap-ms = <1>; + bindings + = <&kp LS(DOWN)> + , <&kp LS(HOME)>; + ) + ZMK_MACRO1(bts, bindings = <&out OUT_BLE> diff --git a/config/west.yml b/config/west.yml index 19ad775..22b0966 100644 --- a/config/west.yml +++ b/config/west.yml @@ -4,10 +4,12 @@ manifest: url-base: https://github.com/zmkfirmware - name: caksoylar url-base: https://github.com/caksoylar - - name: dhruvinsh - url-base: https://github.com/dhruvinsh + - name: urob + url-base: https://github.com/urob - name: englmaxi url-base: https://github.com/englmaxi + - name: ssbb + url-base: https://github.com/ssbb projects: - name: zmk remote: zmkfirmware @@ -19,10 +21,13 @@ manifest: remote: caksoylar revision: main - name: zmk-tri-state - remote: dhruvinsh + remote: urob revision: main - name: zmk-dongle-display remote: englmaxi revision: main + - name: zmk-antecedent-morph + remote: ssbb + revision: main self: path: config diff --git a/keymap-drawer/akohekohe.svg b/keymap-drawer/akohekohe.svg index bd550bc..ff68497 100644 --- a/keymap-drawer/akohekohe.svg +++ b/keymap-drawer/akohekohe.svg @@ -30,9 +30,15 @@ + + + + + + @@ -72,6 +78,9 @@ + + + @@ -90,6 +99,9 @@ + + + @@ -99,17 +111,26 @@ + + + + + + - - + + + + + @@ -117,6 +138,9 @@ + + + @@ -470,6 +494,7 @@ rect.held, rect.combo.held { C +RALT @@ -496,6 +521,7 @@ rect.held, rect.combo.held { . +RALT : @@ -645,18 +671,19 @@ rect.held, rect.combo.held { - + + - - + + @@ -686,31 +713,31 @@ rect.held, rect.combo.held { - - - - -ALT - + + + + +ALT +4 - - - - - + + + + + +5 - - + + -RALT - + @@ -734,10 +761,11 @@ rect.held, rect.combo.held { - - - -INS + + + + + @@ -801,12 +829,13 @@ rect.held, rect.combo.held { - + - + + @@ -887,17 +916,19 @@ rect.held, rect.combo.held { - +INS - + +PauseBreak + - + @@ -914,15 +945,34 @@ rect.held, rect.combo.held { 3 - - - - + + + + + ++ + + + +* + + + +- + + + +/ + + + + + @@ -1045,17 +1095,16 @@ rect.held, rect.combo.held { - - - - + + + + + - -PauseBreak - + diff --git a/keymap-drawer/akohekohe.yaml b/keymap-drawer/akohekohe.yaml index a4068c9..6e9330f 100644 --- a/keymap-drawer/akohekohe.yaml +++ b/keymap-drawer/akohekohe.yaml @@ -18,33 +18,33 @@ layers: - {t: A, h: '$$mdi:apple-keyboard-control$$'} - {t: I, h: ALT} - {t: O, h: '$$mdi:microsoft-windows$$'} - - C + - {t: C, h: RALT} - G - D - M - {t: ',', s: ;} - - {t: ., s: ':'} + - {t: ., h: RALT, s: ':'} - {t: '$$mdi:keyboard-space$$', h: NAV} - {t: E, h: NUM} NAV: - {t: '$$mdi:arrow-left-bold-box$$', s: '$$mdi:arrow-left-bold-box-outline$$'} - - $$mdi:swap-horizontal$$ - {t: '$$mdi:arrow-right-bold-box$$', s: '$$mdi:arrow-right-bold-box-outline$$'} - - $$mdi:close-box-outline$$ + - $$mdi:swap-horizontal$$ + - {t: '$$mdi:close-box-outline$$', s: '$$mdi:open-in-new$$'} - Page Up - {t: HOME, h: '$$mdi:format-vertical-align-top$$'} - $$mdi:arrow-up$$ - {t: END, h: '$$mdi:format-vertical-align-bottom$$'} - - {t: '$$mdi:microsoft-windows$$', h: '$$mdi:circle-small$$'} - - {t: ALT, h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:circle-small$$'} - - {t: RALT, h: '$$mdi:circle-small$$'} + - $$mdi:microsoft-windows$$ + - {t: '$$mdi:cursor-default-click-outline$$', h: ALT, s: '4', type: text_with_symbol} + - {t: '$$mdi:cursor-default-click-outline$$', h: '$$mdi:apple-keyboard-control$$', s: '5', type: text_with_symbol} + - {t: '$$mdi:text-search$$', h: '$$mdi:apple-keyboard-shift$$'} + - $$mdi:select-all$$ - Page Down - $$mdi:arrow-left$$ - $$mdi:arrow-down$$ - $$mdi:arrow-right$$ - - INS + - {t: '$$mdi:select-compare$$', s: '$$mdi:arrow-right-thin$$', type: text_with_symbol} - $$mdi:content-cut$$ - $$mdi:content-copy$$ - $$mdi:content-paste$$ @@ -55,8 +55,8 @@ layers: - {t: '$$mdi:keyboard-return$$', h: NUM} NUM: - $$mdi:volume-minus$$ - - $$mdi:volume-mute$$ - $$mdi:volume-plus$$ + - {t: '$$mdi:play-pause$$', s: '$$mdi:skip-forward$$'} - $$tabler:brightness-up$$ - {t: ., s: ':'} - '7' @@ -72,13 +72,13 @@ layers: - '5' - '6' - $$mdi:keyboard-return$$ - - $$mdi:skip-backward$$ - - $$mdi:play-pause$$ - - $$mdi:skip-forward$$ + - INS + - Pause Break + - $$mdi:monitor-screenshot$$ - '1' - '2' - '3' - - {t: '$$mdi:chevron-down$$', type: trans} + - {type: held} - {type: held} FUN: - F7 @@ -103,8 +103,8 @@ layers: - F2 - F3 - $$mdi:apple-keyboard-caps$$ - - $$mdi:monitor-screenshot$$ - - Pause Break + - {t: '$$mdi:keyboard-variant$$', s: '$$mdi:arrow-up-bold$$', type: text_with_symbol} + - $$mdi:power$$ - {type: held} - {type: held} INT: @@ -167,19 +167,19 @@ combos: l: [DEF] - p: [5, 14] k: + - l: [DEF] + l: [DEF, NUM] - p: [6, 15] k: '*' - l: [DEF] + l: [DEF, NUM] - p: [7, 16] k: '&' l: [DEF] - p: [14, 21] k: '-' - l: [DEF] + l: [DEF, NUM] - p: [15, 22] k: / - l: [DEF] + l: [DEF, NUM] - p: [16, 23] k: '|' l: [DEF] @@ -256,3 +256,6 @@ combos: - p: [19, 20] k: $$mdi:redo$$ l: [NAV] +- p: [0, 1] + k: $$mdi:volume-mute$$ + l: [NUM] diff --git a/keymap-drawer/config.yaml b/keymap-drawer/config.yaml index 71aa232..5564a3a 100644 --- a/keymap-drawer/config.yaml +++ b/keymap-drawer/config.yaml @@ -82,6 +82,7 @@ parse_config: '&sys_reset': $$mdi:backup-restore$$ '&bootloader': $$mdi:progress-download$$ '&studio_unlock': $$mdi:lock-open-outline$$ + '&soft_off': $$mdi:power$$ '&hml LA(LCTRL) TAB': $$mdi:keyboard-tab$$ '&hml_repeat LS(LCTRL) 0': $$mdi:repeat$$ '&key_repeat': $$mdi:repeat$$ @@ -94,41 +95,10 @@ parse_config: '&par_macro': '()' '&bkt_macro': '{}' '&lgt_macro': '<>' - - '&kp LC(BSPC)': $$mdi:backspace$$ - '&kp LC(DEL)': $$mdi:backspace-reverse$$ - '&kp LS(TAB)': $$mdi:keyboard-tab-reverse$$ - - '&kp LC(TAB)': $$mdi:arrow-right-bold-box$$ - '&kp LC(LS(TAB))': $$mdi:arrow-left-bold-box$$ - '&kp LC(LG(LEFT))': $$mdi:arrow-left-bold-box-outline$$ - '&kp LC(LG(RIGHT))': $$mdi:arrow-right-bold-box-outline$$ - - '&kp LC(LS(LALT))': $$mdi:star-three-points-outline$$ - '&kp LC(LS(LA(LGUI)))': $$mdi:star-four-points-outline$$ - '&kp LC(HOME)': $$mdi:format-vertical-align-top$$ - '&kp LC(END)': $$mdi:format-vertical-align-bottom$$ - - '&kp LC(INS)': $$mdi:content-copy$$ - '&kp LC(C)': $$mdi:content-copy$$ - '&kp LS(INS)': $$mdi:content-paste$$ - '&kp LC(V)': $$mdi:content-paste$$ - '&kp LS(DEL)': $$mdi:content-cut$$ - '&kp LC(X)': $$mdi:content-cut$$ - '&kp LC(DE_Z)': $$mdi:undo$$ - '&kp LC(DE_Y)': $$mdi:redo$$ - '&kp LC(LS(DE_Z))': $$mdi:redo$$ - - '&kp LC(F)': $$mdi:text-search$$ - '&kp LC(W)': $$mdi:close-box-outline$$ - '&kp LA(F4)': $$mdi:close-box-outline$$ - - '&kp LC(DE_PLUS)': $$mdi:magnify-plus-outline$$ - '&kp LC(DE_MINUS)': $$mdi:magnify-minus-outline$$ - '&kp LC(N0)': $$mdi:magnify-remove-outline$$ - - '&kp LG(L)': $$mdi:lock-outline$$ + '&ad_u': 'U' + + '&mt LS(LC(V)) LC(V)': $$mdi:content-paste$$ '&td_sqt_dqt': tap: "'" @@ -137,6 +107,10 @@ parse_config: '&kp DE_COMMA': tap: ',' shifted: ';' + + '&ad_comma': + tap: ',' + shifted: ';' '&kp DE_DOT': tap: '.' @@ -145,6 +119,10 @@ parse_config: '&ht_qu Q 0': tap: 'QU' hold: 'Q' + + '<_e NUM E': + tap: 'E' + hold: 'NUM' '&out OUT_BLE': $$mdi:bluetooth$$ '&out OUT_USB': $$mdi:usb$$ @@ -158,26 +136,6 @@ parse_config: tap: $$mdi:bluetooth$$ shifted: $$mdi:close-thick$$ type: text_with_symbol - '&bts 0': - tap: $$mdi:bluetooth-connect$$ - shifted: '0' - type: text_with_symbol - '&bts 1': - tap: $$mdi:bluetooth-connect$$ - shifted: '1' - type: text_with_symbol - '&bts 2': - tap: $$mdi:bluetooth-connect$$ - shifted: '2' - type: text_with_symbol - '&bts 3': - tap: $$mdi:bluetooth-connect$$ - shifted: '3' - type: text_with_symbol - '&bts 4': - tap: $$mdi:bluetooth-connect$$ - shifted: '4' - type: text_with_symbol '&bts_0': tap: $$mdi:bluetooth-connect$$ shifted: '0' @@ -198,26 +156,6 @@ parse_config: tap: $$mdi:bluetooth-connect$$ shifted: '4' type: text_with_symbol - '&bt BT_DISC 0': - tap: $$mdi:bluetooth-off$$ - shifted: '0' - type: text_with_symbol - '&bt BT_DISC 1': - tap: $$mdi:bluetooth-off$$ - shifted: '1' - type: text_with_symbol - '&bt BT_DISC 2': - tap: $$mdi:bluetooth-off$$ - shifted: '2' - type: text_with_symbol - '&bt BT_DISC 3': - tap: $$mdi:bluetooth-off$$ - shifted: '3' - type: text_with_symbol - '&bt BT_DISC 4': - tap: $$mdi:bluetooth-off$$ - shifted: '4' - type: text_with_symbol '&mkp LCLK': $$mdi:cursor-default-click-outline$$ '&mkp RCLK': $$mdi:cursor-default-click$$ @@ -234,6 +172,18 @@ parse_config: shifted: 5 type: text_with_symbol + '&hml_m LALT MB4': + tap: $$mdi:cursor-default-click-outline$$ + shifted: 4 + hold: 'ALT' + type: text_with_symbol + + '&hml_m LCTRL MB5': + tap: $$mdi:cursor-default-click-outline$$ + shifted: 5 + hold: $$mdi:apple-keyboard-control$$ + type: text_with_symbol + '&tb_mo_scroll': tap: $$mdi:billiards$$ shifted: $$mdi:arrow-up-down$$ @@ -266,6 +216,24 @@ parse_config: shifted: $$mdi:help-circle-outline$$ type: text_with_symbol + '&pp_n': + tap: $$mdi:play-pause$$ + shifted: $$mdi:skip-forward$$ + + '&close_reopen': + tap: $$mdi:close-box-outline$$ + shifted: $$mdi:open-in-new$$ + + '&sel_word': + tap: $$mdi:select-compare$$ + shifted: $$mdi:arrow-right-thin$$ + type: text_with_symbol + + '&r_mods': + tap: $$mdi:keyboard-variant$$ + shifted: $$mdi:arrow-up-bold$$ + type: text_with_symbol + '&ind_bat': $$mdi:battery-heart-outline$$ zmk_combos: @@ -286,6 +254,42 @@ parse_config: draw_separate: true zmk_keycode_map: + LC(BSPC): $$mdi:backspace$$ + LC(DEL): $$mdi:backspace-reverse$$ + LS(TAB): $$mdi:keyboard-tab-reverse$$ + + LC(TAB): $$mdi:arrow-right-bold-box$$ + LC(LS(TAB)): $$mdi:arrow-left-bold-box$$ + + LC(LG(LEFT)): $$mdi:arrow-left-bold-box-outline$$ + LC(LG(RIGHT)): $$mdi:arrow-right-bold-box-outline$$ + + LC(LS(LALT)): $$mdi:star-three-points-outline$$ + LC(LS(LA(LGUI))): $$mdi:star-four-points-outline$$ + LC(HOME): $$mdi:format-vertical-align-top$$ + LC(END): $$mdi:format-vertical-align-bottom$$ + + LC(INS): $$mdi:content-copy$$ + LC(C): $$mdi:content-copy$$ + LS(INS): $$mdi:content-paste$$ + LC(V): $$mdi:content-paste$$ + LS(DEL): $$mdi:content-cut$$ + LC(X): $$mdi:content-cut$$ + LC(DE_Z): $$mdi:undo$$ + LC(DE_Y): $$mdi:redo$$ + LC(LS(DE_Z)): $$mdi:redo$$ + + LC(A): $$mdi:select-all$$ + LC(F): $$mdi:text-search$$ + LC(W): $$mdi:close-box-outline$$ + LA(F4)': $$mdi:close-box-outline$$ + + LC(DE_PLUS)': $$mdi:magnify-plus-outline$$ + LC(DE_MINUS)': $$mdi:magnify-minus-outline$$ + LC(N0)': $$mdi:magnify-remove-outline$$ + + LG(L)': $$mdi:lock-outline$$ + LALT: ALT SPACE: $$mdi:keyboard-space$$ @@ -342,8 +346,6 @@ parse_config: C_BRI_UP: $$tabler:brightness-up$$ C_BRI_DN: $$tabler:brightness-down$$ - # C_BRI_UP: $$mdi:brightness-5$$ - # C_BRI_DN: $$mdi:brightness-4$$ C_POWER: $$mdi:power$$ C_SLEEP: $$mdi:power-sleep$$ @@ -357,9 +359,6 @@ parse_config: PG_UP: Page Up PG_DN: Page Down - # HOME: $$mdi:format-horizontal-align-left$$ - # END: $$mdi:format-horizontal-align-right$$ - SECT: '§' DEG: '°' EURO: '€' @@ -438,3 +437,4 @@ parse_config: NON_US_HASH: '#' NUHS: '#' TILDE2: '~' + \ No newline at end of file diff --git a/keymap-drawer/rommana.svg b/keymap-drawer/rommana.svg index 344f668..8a2b93a 100644 --- a/keymap-drawer/rommana.svg +++ b/keymap-drawer/rommana.svg @@ -30,9 +30,15 @@ + + + + + + @@ -72,6 +78,9 @@ + + + @@ -90,6 +99,9 @@ + + + @@ -99,17 +111,26 @@ + + + + + + - - + + + + + @@ -117,6 +138,9 @@ + + + @@ -481,6 +505,7 @@ rect.held, rect.combo.held { C +RALT @@ -507,6 +532,7 @@ rect.held, rect.combo.held { . +RALT : @@ -672,18 +698,19 @@ rect.held, rect.combo.held { - + + - - + + @@ -717,31 +744,31 @@ rect.held, rect.combo.held { - - - - -ALT - + + + + +ALT +4 - - - - - + + + + + +5 - - + + -RALT - + @@ -765,10 +792,11 @@ rect.held, rect.combo.held { - - - -INS + + + + + @@ -846,12 +874,13 @@ rect.held, rect.combo.held { - + - + + @@ -937,17 +966,19 @@ rect.held, rect.combo.held { - +INS - + +PauseBreak + - + @@ -969,10 +1000,9 @@ rect.held, rect.combo.held { - - - - + + + @@ -983,6 +1013,26 @@ rect.held, rect.combo.held { + + ++ + + + +* + + + +- + + + +/ + + + + + @@ -1113,17 +1163,16 @@ rect.held, rect.combo.held { - - - - + + + + + - -PauseBreak - + diff --git a/keymap-drawer/rommana.yaml b/keymap-drawer/rommana.yaml index 070a28f..aa2d982 100644 --- a/keymap-drawer/rommana.yaml +++ b/keymap-drawer/rommana.yaml @@ -21,12 +21,12 @@ layers: - {t: A, h: '$$mdi:apple-keyboard-control$$'} - {t: I, h: ALT} - {t: O, h: '$$mdi:microsoft-windows$$'} - - C + - {t: C, h: RALT} - G - D - M - {t: ',', s: ;} - - {t: ., s: ':'} + - {t: ., h: RALT, s: ':'} - {t: '$$mdi:backspace-outline$$', s: '$$mdi:backspace-reverse-outline$$'} - {t: '$$mdi:keyboard-space$$', h: NAV} - {t: E, h: NUM} @@ -34,24 +34,24 @@ layers: NAV: - '' - {t: '$$mdi:arrow-left-bold-box$$', s: '$$mdi:arrow-left-bold-box-outline$$'} - - $$mdi:swap-horizontal$$ - {t: '$$mdi:arrow-right-bold-box$$', s: '$$mdi:arrow-right-bold-box-outline$$'} - - $$mdi:close-box-outline$$ + - $$mdi:swap-horizontal$$ + - {t: '$$mdi:close-box-outline$$', s: '$$mdi:open-in-new$$'} - Page Up - {t: HOME, h: '$$mdi:format-vertical-align-top$$'} - $$mdi:arrow-up$$ - {t: END, h: '$$mdi:format-vertical-align-bottom$$'} - '' - - {t: '$$mdi:microsoft-windows$$', h: '$$mdi:circle-small$$'} - - {t: ALT, h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:circle-small$$'} - - {t: RALT, h: '$$mdi:circle-small$$'} + - $$mdi:microsoft-windows$$ + - {t: '$$mdi:cursor-default-click-outline$$', h: ALT, s: '4', type: text_with_symbol} + - {t: '$$mdi:cursor-default-click-outline$$', h: '$$mdi:apple-keyboard-control$$', s: '5', type: text_with_symbol} + - {t: '$$mdi:text-search$$', h: '$$mdi:apple-keyboard-shift$$'} + - $$mdi:select-all$$ - Page Down - $$mdi:arrow-left$$ - $$mdi:arrow-down$$ - $$mdi:arrow-right$$ - - INS + - {t: '$$mdi:select-compare$$', s: '$$mdi:arrow-right-thin$$', type: text_with_symbol} - $$mdi:content-cut$$ - $$mdi:content-copy$$ - $$mdi:content-paste$$ @@ -65,8 +65,8 @@ layers: NUM: - '' - $$mdi:volume-minus$$ - - $$mdi:volume-mute$$ - $$mdi:volume-plus$$ + - {t: '$$mdi:play-pause$$', s: '$$mdi:skip-forward$$'} - $$tabler:brightness-up$$ - {t: ., s: ':'} - '7' @@ -83,14 +83,14 @@ layers: - '5' - '6' - $$mdi:keyboard-return$$ - - $$mdi:skip-backward$$ - - $$mdi:play-pause$$ - - $$mdi:skip-forward$$ + - INS + - Pause Break + - $$mdi:monitor-screenshot$$ - '1' - '2' - '3' - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} + - {type: held} - {type: held} - {t: '$$mdi:chevron-down$$', type: trans} FUN: @@ -118,8 +118,8 @@ layers: - F2 - F3 - $$mdi:apple-keyboard-caps$$ - - $$mdi:monitor-screenshot$$ - - Pause Break + - {t: '$$mdi:keyboard-variant$$', s: '$$mdi:arrow-up-bold$$', type: text_with_symbol} + - $$mdi:power$$ - '' - {type: held} - {type: held} @@ -188,19 +188,19 @@ combos: l: [DEF] - p: [6, 16] k: + - l: [DEF] + l: [DEF, NUM] - p: [7, 17] k: '*' - l: [DEF] + l: [DEF, NUM] - p: [8, 18] k: '&' l: [DEF] - p: [16, 23] k: '-' - l: [DEF] + l: [DEF, NUM] - p: [17, 24] k: / - l: [DEF] + l: [DEF, NUM] - p: [18, 25] k: '|' l: [DEF] @@ -277,3 +277,6 @@ combos: - p: [21, 22] k: $$mdi:redo$$ l: [NAV] +- p: [1, 2] + k: $$mdi:volume-mute$$ + l: [NUM] diff --git a/keymap-drawer/sweep.svg b/keymap-drawer/sweep.svg index 7763626..90e1d3e 100644 --- a/keymap-drawer/sweep.svg +++ b/keymap-drawer/sweep.svg @@ -30,9 +30,15 @@ + + + + + + @@ -72,6 +78,9 @@ + + + @@ -90,6 +99,9 @@ + + + @@ -99,9 +111,15 @@ + + + + + + @@ -111,8 +129,11 @@ - - + + + + + @@ -120,6 +141,9 @@ + + + @@ -489,6 +513,7 @@ rect.held, rect.combo.held { C +RALT @@ -525,6 +550,7 @@ rect.held, rect.combo.held { . +RALT : @@ -696,18 +722,19 @@ rect.held, rect.combo.held { - + + - - + + @@ -741,31 +768,31 @@ rect.held, rect.combo.held { - - - - -ALT - + + + + +ALT +4 - - - - - + + + + + +5 - - + + -RALT - + @@ -789,10 +816,11 @@ rect.held, rect.combo.held { - - - -INS + + + + + @@ -888,12 +916,13 @@ rect.held, rect.combo.held { - + - + + @@ -983,17 +1012,19 @@ rect.held, rect.combo.held { - +INS - + +PauseBreak + - + @@ -1029,10 +1060,9 @@ rect.held, rect.combo.held { - - - - + + + @@ -1043,6 +1073,26 @@ rect.held, rect.combo.held { + + ++ + + + +* + + + +- + + + +/ + + + + + @@ -1185,17 +1235,16 @@ rect.held, rect.combo.held { - - - - + + + + + - -PauseBreak - + diff --git a/keymap-drawer/sweep.yaml b/keymap-drawer/sweep.yaml index 39ab8d3..0e17318 100644 --- a/keymap-drawer/sweep.yaml +++ b/keymap-drawer/sweep.yaml @@ -21,14 +21,14 @@ layers: - {t: I, h: ALT} - {t: O, h: '$$mdi:microsoft-windows$$'} - Z - - C + - {t: C, h: RALT} - G - D - Q - $$mdi:repeat$$ - M - {t: ',', s: ;} - - {t: ., s: ':'} + - {t: ., h: RALT, s: ':'} - {t: '?', s: '!'} - {t: '$$mdi:backspace-outline$$', s: '$$mdi:backspace-reverse-outline$$'} - {t: '$$mdi:keyboard-space$$', h: NAV} @@ -37,24 +37,24 @@ layers: NAV: - '' - {t: '$$mdi:arrow-left-bold-box$$', s: '$$mdi:arrow-left-bold-box-outline$$'} - - $$mdi:swap-horizontal$$ - {t: '$$mdi:arrow-right-bold-box$$', s: '$$mdi:arrow-right-bold-box-outline$$'} - - $$mdi:close-box-outline$$ + - $$mdi:swap-horizontal$$ + - {t: '$$mdi:close-box-outline$$', s: '$$mdi:open-in-new$$'} - Page Up - {t: HOME, h: '$$mdi:format-vertical-align-top$$'} - $$mdi:arrow-up$$ - {t: END, h: '$$mdi:format-vertical-align-bottom$$'} - '' - - {t: '$$mdi:microsoft-windows$$', h: '$$mdi:circle-small$$'} - - {t: ALT, h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:circle-small$$'} - - {t: RALT, h: '$$mdi:circle-small$$'} + - $$mdi:microsoft-windows$$ + - {t: '$$mdi:cursor-default-click-outline$$', h: ALT, s: '4', type: text_with_symbol} + - {t: '$$mdi:cursor-default-click-outline$$', h: '$$mdi:apple-keyboard-control$$', s: '5', type: text_with_symbol} + - {t: '$$mdi:text-search$$', h: '$$mdi:apple-keyboard-shift$$'} + - $$mdi:select-all$$ - Page Down - $$mdi:arrow-left$$ - $$mdi:arrow-down$$ - $$mdi:arrow-right$$ - - INS + - {t: '$$mdi:select-compare$$', s: '$$mdi:arrow-right-thin$$', type: text_with_symbol} - $$mdi:undo$$ - $$mdi:content-cut$$ - $$mdi:content-copy$$ @@ -72,8 +72,8 @@ layers: NUM: - '' - $$mdi:volume-minus$$ - - $$mdi:volume-mute$$ - $$mdi:volume-plus$$ + - {t: '$$mdi:play-pause$$', s: '$$mdi:skip-forward$$'} - $$tabler:brightness-up$$ - {t: ., s: ':'} - '7' @@ -91,9 +91,9 @@ layers: - '6' - $$mdi:keyboard-return$$ - '' - - $$mdi:skip-backward$$ - - $$mdi:play-pause$$ - - $$mdi:skip-forward$$ + - INS + - Pause Break + - $$mdi:monitor-screenshot$$ - '' - {t: ',', s: ;} - '1' @@ -101,7 +101,7 @@ layers: - '3' - '' - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} + - {type: held} - {type: held} - {t: '$$mdi:chevron-down$$', type: trans} FUN: @@ -132,8 +132,8 @@ layers: - '' - '' - $$mdi:apple-keyboard-caps$$ - - $$mdi:monitor-screenshot$$ - - Pause Break + - {t: '$$mdi:keyboard-variant$$', s: '$$mdi:arrow-up-bold$$', type: text_with_symbol} + - $$mdi:power$$ - '' - '' - {type: held} @@ -207,19 +207,19 @@ combos: l: [DEF] - p: [6, 16] k: + - l: [DEF] + l: [DEF, NUM] - p: [7, 17] k: '*' - l: [DEF] + l: [DEF, NUM] - p: [8, 18] k: '&' l: [DEF] - p: [16, 26] k: '-' - l: [DEF] + l: [DEF, NUM] - p: [17, 27] k: / - l: [DEF] + l: [DEF, NUM] - p: [18, 28] k: '|' l: [DEF] @@ -296,3 +296,6 @@ combos: - p: [22, 23] k: $$mdi:redo$$ l: [NAV] +- p: [1, 2] + k: $$mdi:volume-mute$$ + l: [NUM]