diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 0000000..7b09ed2 --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,5 @@ +;;; Directory Local Variables -*- no-byte-compile: t -*- +;;; For more information see (info "(emacs) Directory Variables") + +((auto-mode-alist . (("\\.keymap\\'" . c-mode))) + (c-mode . ((tab-width . 4)))) diff --git a/config/cradio.keymap b/config/cradio.keymap index c3fde25..7eb5868 100644 --- a/config/cradio.keymap +++ b/config/cradio.keymap @@ -16,8 +16,6 @@ #define WNAV 3 #define NUM 4 #define FUN 5 -#define MODS 6 -#define FRA 7 #define VOL_DN C_VOL_DN #define VOL_UP C_VOL_UP @@ -51,7 +49,7 @@ hml: hml { compatible = "zmk,behavior-hold-tap"; flavor = "balanced"; - tapping-term-ms = <280>; + tapping-term-ms = <220>; quick-tap-ms = <175>; // repeat on tap-into-hold require-prior-idle-ms = <150>; #binding-cells = <2>; @@ -63,7 +61,7 @@ hmr: hmr { compatible = "zmk,behavior-hold-tap"; flavor = "balanced"; - tapping-term-ms = <280>; + tapping-term-ms = <220>; quick-tap-ms = <175>; // repeat on tap-into-hold require-prior-idle-ms = <150>; #binding-cells = <2>; @@ -71,6 +69,34 @@ hold-trigger-key-positions = ; hold-trigger-on-release; // delay positional check until key-release }; + + lpar_lt: lpar_lt { + compatible = "zmk,behavior-mod-morph"; + mods = <(MOD_LSFT | MOD_RSFT)>; + #binding-cells = <0>; + bindings = <&kp LPAR>, <&kp LT>; + }; + + rpar_gt: rpar_gt { + compatible = "zmk,behavior-mod-morph"; + mods = <(MOD_LSFT | MOD_RSFT)>; + #binding-cells = <0>; + bindings = <&kp RPAR>, <&kp GT>; + }; + + lbrc_lbkt: lbrc_lbkt { + compatible = "zmk,behavior-mod-morph"; + mods = <(MOD_LSFT | MOD_RSFT)>; + #binding-cells = <0>; + bindings = <&kp LBRC>, <&kp LBKT>; + }; + + rbrc_rbkt: rbrc_rbkt { + compatible = "zmk,behavior-mod-morph"; + mods = <(MOD_LSFT | MOD_RSFT)>; + #binding-cells = <0>; + bindings = <&kp RBRC>, <&kp RBKT>; + }; }; conditional_layers { @@ -83,12 +109,7 @@ combos { compatible = "zmk,combos"; - combo_clear { - timeout-ms = <25>; - key-positions = ; - bindings = <&kp K_CANCEL>; - layers = ; - }; + combo_escape { timeout-ms = <25>; key-positions = ; @@ -104,7 +125,7 @@ combo_tab { timeout-ms = <25>; key-positions = ; - bindings = << MODS TAB>; + bindings = <&kp TAB>; layers = ; }; @@ -122,31 +143,64 @@ layers = ; }; - combo_minus { + combo_lpar { timeout-ms = <40>; key-positions = ; + bindings = <&lpar_lt>; + layers = ; + }; + combo_rpar { + timeout-ms = <40>; + key-positions = ; + bindings = <&rpar_gt>; + layers = ; + }; + + combo_lbrc { + timeout-ms = <40>; + key-positions = ; + bindings = <&lbrc_lbkt>; + layers = ; + }; + combo_rbrc { + timeout-ms = <40>; + key-positions = ; + bindings = <&rbrc_rbkt>; + layers = ; + }; + + combo_minus { + timeout-ms = <40>; + key-positions = ; bindings = <&kp MINUS>; layers = ; }; combo_underscore { timeout-ms = <40>; - key-positions = ; + key-positions = ; bindings = <&kp UNDERSCORE>; layers = ; }; combo_colon { timeout-ms = <40>; - key-positions = ; + key-positions = ; bindings = <&kp COLON>; layers = ; }; combo_semi { timeout-ms = <40>; - key-positions = ; + key-positions = ; bindings = <&kp SEMI>; layers = ; }; + + combo_boot { + timeout-ms = <40>; + key-positions = ; + bindings = <&bootloader>; + layers = ; + }; }; keymap { @@ -170,7 +224,7 @@ sym { bindings = < - //╭──────────┬──────────┬──────────┬──────────┬──────────╮ ╭──────────┬──────────┬──────────┬──────────┬──────────╮ + //╭──────────┬──────────┬──────────┬──────────┬──────────╮ ╭──────────┬──────────┬──────────┬──────────┬──────────╮ //│ ~ │ & │ * │ + │ │ │ │ = │ \ │ | │ ` │ &kp TILDE &kp AMPS &kp STAR &kp PLUS &none &none &kp EQUAL &kp BSLH &kp PIPE &kp GRAVE //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ @@ -252,22 +306,5 @@ // ╰──────────┴──────────╯ ╰──────────┴──────────╯ >; }; - - mods { - bindings = < - //╭──────────┬──────────┬──────────┬──────────┬──────────╮ ╭──────────┬──────────┬──────────┬──────────┬──────────╮ - //│ │ │ │ │ │ │ │ │ │ │ │ - &bootloader &trans &trans &trans &trans &none &none &none &none &none - //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ - //│ - │ │ │ │ │ │ │ CTRL │ ALT │ CMD │ SHIFT │ - &trans &trans &trans &trans &trans &none &sk LCTRL &sk LALT &sk LCMD &sk LSHFT - //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ - //│ │ │ │ │ │ │ │ │ RALT │ │ │ - &trans &trans &trans &trans &trans &none &none &sk RALT &none &none - //╰──────────┴──────────┴──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┴──────────┴──────────╯ - &trans &trans &trans &trans - // ╰──────────┴──────────╯ ╰──────────┴──────────╯ - >; - }; }; }; diff --git a/keymap-drawer/config.yaml b/keymap-drawer/config.yaml index db6680d..60f0a3d 100644 --- a/keymap-drawer/config.yaml +++ b/keymap-drawer/config.yaml @@ -8,7 +8,7 @@ draw_config: key_ry: 6.0 dark_mode: false n_columns: 1 - separate_combo_diagrams: false + separate_combo_diagrams: true combo_diagrams_scale: 2 inner_pad_w: 2.0 inner_pad_h: 2.0 @@ -133,6 +133,21 @@ parse_config: tap: $$mdi:bluetooth-connect$$ shifted: '4' type: text_with_symblol + + '&bootloader': "BOOT" + + '&lpar_lt': + tap: "(" + hold: "<" + '&rpar_gt': + tap: ")" + hold: ">" + '&lbrc_lbkt': + tap: '{' + hold: '[' + '&rbrc_rbkt': + tap: '}' + hold: ']' sticky_label: $$mdi:circle-small$$ toggle_label: $$mdi:toggle-switch$$ tap_toggle_label: tap-toggle diff --git a/keymap-drawer/cradio.svg b/keymap-drawer/cradio.svg index 49c6fba..f428e98 100644 --- a/keymap-drawer/cradio.svg +++ b/keymap-drawer/cradio.svg @@ -1,4 +1,4 @@ - + /* start glyphs */ @@ -144,8 +144,8 @@ text.footer { paint-order: stroke; } -/* styling for combo tap, and key hold/shifted label text */ -text.combo, text.hold, text.shifted { +/* styling for combo tap, and key non-tap label text */ +text.combo, text.hold, text.shifted, text.left, text.right { font-size: 11px; } @@ -159,8 +159,20 @@ text.shifted { dominant-baseline: hanging; } +text.left { + text-anchor: start; +} + +text.right { + text-anchor: end; +} + +text.layer-activator { + text-decoration: underline; +} + /* styling for hold/shifted label text in combo box */ -text.combo.hold, text.combo.shifted { +text.combo.hold, text.combo.shifted, text.combo.left, text.combo.right { font-size: 8px; } @@ -252,14 +264,14 @@ rect.held, rect.combo.held { } -base: +base: - + Q - + W @@ -294,22 +306,22 @@ rect.held, rect.combo.held { U - + Y - + ' - + A - + R @@ -349,23 +361,23 @@ rect.held, rect.combo.held { E - + I - + O - + Z - + X @@ -400,89 +412,51 @@ rect.held, rect.combo.held { , - + . - + / - + -nav - - + +nav + + - + -num - - + +num + + -sym - - - -CANCEL - - - - - - - -= - - - - -mods - - - - - - - - - - - -- - - - -_ - - - -: - - - -; + +sym + - - -sym: + +sym: - + ~ - + & @@ -515,21 +489,21 @@ rect.held, rect.combo.held { \ - + | - + ` - + - + $ @@ -564,20 +538,20 @@ rect.held, rect.combo.held { { - + [ - + - + - + ! @@ -612,45 +586,45 @@ rect.held, rect.combo.held { } - + ] - + - + - + - + - + - -nav: + +nav: - + - + @@ -683,22 +657,22 @@ rect.held, rect.combo.held { - + - + - + - + @@ -736,21 +710,21 @@ rect.held, rect.combo.held { - + - + - + - + @@ -786,47 +760,47 @@ rect.held, rect.combo.held { PageDown - + PageUp - + END - + - + - + - + - -winnav: + +winnav: - + - + @@ -869,23 +843,23 @@ rect.held, rect.combo.held { 2 - + 3 - + 4 - + - + @@ -928,22 +902,22 @@ rect.held, rect.combo.held { Gui+N - + Gui+P - + - + - + @@ -986,48 +960,48 @@ rect.held, rect.combo.held { BTNXT - + BTPRV - + - + - + - + - + - -num: + +num: - + - + 7 @@ -1062,22 +1036,22 @@ rect.held, rect.combo.held { - + - + - + - - + 4 @@ -1114,24 +1088,24 @@ rect.held, rect.combo.held { - + - + - + - + 1 @@ -1166,45 +1140,46 @@ rect.held, rect.combo.held { - + - + - + 0 - + -fun - - + +fun + + - + - -fun: + +fun: - + - + F7 @@ -1235,19 +1210,19 @@ rect.held, rect.combo.held { - + - + - + - + F4 @@ -1282,23 +1257,23 @@ rect.held, rect.combo.held { - + - + - + - + F1 @@ -1331,200 +1306,2067 @@ rect.held, rect.combo.held { F11 - + F12 - + - + - + - + - + - -mods: +Combos: + - - - -&bootloader + + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - + + + - - - + + + - - - - - + + + - - - + + + - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + + + + + + + + + + + + + += + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +( +< + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +) +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{ +[ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +} +] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +_ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +BOOT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keymap-drawer/cradio.yaml b/keymap-drawer/cradio.yaml index a094c80..e9615c8 100644 --- a/keymap-drawer/cradio.yaml +++ b/keymap-drawer/cradio.yaml @@ -1,4 +1,4 @@ -layout: {qmk_keyboard: ferris/sweep} +layout: {zmk_keyboard: cradio} layers: base: - Q @@ -210,45 +210,7 @@ layers: - {type: held} - {type: held} - {t: '$$mdi:chevron-down$$', type: trans} - mods: - - '&bootloader' - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - '' - - '' - - '' - - '' - - '' - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - {type: held} - - {type: held} - - {t: '$$mdi:chevron-down$$', type: trans} - - '' - - {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-command$$', h: '$$mdi:circle-small$$'} - - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:circle-small$$'} - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - '' - - '' - - {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'} - - '' - - '' - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} - - {t: '$$mdi:chevron-down$$', type: trans} combos: -- p: [3, 4] - k: CANCEL - l: [base] - p: [2, 3] k: $$mdi:keyboard-esc$$ l: [base] @@ -256,7 +218,7 @@ combos: k: '=' l: [base] - p: [12, 13] - k: {t: '$$mdi:keyboard-tab$$', h: mods} + k: $$mdi:keyboard-tab$$ l: [base] - p: [7, 8] k: $$mdi:backspace-outline$$ @@ -265,14 +227,29 @@ combos: k: $$mdi:keyboard-return$$ l: [base] - p: [3, 13] - k: '-' - l: [base] -- p: [13, 23] - k: _ + k: {t: (, h: <} l: [base] - p: [6, 16] + k: {t: ), h: '>'} + l: [base] +- p: [2, 12] + k: {t: '{', h: '['} + l: [base] +- p: [7, 17] + k: {t: '}', h: ']'} + l: [base] +- p: [4, 14] + k: '-' + l: [base] +- p: [14, 24] + k: _ + l: [base] +- p: [5, 15] k: ':' l: [base] -- p: [16, 26] +- p: [15, 25] k: ; l: [base] +- p: [20, 21] + k: BOOT + l: [base]