From 0ed8ac51dfdda7382b17f3e7d3aa17a2fd4aa0ce Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Wed, 9 Dec 2020 14:42:23 +1100 Subject: [PATCH] Change clipboard --- miryoku/miryoku-zmk.org | 430 ++++++++++++++++++++++++++-------------- miryoku/miryoku.dtsi | 138 +++++++------ 2 files changed, 358 insertions(+), 210 deletions(-) diff --git a/miryoku/miryoku-zmk.org b/miryoku/miryoku-zmk.org index d9b9ac1..93e90a4 100644 --- a/miryoku/miryoku-zmk.org +++ b/miryoku/miryoku-zmk.org @@ -26,6 +26,7 @@ Miryoku is an ergonomic, minimal, orthogonal, and universal keyboard layout. - [[#table-map-half][table-map-half]] - [[#table-map-full][table-map-full]] - [[#table-layer-defines][table-layer-defines]] + - [[#table-keycode-mappings][table-keycode-mappings]] - [[#data][Data]] - [[#layers-1][layers]] - [[#symbol-names][symbol-names]] @@ -47,7 +48,7 @@ Miryoku is an ergonomic, minimal, orthogonal, and universal keyboard layout. ** Layers The layers are maintained in tables, with the thumb keys on the bottom row. -~X_NP~ indicates the key is not present and is used to fill in the table around +~U_NP~ indicates the key is not present and is used to fill in the table around the thumb keys. The grid arrangement of the tables does not imply a particular physical layout. @@ -77,16 +78,16 @@ included for prose, dot and slash for file and directory names. | Q | W | F | P | B | J | L | U | Y | ' | | A | R | S | T | G | M | N | E | I | O | | Z | X | C | D | V | K | H | , | DOT | / | -| X_NP | X_NP | ESC | SPC | TAB | ENT | BSPC | DEL | X_NP | X_NP | +| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP | **** Hold #+NAME: hold -| RESET | | | | | | | | | RESET | -| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI | -| | ALGR | | | | | | | ALGR | | -| X_NP | X_NP | MEDR | NAVR | MOUR | NSSL | NSL | FUNL | X_NP | X_NP | +| RESET | &tog TAP | | | | | | | &tog TAP | RESET | +| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI | +| | ALGR | | | | | | | ALGR | | +| U_NP | U_NP | MEDR | NAVR | MOUR | NSSL | NSL | FUNL | U_NP | U_NP | *** Navigation (~NAVR~) @@ -97,10 +98,10 @@ caps lock and insert on the inner column. Thumb keys are duplicated from the base layer to avoid having to layer change mid edit and to enable auto-repeat. #+NAME: navr -| AGIN | UNDO | CUT | COPY | PSTE | -| CAPS | LEFT | DOWN | UP | RGHT | -| INS | HOME | PGDN | PGUP | END | -| ENT | BSPC | DEL | X_NP | X_NP | +| U_RDO | U_PST | U_CPY | U_CUT | U_UND | +| CAPS | LEFT | DOWN | UP | RGHT | +| INS | HOME | PGDN | PGUP | END | +| ENT | BSPC | DEL | U_NP | U_NP | *** Mouse (~MOUR~) @@ -115,7 +116,7 @@ functions. | | | | | | | | MS_L | MS_D | MS_U | MS_R | | | WH_L | WH_D | WH_U | WH_R | -| BTN1 | BTN3 | BTN2 | X_NP | X_NP | +| BTN1 | BTN3 | BTN2 | U_NP | U_NP | **** Mouse Buttons Overlay (~MBO~) @@ -127,7 +128,7 @@ configuration. Not activated manually. | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -| X_NP | X_NP | | | | BTN1 | BTN3 | BTN2 | X_NP | X_NP | +| U_NP | U_NP | | | | BTN1 | BTN3 | BTN2 | U_NP | U_NP | *** Media (~MEDR~) @@ -142,7 +143,7 @@ bottom row, and USB / BT output toggle on the home row inner index. | RGB_TOG | RGB_MOD | RGB_HUI | RGB_SAI | RGB_VAI | | &out OUT_TOG | MPRV | VOLD | VOLU | MNXT | | &bt BT_CLR | &bt BT_SEL 0 | &bt BT_SEL 1 | &bt BT_SEL 2 | &bt BT_SEL 3 | -| MSTP | MPLY | MUTE | X_NP | X_NP | +| MSTP | MPLY | MUTE | U_NP | U_NP | *** Numerals and Symbols (~NSL~) @@ -155,7 +156,7 @@ Dot is duplicated from the base layer. | [ | 7 | 8 | 9 | ] | | ; | 4 | 5 | 6 | = | | ` | 1 | 2 | 3 | \ | -| X_NP | X_NP | DOT | 0 | MINS | +| U_NP | U_NP | DOT | 0 | MINS | *** Shifted Numerals and Symbols (~NSSL~) @@ -168,7 +169,7 @@ next to close parenthesis. | { | & | * | ( | } | | : | $ | % | ^ | + | | ~ | ! | @ | # | PIPE | -| X_NP | X_NP | ( | ) | _ | +| U_NP | U_NP | ( | ) | _ | *** Function and System (~FUNL~) @@ -183,7 +184,7 @@ the base layer to enable auto-repeat. | F12 | F7 | F8 | F9 | PSCR | | F11 | F4 | F5 | F6 | SLCK | | F10 | F1 | F2 | F3 | PAUS | -| X_NP | X_NP | APP | SPC | TAB | +| U_NP | U_NP | APP | SPC | TAB | *** Alternative Layouts @@ -206,7 +207,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~. | Q | W | F | P | G | J | L | U | Y | ' | | A | R | S | T | D | H | N | E | I | O | | Z | X | C | V | B | K | M | , | DOT | / | -| X_NP | X_NP | ESC | SPC | TAB | ENT | BSPC | DEL | X_NP | X_NP | +| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP | ***** Colemak Mod-DH @@ -217,7 +218,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~. | Q | W | F | P | B | J | L | U | Y | ' | | A | R | S | T | G | K | N | E | I | O | | Z | X | C | D | V | M | H | , | DOT | / | -| X_NP | X_NP | ESC | SPC | TAB | ENT | BSPC | DEL | X_NP | X_NP | +| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP | ***** Dvorak @@ -228,7 +229,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~. | ' | , | DOT | P | Y | F | G | C | R | L | | A | O | E | U | I | D | H | T | N | S | | / | Q | J | K | X | B | M | W | V | Z | -| X_NP | X_NP | ESC | SPC | TAB | ENT | BSPC | DEL | X_NP | X_NP | +| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP | ***** Halmak @@ -239,7 +240,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~. | W | L | R | B | Z | ' | Q | U | D | J | | S | H | N | T | , | DOT | A | E | O | I | | F | M | V | C | / | G | P | X | K | Y | -| X_NP | X_NP | ESC | SPC | TAB | ENT | BSPC | DEL | X_NP | X_NP | +| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP | ***** Workman @@ -250,7 +251,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~. | Q | D | R | W | B | J | F | U | P | ' | | A | S | H | T | G | Y | N | E | O | I | | Z | X | M | C | V | K | L | , | DOT | / | -| X_NP | X_NP | ESC | SPC | TAB | ENT | BSPC | DEL | X_NP | X_NP | +| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP | ***** QWERTY @@ -261,7 +262,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~. | Q | W | E | R | T | Y | U | I | O | P | | A | S | D | F | G | H | J | K | L | ' | | Z | X | C | V | B | N | M | , | DOT | / | -| X_NP | X_NP | ESC | SPC | TAB | ENT | BSPC | DEL | X_NP | X_NP | +| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP | **** vi-Style Navigation @@ -272,10 +273,10 @@ To select, append ~MIRYOKU_NAV=VI~ to the ~make~ command line when building. ***** Navigation (NAVR) #+NAME: navr-vi -| AGIN | UNDO | CUT | COPY | PSTE | -| LEFT | DOWN | UP | RGHT | CAPS | -| HOME | PGDN | PGUP | END | INS | -| ENT | BSPC | DEL | X_NP | X_NP | +| U_RDO | U_PST | U_CPY | U_CUT | U_UND | +| LEFT | DOWN | UP | RGHT | CAPS | +| HOME | PGDN | PGUP | END | INS | +| ENT | BSPC | DEL | U_NP | U_NP | ***** Mouse (MOUR) @@ -284,7 +285,7 @@ To select, append ~MIRYOKU_NAV=VI~ to the ~make~ command line when building. | | | | | | | MS_L | MS_D | MS_U | MS_R | | | WH_L | WH_D | WH_U | WH_R | | -| BTN1 | BTN3 | BTN2 | X_NP | X_NP | +| BTN1 | BTN3 | BTN2 | U_NP | U_NP | ***** Media (MEDR) @@ -293,7 +294,68 @@ To select, append ~MIRYOKU_NAV=VI~ to the ~make~ command line when building. | RGB_TOG | RGB_MOD | RGB_HUI | RGB_SAI | RGB_VAI | | MPRV | VOLD | VOLU | MNXT | | | | | | | | -| MSTP | MPLY | MUTE | X_NP | X_NP | +| MSTP | MPLY | MUTE | U_NP | U_NP | + + + +**** Navigation Layer Clipboard Keys + +Keycodes are translated from those used in the Navigation layer tables according +to the following tables. + +By default, the main clipboard keys (cut, copy, and paste) use the CUA bindings +and should work in general unix and windows applications, emacs, and terminal +emulators (paste only). The additional keys (undo, redo) usually require +rebinding in the application. + +To select, append the corresponding option to the ~make~ command line when +building, e.g. ~MIRYOKU_CLIPBOARD=WIN~. + + +***** Default + +#+NAME: clipboard +| U_RDO | AGIN | +| U_PST | S(KC_INS) | +| U_CPY | C(KC_INS) | +| U_CUT | S(KC_DEL) | +| U_UND | UNDO | + + +***** Fun Cluster + +~MIRYOKU_CLIPBOARD=FUN~ + +#+NAME: clipboard-fun +| U_RDO | AGIN | +| U_PST | PSTE | +| U_CPY | COPY | +| U_CUT | CUT | +| U_UND | UNDO | + + +***** Mac + +~MIRYOKU_CLIPBOARD=MAC~ + +#+NAME: clipboard-mac +| U_RDO | SCMD(KC_Z) | +| U_PST | LCMD(KC_V) | +| U_CPY | LCMD(KC_C) | +| U_CUT | LCMD(KC_X) | +| U_UND | LCMD(KC_Z) | + + +***** Windows + +~MIRYOKU_CLIPBOARD=WIN~ + +#+NAME: clipboard-win +| U_RDO | C(KC_Y) | +| U_PST | C(KC_V) | +| U_CPY | C(KC_C) | +| U_CUT | C(KC_X) | +| U_UND | C(KC_Z) | @@ -305,7 +367,7 @@ To select, append ~MIRYOKU_NAV=VI~ to the ~make~ command line when building. | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -| X_NP | X_NP | | | | | | | X_NP | X_NP | +| U_NP | U_NP | | | | | | | U_NP | U_NP | Duplicate base layer tap keys on thumbs rather than trans to enable auto-repeat. @@ -316,7 +378,7 @@ Duplicate base layer tap keys on thumbs rather than trans to enable auto-repeat. | | | | | | | | | | | | | | | | | | -| ENT | BSPC | DEL | X_NP | X_NP | +| ENT | BSPC | DEL | U_NP | U_NP | #+NAME: teml | | | | | | @@ -324,7 +386,7 @@ Duplicate base layer tap keys on thumbs rather than trans to enable auto-repeat. | | | | | | | | | | | | | | | | | | -| X_NP | X_NP | ESC | SPC | TAB | +| U_NP | U_NP | ESC | SPC | TAB | @@ -355,7 +417,7 @@ results = '' for tap_row, hold_row in map(None, tap_table, hold_table): for tap, hold in map(None, tap_row, hold_row): if tap == '': - code = 'X_NU' + code = 'U_NU' elif tap in symbol_names_dict: code = symbol_names_dict[tap] else: @@ -380,7 +442,7 @@ return results : &kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, : &hm LGUI A, &hm LALT R, &hm LCTRL S, &hm LSHFT T, &kp G, &kp M, &hm LSHFT N, &hm LCTRL E, &hm LALT I, &hm LGUI O, : &kp Z, &hm RALT X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &hm RALT DOT, &kp SLASH, -: X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, X_NP, X_NP +: U_NP, U_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, U_NP, U_NP *** table-map-half @@ -413,7 +475,7 @@ for half_row, hold_row in map(None, half_table, hold_table): if lr == mode: for half in half_row: if half == '': - code = 'X_NU' + code = 'U_NU' elif shift == "true" and half in shifted_symbol_names_dict: code = shifted_symbol_names_dict[half] elif half in symbol_names_dict: @@ -435,7 +497,7 @@ for half_row, hold_row in map(None, half_table, hold_table): if hold in keycode_translation_dict: hold = keycode_translation_dict[hold] if hold == '' or hold in layers_dict: - code = 'X_NA' + code = 'U_NA' elif str(hold).startswith(nonkp_tuple): code = hold else: @@ -447,10 +509,10 @@ return results #+END_SRC #+RESULTS: table-map-half -: &bootloader, X_NA, X_NA, X_NA, X_NA, &kp K_AGAIN, &kp K_UNDO, &kp K_CUT, &kp K_COPY, &kp K_PASTE, -: &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, X_NA, &kp CAPS, &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, -: X_NA, &kp RALT, X_NA, X_NA, X_NA, &kp INS, &kp HOME, &kp PG_DN, &kp PG_UP, &kp END, -: X_NP, X_NP, X_NA, X_NA, X_NA, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +: &bootloader, U_NA, U_NA, U_NA, U_NA, &kp K_AGAIN, &kp K_UNDO, &kp K_CUT, &kp K_COPY, &kp K_PASTE, +: &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp CAPS, &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, +: U_NA, &kp RALT, U_NA, U_NA, U_NA, &kp INS, &kp HOME, &kp PG_DN, &kp PG_UP, &kp END, +: U_NP, U_NP, U_NA, U_NA, U_NA, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP *** table-map-full @@ -492,7 +554,7 @@ return results : &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, : &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, : &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, -: X_NP, X_NP, &trans, &trans, &trans, X_NU, X_NU, X_NU, X_NP, X_NP +: U_NP, U_NP, &trans, &trans, &trans, U_NU, U_NU, U_NU, U_NP, U_NP *** table-layer-defines @@ -522,6 +584,43 @@ return results : #define FUNL 7 +*** table-keycode-mappings + +#+NAME: table-keycode-mappings +#+BEGIN_SRC python :var table=clipboard :var symbol_names_table=symbol-names :var nonkp_table=nonkp :var keycode_translation_table=keycode-translation :tangle no +nonkp_tuple = tuple(nonkp_table[0]) +symbol_names_dict = {} +for symbol, name, shifted_symbol, shifted_name in symbol_names_table: + symbol_names_dict[symbol] = name + symbol_names_dict[shifted_symbol] = shifted_name +results = '' +keycode_translation_dict = {} +for standard, local in keycode_translation_table: + if local != '': + keycode_translation_dict[standard] = local +for f,t in table: + if t == '': + code = 'U_NU' + elif t in symbol_names_dict: + code = symbol_names_dict[t] + else: + code = t + if code in keycode_translation_dict: + code = keycode_translation_dict[code] + if not str(code).startswith(nonkp_tuple): + code = '&kp ' + str(code) + results += '#define ' + f + ' ' + code + '\n' +return results +#+END_SRC + +#+RESULTS: table-keycode-mappings +: #define U_RDO &kp K_AGAIN +: #define U_PST &kp LS(INS) +: #define U_CPY &kp LC(INS) +: #define U_CUT &kp S(DEL) +: #define U_UND &kp K_UNDO + + ** Data *** layers @@ -573,7 +672,7 @@ Keycodes that match any of these prefixes will not have ~KC_~ automatically prepended. #+NAME: nonkp -| X_ | & | +| U_ | & | *** keycode-translation @@ -581,114 +680,127 @@ prepended. standard keycode to implementation equivalent #+NAME: keycode-translation -| 0 | NUM_0 | -| 1 | NUM_1 | -| 2 | NUM_2 | -| 3 | NUM_3 | -| 4 | NUM_4 | -| 5 | NUM_5 | -| 6 | NUM_6 | -| 7 | NUM_7 | -| 8 | NUM_8 | -| 9 | NUM_9 | -| AGIN | K_AGAIN | -| ALGR | RALT | -| AMPR | AMPS | -| APP | K_APP | -| ASTR | ASTRK | -| AT | AT | -| BSLS | BSLH | -| BSPC | BSPC | -| BTN1 | KP_SLASH | -| BTN2 | X_NU | -| BTN3 | X_NU | -| CAPS | | -| CIRC | CRRT | -| COLN | COLON | -| COMM | COMMA | -| COPY | K_COPY | -| CUT | K_CUT | -| DEL | | -| DLR | DLLR | -| DOT | | -| DOWN | | -| DQUO | DQT | -| END | | -| ENT | RET | -| EQL | | -| ESC | | -| EXLM | EXCL | -| F1 | | -| F10 | | -| F11 | | -| F12 | | -| F2 | | -| F3 | | -| F4 | | -| F5 | | -| F6 | | -| F7 | | -| F8 | | -| F9 | | -| GRV | GRAVE | -| GT | | -| HASH | | -| HOME | | -| INS | | -| LALT | | -| LBRC | LBKT | -| LCBR | LBRC | -| LCTL | LCTRL | -| LEFT | | -| LGUI | | -| LPRN | LPAR | -| LSFT | LSHFT | -| LT | | -| MINS | MINUS | -| MNXT | K_NEXT | -| MPLY | K_PP | -| MPRV | K_PREV | -| MS_D | KP_N2 | -| MS_L | KP_N4 | -| MS_R | KP_N6 | -| MSTP | K_STOP2 | -| MS_U | KP_N8 | -| MUTE | K_MUTE | -| PAUS | PAUSE_BREAK | -| PERC | PRCT | -| PGDN | PG_DN | -| PGUP | PG_UP | -| PIPE | | -| PLUS | | -| PSCR | PSCRN | -| PSTE | K_PASTE | -| QUES | QMARK | -| QUOT | SQT | -| RBRC | RBKT | -| RCBR | RBRC | -| RESET | &bootloader | -| RGB_HUI | &rgb_ug RGB_HUI | -| RGB_MOD | &rgb_ug RGB_EFF | -| RGB_SAI | &rgb_ug RGB_SAI | -| RGB_TOG | &rgb_ug RGB_TOG | -| RGB_VAI | &rgb_ug RGB_BRI | -| RGHT | RIGHT | -| RPRN | RPAR | -| SCLN | SEMI | -| SLCK | | -| SLSH | SLASH | -| SPC | | -| TAB | | -| TILD | TILDE | -| UNDO | K_UNDO | -| UNDS | UNDER | -| UP | | -| VOLD | K_VOL_DN | -| VOLU | K_VOL_UP | -| WH_D | X_NU | -| WH_L | X_NU | -| WH_R | X_NU | -| WH_U | X_NU | +| 0 | NUM_0 | +| 1 | NUM_1 | +| 2 | NUM_2 | +| 3 | NUM_3 | +| 4 | NUM_4 | +| 5 | NUM_5 | +| 6 | NUM_6 | +| 7 | NUM_7 | +| 8 | NUM_8 | +| 9 | NUM_9 | +| AGIN | K_AGAIN | +| ALGR | RALT | +| AMPR | AMPS | +| APP | K_APP | +| ASTR | ASTRK | +| AT | AT | +| BSLS | BSLH | +| BSPC | BSPC | +| BTN1 | KP_SLASH | +| BTN2 | U_NU | +| BTN3 | U_NU | +| CAPS | | +| CIRC | CRRT | +| COLN | COLON | +| COMM | COMMA | +| COPY | K_COPY | +| CUT | K_CUT | +| DEL | | +| DLR | DLLR | +| DOT | | +| DOWN | | +| DQUO | DQT | +| END | | +| ENT | RET | +| EQL | | +| ESC | | +| EXLM | EXCL | +| F1 | | +| F10 | | +| F11 | | +| F12 | | +| F2 | | +| F3 | | +| F4 | | +| F5 | | +| F6 | | +| F7 | | +| F8 | | +| F9 | | +| GRV | GRAVE | +| GT | | +| HASH | | +| HOME | | +| INS | | +| LALT | | +| LBRC | LBKT | +| LCBR | LBRC | +| LCTL | LCTRL | +| LEFT | | +| LGUI | | +| LPRN | LPAR | +| LSFT | LSHFT | +| LT | | +| MINS | MINUS | +| MNXT | K_NEXT | +| MPLY | K_PP | +| MPRV | K_PREV | +| MS_D | KP_N2 | +| MS_L | KP_N4 | +| MS_R | KP_N6 | +| MSTP | K_STOP2 | +| MS_U | KP_N8 | +| MUTE | K_MUTE | +| PAUS | PAUSE_BREAK | +| PERC | PRCT | +| PGDN | PG_DN | +| PGUP | PG_UP | +| PIPE | | +| PLUS | | +| PSCR | PSCRN | +| PSTE | K_PASTE | +| QUES | QMARK | +| QUOT | SQT | +| RBRC | RBKT | +| RCBR | RBRC | +| RESET | &bootloader | +| RGB_HUI | &rgb_ug RGB_HUI | +| RGB_MOD | &rgb_ug RGB_EFF | +| RGB_SAI | &rgb_ug RGB_SAI | +| RGB_TOG | &rgb_ug RGB_TOG | +| RGB_VAI | &rgb_ug RGB_BRI | +| RGHT | RIGHT | +| RPRN | RPAR | +| SCLN | SEMI | +| SLCK | | +| SLSH | SLASH | +| SPC | | +| TAB | | +| TILD | TILDE | +| UNDO | K_UNDO | +| UNDS | UNDER | +| UP | | +| VOLD | K_VOL_DN | +| VOLU | K_VOL_UP | +| WH_D | U_NU | +| WH_L | U_NU | +| WH_R | U_NU | +| WH_U | U_NU | +| S(KC_INS) | LS(INS) | +| C(KC_INS) | LC(INS) | +| S(KC_DEL) | LS(DEL) | +| SCMD(KC_Z) | LS(LCMD(Z)) | +| LCMD(KC_V) | LCMD(V) | +| LCMD(KC_C) | LCMD(C) | +| LCMD(KC_X) | LCMD(X) | +| LCMD(KC_Z) | LCMD(Z) | +| C(KC_Y) | LC(Y) | +| C(KC_V) | LC(V) | +| C(KC_C) | LC(C) | +| C(KC_X) | LC(X) | +| C(KC_Z) | LC(Z) | @@ -787,9 +899,20 @@ K20 K21 K22 K23 K24 &kp NUM_4 &kp NUM_3 K25 K26 K27 K28 K <> -#define X_NP &none // key is not present -#define X_NA &none // present but not available for use -#define X_NU &none // available but not used +#define U_NP &none // key is not present +#define U_NA &none // present but not available for use +#define U_NU &none // available but not used + +#if defined MIRYOKU_CLIPBOARD_FUN +<> +#elif defined MIRYOKU_CLIPBOARD_MAC +<> +#elif defined MIRYOKU_CLIPBOARD_WIN +<> +#else +<> +#endif + / { behaviors { @@ -798,8 +921,7 @@ K20 K21 K22 K23 K24 &kp NUM_4 &kp NUM_3 K25 K26 K27 K28 K label = "HOMEROW_MODS"; #binding-cells = <2>; tapping_term_ms = <200>; -// flavor = "tap-preferred"; - flavor = "balanced"; + flavor = "tap-preferred"; bindings = <&kp>, <&kp>; }; }; diff --git a/miryoku/miryoku.dtsi b/miryoku/miryoku.dtsi index a7db01b..4e4ad7a 100644 --- a/miryoku/miryoku.dtsi +++ b/miryoku/miryoku.dtsi @@ -16,9 +16,36 @@ #define NSSL 7 #define FUNL 8 -#define X_NP &none // key is not present -#define X_NA &none // present but not available for use -#define X_NU &none // available but not used +#define U_NP &none // key is not present +#define U_NA &none // present but not available for use +#define U_NU &none // available but not used + +#if defined MIRYOKU_CLIPBOARD_FUN +#define U_RDO &kp K_AGAIN +#define U_PST &kp K_PASTE +#define U_CPY &kp K_COPY +#define U_CUT &kp K_CUT +#define U_UND &kp K_UNDO +#elif defined MIRYOKU_CLIPBOARD_MAC +#define U_RDO &kp LS(LCMD(Z)) +#define U_PST &kp LCMD(V) +#define U_CPY &kp LCMD(C) +#define U_CUT &kp LCMD(X) +#define U_UND &kp LCMD(Z) +#elif defined MIRYOKU_CLIPBOARD_WIN +#define U_RDO &kp LC(Y) +#define U_PST &kp LC(V) +#define U_CPY &kp LC(C) +#define U_CUT &kp LC(X) +#define U_UND &kp LC(Z) +#else +#define U_RDO &kp K_AGAIN +#define U_PST &kp LS(INS) +#define U_CPY &kp LC(INS) +#define U_CUT &kp LS(DEL) +#define U_UND &kp K_UNDO +#endif + / { behaviors { @@ -27,8 +54,7 @@ label = "HOMEROW_MODS"; #binding-cells = <2>; tapping_term_ms = <200>; -// flavor = "tap-preferred"; - flavor = "balanced"; + flavor = "tap-preferred"; bindings = <&kp>, <&kp>; }; }; @@ -41,49 +67,49 @@ &kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SQT, &hm LGUI A, &hm LALT R, &hm LCTRL S, &hm LSHFT T, &kp D, &kp H, &hm LSHFT N, &hm LCTRL E, &hm LALT I, &hm LGUI O, &kp Z, &hm RALT X, &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, &hm RALT DOT, &kp SLASH, -X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, X_NP, X_NP +U_NP, U_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_COLEMAKDH MIRYOKU_SUBMAP( &kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, &hm LGUI A, &hm LALT R, &hm LCTRL S, &hm LSHFT T, &kp G, &kp K, &hm LSHFT N, &hm LCTRL E, &hm LALT I, &hm LGUI O, &kp Z, &hm RALT X, &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, &hm RALT DOT, &kp SLASH, -X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, X_NP, X_NP +U_NP, U_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_DVORAK MIRYOKU_SUBMAP( &kp SQT, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, &hm LGUI A, &hm LALT O, &hm LCTRL E, &hm LSHFT U, &kp I, &kp D, &hm LSHFT H, &hm LCTRL T, &hm LALT N, &hm LGUI S, &kp SLASH, &hm RALT Q, &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, &hm RALT V, &kp Z, -X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, X_NP, X_NP +U_NP, U_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_HALMAK MIRYOKU_SUBMAP( &kp W, &kp L, &kp R, &kp B, &kp Z, &kp SQT, &kp Q, &kp U, &kp D, &kp J, &hm LGUI S, &hm LALT H, &hm LCTRL N, &hm LSHFT T, &kp COMMA, &kp DOT, &hm LSHFT A, &hm LCTRL E, &hm LALT O, &hm LGUI I, &kp F, &hm RALT M, &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, &hm RALT K, &kp Y, -X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, X_NP, X_NP +U_NP, U_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_WORKMAN MIRYOKU_SUBMAP( &kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SQT, &hm LGUI A, &hm LALT S, &hm LCTRL H, &hm LSHFT T, &kp G, &kp Y, &hm LSHFT N, &hm LCTRL E, &hm LALT O, &hm LGUI I, &kp Z, &hm RALT X, &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, &hm RALT DOT, &kp SLASH, -X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, X_NP, X_NP +U_NP, U_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_QWERTY MIRYOKU_SUBMAP( &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, &hm LGUI A, &hm LALT S, &hm LCTRL D, &hm LSHFT F, &kp G, &kp H, &hm LSHFT J, &hm LCTRL K, &hm LALT L, &hm LGUI SQT, &kp Z, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, &kp SLASH, -X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, X_NP, X_NP +U_NP, U_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, U_NP, U_NP ) #else MIRYOKU_SUBMAP( &kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, &hm LGUI A, &hm LALT R, &hm LCTRL S, &hm LSHFT T, &kp G, &kp M, &hm LSHFT N, &hm LCTRL E, &hm LALT I, &hm LGUI O, &kp Z, &hm RALT X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &hm RALT DOT, &kp SLASH, -X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, X_NP, X_NP +U_NP, U_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL RET, < NSL BSPC, < FUNL DEL, U_NP, U_NP ) #endif >; @@ -95,49 +121,49 @@ X_NP, X_NP, < MEDR ESC, < NAVR SPC, < MOUR TAB, < NSSL R &kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SQT, &kp A, &kp R, &kp S, &kp T, &kp D, &kp H, &kp N, &kp E, &kp I, &kp O, &kp Z, &kp X, &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, &kp DOT, &kp SLASH, -X_NP, X_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_COLEMAKDH MIRYOKU_SUPERMAP( &kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, &kp A, &kp R, &kp S, &kp T, &kp G, &kp K, &kp N, &kp E, &kp I, &kp O, &kp Z, &kp X, &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, &kp DOT, &kp SLASH, -X_NP, X_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_DVORAK MIRYOKU_SUPERMAP( &kp SQT, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, &kp A, &kp O, &kp E, &kp U, &kp I, &kp D, &kp H, &kp T, &kp N, &kp S, &kp SLASH, &kp Q, &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, &kp V, &kp Z, -X_NP, X_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_HALMAK MIRYOKU_SUPERMAP( &kp W, &kp L, &kp R, &kp B, &kp Z, &kp SQT, &kp Q, &kp U, &kp D, &kp J, &kp S, &kp H, &kp N, &kp T, &kp COMMA, &kp DOT, &kp A, &kp E, &kp O, &kp I, &kp F, &kp M, &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, &kp K, &kp Y, -X_NP, X_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_WORKMAN MIRYOKU_SUPERMAP( &kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SQT, &kp A, &kp S, &kp H, &kp T, &kp G, &kp Y, &kp N, &kp E, &kp O, &kp I, &kp Z, &kp X, &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, &kp DOT, &kp SLASH, -X_NP, X_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #elif defined MIRYOKU_ALPHAS_QWERTY MIRYOKU_SUPERMAP( &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, &kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SQT, &kp Z, &kp X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &kp DOT, &kp SLASH, -X_NP, X_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #else MIRYOKU_SUPERMAP( &kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, &kp A, &kp R, &kp S, &kp T, &kp G, &kp M, &kp N, &kp E, &kp I, &kp O, &kp Z, &kp X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &kp DOT, &kp SLASH, -X_NP, X_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #endif >; @@ -148,7 +174,7 @@ X_NP, X_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, &trans, -X_NP, X_NP, &trans, &trans, &trans, &kp KP_SLASH, X_NU, X_NU, X_NP, X_NP +U_NP, U_NP, &trans, &trans, &trans, &kp KP_SLASH, U_NU, U_NU, U_NP, U_NP ) >; }; @@ -156,17 +182,17 @@ X_NP, X_NP, &trans, &trans, &trans, &kp KP_SLASH, X_NU, X_NU, bindings = < #if defined MIRYOKU_NAV_VI MIRYOKU_SUBMAP( -&bootloader, X_NA, X_NA, X_NA, X_NA, &kp K_AGAIN, &kp K_UNDO, &kp K_CUT, &kp K_COPY, &kp K_PASTE, -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, X_NA, &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, &kp CAPS, -X_NA, &kp RALT, X_NA, X_NA, X_NA, &kp HOME, &kp PG_DN, &kp PG_UP, &kp END, &kp INS, -X_NP, X_NP, X_NA, X_NA, X_NA, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +&bootloader, &tog TAP, U_NA, U_NA, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, &kp CAPS, +U_NA, &kp RALT, U_NA, U_NA, U_NA, &kp HOME, &kp PG_DN, &kp PG_UP, &kp END, &kp INS, +U_NP, U_NP, U_NA, U_NA, U_NA, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #else MIRYOKU_SUBMAP( -&bootloader, X_NA, X_NA, X_NA, X_NA, &kp K_AGAIN, &kp K_UNDO, &kp K_CUT, &kp K_COPY, &kp K_PASTE, -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, X_NA, &kp CAPS, &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, -X_NA, &kp RALT, X_NA, X_NA, X_NA, &kp INS, &kp HOME, &kp PG_DN, &kp PG_UP, &kp END, -X_NP, X_NP, X_NA, X_NA, X_NA, &kp RET, &kp BSPC, &kp DEL, X_NP, X_NP +&bootloader, &tog TAP, U_NA, U_NA, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp CAPS, &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, +U_NA, &kp RALT, U_NA, U_NA, U_NA, &kp INS, &kp HOME, &kp PG_DN, &kp PG_UP, &kp END, +U_NP, U_NP, U_NA, U_NA, U_NA, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP ) #endif >; @@ -175,17 +201,17 @@ X_NP, X_NP, X_NA, X_NA, X_NA, &kp RET, &k bindings = < #if defined MIRYOKU_NAV_VI MIRYOKU_SUBMAP( -&bootloader, X_NA, X_NA, X_NA, X_NA, X_NU, X_NU, X_NU, X_NU, X_NU, -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, X_NA, &kp KP_N4, &kp KP_N2, &kp KP_N8, &kp KP_N6, X_NU, -X_NA, &kp RALT, X_NA, X_NA, X_NA, X_NU, X_NU, X_NU, X_NU, X_NU, -X_NP, X_NP, X_NA, X_NA, X_NA, &kp KP_SLASH, X_NU, X_NU, X_NP, X_NP +&bootloader, &tog TAP, U_NA, U_NA, U_NA, U_NU, U_NU, U_NU, U_NU, U_NU, +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp KP_N4, &kp KP_N2, &kp KP_N8, &kp KP_N6, U_NU, +U_NA, &kp RALT, U_NA, U_NA, U_NA, U_NU, U_NU, U_NU, U_NU, U_NU, +U_NP, U_NP, U_NA, U_NA, U_NA, &kp KP_SLASH, U_NU, U_NU, U_NP, U_NP ) #else MIRYOKU_SUBMAP( -&bootloader, X_NA, X_NA, X_NA, X_NA, X_NU, X_NU, X_NU, X_NU, X_NU, -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, X_NA, X_NU, &kp KP_N4, &kp KP_N2, &kp KP_N8, &kp KP_N6, -X_NA, &kp RALT, X_NA, X_NA, X_NA, X_NU, X_NU, X_NU, X_NU, X_NU, -X_NP, X_NP, X_NA, X_NA, X_NA, &kp KP_SLASH, X_NU, X_NU, X_NP, X_NP +&bootloader, &tog TAP, U_NA, U_NA, U_NA, U_NU, U_NU, U_NU, U_NU, U_NU, +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, U_NU, &kp KP_N4, &kp KP_N2, &kp KP_N8, &kp KP_N6, +U_NA, &kp RALT, U_NA, U_NA, U_NA, U_NU, U_NU, U_NU, U_NU, U_NU, +U_NP, U_NP, U_NA, U_NA, U_NA, &kp KP_SLASH, U_NU, U_NU, U_NP, U_NP ) #endif >; @@ -194,17 +220,17 @@ X_NP, X_NP, X_NA, X_NA, X_NA, &kp KP_SLASH, X bindings = < #if defined MIRYOKU_NAV_VI MIRYOKU_SUBMAP( -&bootloader, X_NA, X_NA, X_NA, X_NA, &rgb_ug RGB_TOG, &rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, X_NA, &kp K_PREV, &kp K_VOL_DN, &kp K_VOL_UP, &kp K_NEXT, X_NU, -X_NA, &kp RALT, X_NA, X_NA, X_NA, X_NU, X_NU, X_NU, X_NU, X_NU, -X_NP, X_NP, X_NA, X_NA, X_NA, &kp K_STOP2, &kp K_PP, &kp K_MUTE, X_NP, X_NP +&bootloader, &tog TAP, U_NA, U_NA, U_NA, &rgb_ug RGB_TOG, &rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp K_PREV, &kp K_VOL_DN, &kp K_VOL_UP, &kp K_NEXT, U_NU, +U_NA, &kp RALT, U_NA, U_NA, U_NA, U_NU, U_NU, U_NU, U_NU, U_NU, +U_NP, U_NP, U_NA, U_NA, U_NA, &kp K_STOP2, &kp K_PP, &kp K_MUTE, U_NP, U_NP ) #else MIRYOKU_SUBMAP( -&bootloader, X_NA, X_NA, X_NA, X_NA, &rgb_ug RGB_TOG, &rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, X_NA, &out OUT_TOG, &kp K_PREV, &kp K_VOL_DN, &kp K_VOL_UP, &kp K_NEXT, -X_NA, &kp RALT, X_NA, X_NA, X_NA, &bt BT_CLR, &bt BT_SEL 0, &bt BT_SEL 1, &bt BT_SEL 2, &bt BT_SEL 3, -X_NP, X_NP, X_NA, X_NA, X_NA, &kp K_STOP2, &kp K_PP, &kp K_MUTE, X_NP, X_NP +&bootloader, &tog TAP, U_NA, U_NA, U_NA, &rgb_ug RGB_TOG, &rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &out OUT_TOG, &kp K_PREV, &kp K_VOL_DN, &kp K_VOL_UP, &kp K_NEXT, +U_NA, &kp RALT, U_NA, U_NA, U_NA, &bt BT_CLR, &bt BT_SEL 0, &bt BT_SEL 1, &bt BT_SEL 2, &bt BT_SEL 3, +U_NP, U_NP, U_NA, U_NA, U_NA, &kp K_STOP2, &kp K_PP, &kp K_MUTE, U_NP, U_NP ) #endif >; @@ -212,30 +238,30 @@ X_NP, X_NP, X_NA, X_NA, X_NA, &kp K_STOP2, &k NSL_layer { bindings = < MIRYOKU_SUBMAP( -&kp LBKT, &kp NUM_7, &kp NUM_8, &kp NUM_9, &kp RBKT, X_NA, X_NA, X_NA, X_NA, &bootloader, -&kp SEMI, &kp NUM_4, &kp NUM_5, &kp NUM_6, &kp EQL, X_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, -&kp GRAVE, &kp NUM_1, &kp NUM_2, &kp NUM_3, &kp BSLH, X_NA, X_NA, X_NA, &kp RALT, X_NA, -X_NP, X_NP, &kp DOT, &kp NUM_0, &kp MINUS, X_NA, X_NA, X_NA, X_NP, X_NP +&kp LBKT, &kp NUM_7, &kp NUM_8, &kp NUM_9, &kp RBKT, U_NA, U_NA, U_NA, &tog TAP, &bootloader, +&kp SEMI, &kp NUM_4, &kp NUM_5, &kp NUM_6, &kp EQL, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, +&kp GRAVE, &kp NUM_1, &kp NUM_2, &kp NUM_3, &kp BSLH, U_NA, U_NA, U_NA, &kp RALT, U_NA, +U_NP, U_NP, &kp DOT, &kp NUM_0, &kp MINUS, U_NA, U_NA, U_NA, U_NP, U_NP ) >; }; NSSL_layer { bindings = < MIRYOKU_SUBMAP( -&kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, X_NA, X_NA, X_NA, X_NA, &bootloader, -&kp COLON, &kp DLLR, &kp PRCT, &kp CRRT, &kp PLUS, X_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, -&kp TILDE, &kp EXCL, &kp AT, &kp HASH, &kp PIPE, X_NA, X_NA, X_NA, &kp RALT, X_NA, -X_NP, X_NP, &kp LPAR, &kp RPAR, &kp UNDER, X_NA, X_NA, X_NA, X_NP, X_NP +&kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, U_NA, U_NA, U_NA, &tog TAP, &bootloader, +&kp COLON, &kp DLLR, &kp PRCT, &kp CRRT, &kp PLUS, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, +&kp TILDE, &kp EXCL, &kp AT, &kp HASH, &kp PIPE, U_NA, U_NA, U_NA, &kp RALT, U_NA, +U_NP, U_NP, &kp LPAR, &kp RPAR, &kp UNDER, U_NA, U_NA, U_NA, U_NP, U_NP ) >; }; FUNL_layer { bindings = < MIRYOKU_SUBMAP( -&kp F12, &kp F7, &kp F8, &kp F9, &kp PSCRN, X_NA, X_NA, X_NA, X_NA, &bootloader, -&kp F11, &kp F4, &kp F5, &kp F6, &kp SLCK, X_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, -&kp F10, &kp F1, &kp F2, &kp F3, &kp PAUSE_BREAK, X_NA, X_NA, X_NA, &kp RALT, X_NA, -X_NP, X_NP, &kp K_APP, &kp SPC, &kp TAB, X_NA, X_NA, X_NA, X_NP, X_NP +&kp F12, &kp F7, &kp F8, &kp F9, &kp PSCRN, U_NA, U_NA, U_NA, &tog TAP, &bootloader, +&kp F11, &kp F4, &kp F5, &kp F6, &kp SLCK, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, +&kp F10, &kp F1, &kp F2, &kp F3, &kp PAUSE_BREAK, U_NA, U_NA, U_NA, &kp RALT, U_NA, +U_NP, U_NP, &kp K_APP, &kp SPC, &kp TAB, U_NA, U_NA, U_NA, U_NP, U_NP ) >; };