From 155d32d2ade65ef9ef2d677ffffb6a852fbe6e06 Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Wed, 11 May 2022 11:59:20 +1000 Subject: [PATCH] Add Extra and Tap layers --- miryoku/miryoku.dtsi | 8 + miryoku/miryoku_babel/miryoku_alternatives.h | 164 ++++++++++++++++--- miryoku/miryoku_babel/miryoku_layer.h | 116 ++++++++++++- miryoku/miryoku_babel/miryoku_layer_names.h | 16 +- miryoku/miryoku_kludge_thumbcombos.dtsi | 4 + 5 files changed, 276 insertions(+), 32 deletions(-) diff --git a/miryoku/miryoku.dtsi b/miryoku/miryoku.dtsi index fa1aa85..aaa0f95 100644 --- a/miryoku/miryoku.dtsi +++ b/miryoku/miryoku.dtsi @@ -20,6 +20,14 @@ label = "Base"; bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_BASE) >; }; + EXTRA_layer { + label = "Extra"; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_EXTRA) >; + }; + TAP_layer { + label = "Tap"; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_TAP) >; + }; BUTTON_layer { label = "Button"; bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_BUTTON) >; diff --git a/miryoku/miryoku_babel/miryoku_alternatives.h b/miryoku/miryoku_babel/miryoku_alternatives.h index 116222a..f06ab40 100644 --- a/miryoku/miryoku_babel/miryoku_alternatives.h +++ b/miryoku/miryoku_babel/miryoku_alternatives.h @@ -5,6 +5,7 @@ #pragma once + #define MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP \ &kp A, &kp Z, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ &hm LGUI Q, &hm LALT S, &hm LCTRL D, &hm LSHFT F, &kp G, &kp H, &hm LSHFT J, &hm LCTRL K, &hm LALT L, &hm LGUI M, \ @@ -126,133 +127,254 @@ U_NP, U_NP, < MEDIA ESC, < NAV SPC, < U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +#define MIRYOKU_ALTERNATIVES_TAP_AZERTY_FLIP \ +&kp A, &kp Z, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ +&kp Q, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp M, \ +&kp W, &kp X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &kp SLASH, &kp SQT, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_BEAKL15_FLIP \ +&kp Q, &kp H, &kp O, &kp U, &kp X, &kp G, &kp C, &kp R, &kp F, &kp Z, \ +&kp Y, &kp I, &kp E, &kp A, &kp DOT, &kp D, &kp S, &kp T, &kp N, &kp B, \ +&kp J, &kp SLASH, &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, &kp P, &kp V, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_COLEMAK_FLIP \ +&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, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP \ +&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, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK_FLIP \ +&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, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_DVORAK_FLIP \ +&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, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_HALMAK_FLIP \ +&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, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_WORKMAN_FLIP \ +&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, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_QWERTY_FLIP \ +&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, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_QWERTZ_FLIP \ +&kp Q, &kp W, &kp E, &kp R, &kp T, &kp Z, &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 Y, &kp X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &kp DOT, &kp SLASH, \ +U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPC, &kp ESC, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_AZERTY \ +&kp A, &kp Z, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ +&kp Q, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp M, \ +&kp W, &kp X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &kp SLASH, &kp SQT, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_BEAKL15 \ +&kp Q, &kp H, &kp O, &kp U, &kp X, &kp G, &kp C, &kp R, &kp F, &kp Z, \ +&kp Y, &kp I, &kp E, &kp A, &kp DOT, &kp D, &kp S, &kp T, &kp N, &kp B, \ +&kp J, &kp SLASH, &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, &kp P, &kp V, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_COLEMAK \ +&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, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH \ +&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, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK \ +&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, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_DVORAK \ +&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, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_HALMAK \ +&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, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_WORKMAN \ +&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, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_QWERTY \ +&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, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_TAP_QWERTZ \ +&kp Q, &kp W, &kp E, &kp R, &kp T, &kp Z, &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 Y, &kp X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &kp DOT, &kp SLASH, \ +U_NP, U_NP, &kp ESC, &kp SPC, &kp TAB, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP + + #define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP \ -&kp PG_UP, &kp HOME, &kp UP, &kp END, &kp INS, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +&kp PG_UP, &kp HOME, &kp UP, &kp END, &kp INS, &bt BT_CLR, &to BASE, &to EXTRA, &to TAP, &bootloader, \ &kp PG_DN, &kp LEFT, &kp DOWN, &kp RIGHT, &kp CAPS, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, U_NA, U_NA, &kp RALT, U_NA, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NAV_FLIP \ -&kp HOME, &kp PG_DN, &kp PG_UP, &kp END, &kp INS, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +&kp HOME, &kp PG_DN, &kp PG_UP, &kp END, &kp INS, &bt BT_CLR, &to BASE, &to EXTRA, &to TAP, &bootloader, \ &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, &kp CAPS, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, U_NA, U_NA, &kp RALT, U_NA, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, &kp INS, &kp HOME, &kp UP, &kp END, &kp PG_UP, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, &kp INS, &kp HOME, &kp UP, &kp END, &kp PG_UP, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp CAPS, &kp LEFT, &kp DOWN, &kp RIGHT, &kp PG_DN, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ U_NP, U_NP, U_NA, U_NA, U_NA, &kp RET, &kp BSPC, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NAV_VI \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, 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 #define MIRYOKU_ALTERNATIVES_NAV \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, 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 #define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP \ -U_WH_U, U_WH_L, U_MS_U, U_WH_R, U_NU, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +U_WH_U, U_WH_L, U_MS_U, U_WH_R, U_NU, &bt BT_CLR, &to BASE, &to EXTRA, &to TAP, &bootloader, \ U_WH_D, U_MS_L, U_MS_D, U_MS_R, U_NU, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, U_NA, U_NA, &kp RALT, U_NA, \ U_NP, U_NP, U_BTN2, U_BTN3, U_BTN1, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE_FLIP \ -U_WH_L, U_WH_D, U_WH_U, U_WH_R, U_NU, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +U_WH_L, U_WH_D, U_WH_U, U_WH_R, U_NU, &bt BT_CLR, &to BASE, &to EXTRA, &to TAP, &bootloader, \ U_MS_L, U_MS_D, U_MS_U, U_MS_R, U_NU, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, U_NA, U_NA, &kp RALT, U_NA, \ U_NP, U_NP, U_BTN2, U_BTN3, U_BTN1, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, U_NU, U_WH_L, U_MS_U, U_WH_R, U_WH_U, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, U_NU, U_WH_L, U_MS_U, U_WH_R, U_WH_U, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, U_NU, U_MS_L, U_MS_D, U_MS_R, U_WH_D, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN1, U_BTN3, U_BTN2, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE_VI \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, U_MS_L, U_MS_D, U_MS_U, U_MS_R, U_NU, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, U_WH_L, U_WH_D, U_WH_U, U_WH_R, U_NU, \ U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN1, U_BTN3, U_BTN2, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, U_NU, U_MS_L, U_MS_D, U_MS_U, U_MS_R, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, U_NU, U_WH_L, U_WH_D, U_WH_U, U_WH_R, \ U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN1, U_BTN3, U_BTN2, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \ -&rgb_ug RGB_SAI, &rgb_ug RGB_HUI, &kp C_VOL_UP, &rgb_ug RGB_EFF, &rgb_ug RGB_TOG, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +&rgb_ug RGB_SAI, &rgb_ug RGB_HUI, &kp C_VOL_UP, &rgb_ug RGB_EFF, &rgb_ug RGB_TOG, &bt BT_CLR, &to BASE, &to EXTRA, &to TAP, &bootloader, \ &rgb_ug RGB_BRI, &kp C_PREV, &kp C_VOL_DN, &kp C_NEXT, &ext_power EP_TOG, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ &bt BT_SEL 0, &bt BT_SEL 1, &bt BT_SEL 2, &bt BT_SEL 3, &out OUT_TOG, U_NA, U_NA, U_NA, &kp RALT, U_NA, \ U_NP, U_NP, &kp C_MUTE, &kp C_PP, &kp C_STOP, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MEDIA_FLIP \ -&rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, &rgb_ug RGB_TOG, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +&rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, &rgb_ug RGB_TOG, &bt BT_CLR, &to BASE, &to EXTRA, &to TAP, &bootloader, \ &kp C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, &ext_power EP_TOG, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ &bt BT_SEL 0, &bt BT_SEL 1, &bt BT_SEL 2, &bt BT_SEL 3, &out OUT_TOG, U_NA, U_NA, U_NA, &kp RALT, U_NA, \ U_NP, U_NP, &kp C_MUTE, &kp C_PP, &kp C_STOP, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, &rgb_ug RGB_TOG, &rgb_ug RGB_EFF, &kp C_VOL_UP, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, &rgb_ug RGB_TOG, &rgb_ug RGB_EFF, &kp C_VOL_UP, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &ext_power EP_TOG, &kp C_PREV, &kp C_VOL_DN, &kp C_NEXT, &rgb_ug RGB_BRI, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, &out OUT_TOG, &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 C_STOP, &kp C_PP, &kp C_MUTE, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MEDIA_VI \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, &rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, &rgb_ug RGB_TOG, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, &rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, &rgb_ug RGB_TOG, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, &ext_power EP_TOG, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, &bt BT_SEL 0, &bt BT_SEL 1, &bt BT_SEL 2, &bt BT_SEL 3, &out OUT_TOG, \ U_NP, U_NP, U_NA, U_NA, U_NA, &kp C_STOP, &kp C_PP, &kp C_MUTE, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MEDIA \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, &rgb_ug RGB_TOG, &rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, &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, &ext_power EP_TOG, &kp C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, &out OUT_TOG, &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 C_STOP, &kp C_PP, &kp C_MUTE, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NUM_FLIP \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, &kp LBKT, &kp NUM_7, &kp NUM_8, &kp NUM_9, &kp RBKT, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, &kp LBKT, &kp NUM_7, &kp NUM_8, &kp NUM_9, &kp RBKT, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp EQL, &kp NUM_4, &kp NUM_5, &kp NUM_6, &kp SEMI, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, &kp BSLH, &kp NUM_1, &kp NUM_2, &kp NUM_3, &kp GRAVE, \ U_NP, U_NP, U_NA, U_NA, U_NA, &kp MINUS, &kp NUM_0, &kp DOT, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NUM \ -&kp LBKT, &kp NUM_7, &kp NUM_8, &kp NUM_9, &kp RBKT, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +&kp LBKT, &kp NUM_7, &kp NUM_8, &kp NUM_9, &kp RBKT, &bt BT_CLR, &to BASE, &to EXTRA, &to 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 #define MIRYOKU_ALTERNATIVES_SYM_FLIP \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, &kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, &kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp PLUS, &kp DLLR, &kp PRCT, &kp CRRT, &kp COLON, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, &kp PIPE, &kp EXCL, &kp AT, &kp HASH, &kp TILDE, \ U_NP, U_NP, U_NA, U_NA, U_NA, &kp UNDER, &kp LPAR, &kp RPAR, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_SYM \ -&kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +&kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, &bt BT_CLR, &to BASE, &to EXTRA, &to 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 #define MIRYOKU_ALTERNATIVES_FUN_FLIP \ -&bootloader, &reset, U_NA, U_NA, &bt BT_CLR, &kp PSCRN, &kp F7, &kp F8, &kp F9, &kp F12, \ +&bootloader, &to TAP, &to EXTRA, &to BASE, &bt BT_CLR, &kp PSCRN, &kp F7, &kp F8, &kp F9, &kp F12, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp SLCK, &kp F4, &kp F5, &kp F6, &kp F11, \ U_NA, &kp RALT, U_NA, U_NA, U_NA, &kp PAUSE_BREAK, &kp F1, &kp F2, &kp F3, &kp F10, \ U_NP, U_NP, U_NA, U_NA, U_NA, &kp TAB, &kp SPC, &kp K_APP, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_FUN \ -&kp F12, &kp F7, &kp F8, &kp F9, &kp PSCRN, &bt BT_CLR, U_NA, U_NA, &reset, &bootloader, \ +&kp F12, &kp F7, &kp F8, &kp F9, &kp PSCRN, &bt BT_CLR, &to BASE, &to EXTRA, &to 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 diff --git a/miryoku/miryoku_babel/miryoku_layer.h b/miryoku/miryoku_babel/miryoku_layer.h index b985444..341e538 100644 --- a/miryoku/miryoku_babel/miryoku_layer.h +++ b/miryoku/miryoku_babel/miryoku_layer.h @@ -14,6 +14,8 @@ #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP #elif defined (MIRYOKU_ALPHAS_COLEMAK) #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP + #elif defined (MIRYOKU_ALPHAS_COLEMAKDH) + #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP #elif defined (MIRYOKU_ALPHAS_COLEMAKDHK) #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP #elif defined (MIRYOKU_ALPHAS_DVORAK) @@ -36,6 +38,8 @@ #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_BEAKL15 #elif defined (MIRYOKU_ALPHAS_COLEMAK) #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAK + #elif defined (MIRYOKU_ALPHAS_COLEMAKDH) + #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH #elif defined (MIRYOKU_ALPHAS_COLEMAKDHK) #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK #elif defined (MIRYOKU_ALPHAS_DVORAK) @@ -54,6 +58,114 @@ #endif #endif +#if !defined(MIRYOKU_LAYER_EXTRA) + #if defined (MIRYOKU_LAYERS_FLIP) + #if defined (MIRYOKU_EXTRA_AZERTY) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP + #elif defined (MIRYOKU_EXTRA_BEAKL15) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP + #elif defined (MIRYOKU_EXTRA_COLEMAK) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP + #elif defined (MIRYOKU_EXTRA_COLEMAKDH) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP + #elif defined (MIRYOKU_EXTRA_COLEMAKDHK) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP + #elif defined (MIRYOKU_EXTRA_DVORAK) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP + #elif defined (MIRYOKU_EXTRA_HALMAK) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP + #elif defined (MIRYOKU_EXTRA_WORKMAN) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP + #elif defined (MIRYOKU_EXTRA_QWERTY) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP + #elif defined (MIRYOKU_EXTRA_QWERTZ) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP + #else + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP + #endif + #else + #if defined (MIRYOKU_EXTRA_AZERTY) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_AZERTY + #elif defined (MIRYOKU_EXTRA_BEAKL15) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_BEAKL15 + #elif defined (MIRYOKU_EXTRA_COLEMAK) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAK + #elif defined (MIRYOKU_EXTRA_COLEMAKDH) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH + #elif defined (MIRYOKU_EXTRA_COLEMAKDHK) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK + #elif defined (MIRYOKU_EXTRA_DVORAK) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_DVORAK + #elif defined (MIRYOKU_EXTRA_HALMAK) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_HALMAK + #elif defined (MIRYOKU_EXTRA_WORKMAN) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_WORKMAN + #elif defined (MIRYOKU_EXTRA_QWERTY) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTY + #elif defined (MIRYOKU_EXTRA_QWERTZ) + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTZ + #else + #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTY + #endif + #endif +#endif + +#if !defined(MIRYOKU_LAYER_TAP) + #if defined (MIRYOKU_LAYERS_FLIP) + #if defined (MIRYOKU_TAP_AZERTY) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_AZERTY_FLIP + #elif defined (MIRYOKU_TAP_BEAKL15) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_BEAKL15_FLIP + #elif defined (MIRYOKU_TAP_COLEMAK) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAK_FLIP + #elif defined (MIRYOKU_TAP_COLEMAKDH) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP + #elif defined (MIRYOKU_TAP_COLEMAKDHK) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK_FLIP + #elif defined (MIRYOKU_TAP_DVORAK) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_DVORAK_FLIP + #elif defined (MIRYOKU_TAP_HALMAK) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_HALMAK_FLIP + #elif defined (MIRYOKU_TAP_WORKMAN) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_WORKMAN_FLIP + #elif defined (MIRYOKU_TAP_QWERTY) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_QWERTY_FLIP + #elif defined (MIRYOKU_TAP_QWERTZ) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_QWERTZ_FLIP + #else + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP + #endif + #else + #if defined (MIRYOKU_TAP_AZERTY) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_AZERTY + #elif defined (MIRYOKU_TAP_BEAKL15) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_BEAKL15 + #elif defined (MIRYOKU_TAP_COLEMAK) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAK + #elif defined (MIRYOKU_TAP_COLEMAKDH) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH + #elif defined (MIRYOKU_TAP_COLEMAKDHK) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK + #elif defined (MIRYOKU_TAP_DVORAK) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_DVORAK + #elif defined (MIRYOKU_TAP_HALMAK) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_HALMAK + #elif defined (MIRYOKU_TAP_WORKMAN) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_WORKMAN + #elif defined (MIRYOKU_TAP_QWERTY) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_QWERTY + #elif defined (MIRYOKU_TAP_QWERTZ) + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_QWERTZ + #else + #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH + #endif + #endif +#endif + +#if !defined(MIRYOKU_LAYER_BUTTON) + #define MIRYOKU_LAYER_BUTTON MIRYOKU_ALTERNATIVES_BUTTON +#endif + #if !defined(MIRYOKU_LAYER_NAV) #if defined (MIRYOKU_LAYERS_FLIP) #if defined (MIRYOKU_NAV_INVERTEDT) @@ -131,7 +243,3 @@ #define MIRYOKU_LAYER_FUN MIRYOKU_ALTERNATIVES_FUN #endif #endif - -#if !defined(MIRYOKU_LAYER_BUTTON) - #define MIRYOKU_LAYER_BUTTON MIRYOKU_ALTERNATIVES_BUTTON -#endif diff --git a/miryoku/miryoku_babel/miryoku_layer_names.h b/miryoku/miryoku_babel/miryoku_layer_names.h index 6c06c6c..ad14006 100644 --- a/miryoku/miryoku_babel/miryoku_layer_names.h +++ b/miryoku/miryoku_babel/miryoku_layer_names.h @@ -3,10 +3,12 @@ // generated -*- buffer-read-only: t -*- #define BASE 0 -#define BUTTON 1 -#define NAV 2 -#define MOUSE 3 -#define MEDIA 4 -#define NUM 5 -#define SYM 6 -#define FUN 7 +#define EXTRA 1 +#define TAP 2 +#define BUTTON 3 +#define NAV 4 +#define MOUSE 5 +#define MEDIA 6 +#define NUM 7 +#define SYM 8 +#define FUN 9 diff --git a/miryoku/miryoku_kludge_thumbcombos.dtsi b/miryoku/miryoku_kludge_thumbcombos.dtsi index 8fd0287..c453be7 100644 --- a/miryoku/miryoku_kludge_thumbcombos.dtsi +++ b/miryoku/miryoku_kludge_thumbcombos.dtsi @@ -16,6 +16,7 @@ thumbcombos_ ## layer ## _ ## position { \ #if defined (MIRYOKU_LAYERS_FLIP) #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, LEFT, < FUN DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, LEFT, < FUN DEL) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN2) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, LEFT, &kp DEL) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, LEFT, U_BTN2) @@ -23,6 +24,7 @@ thumbcombos_ ## layer ## _ ## position { \ #endif #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, < MEDIA ESC) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, RIGHT, < MEDIA ESC) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN2) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NUM, RIGHT, &kp DOT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(SYM, RIGHT, &kp RPAR) @@ -31,6 +33,7 @@ thumbcombos_ ## layer ## _ ## position { \ #else #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, LEFT, < MEDIA ESC) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, LEFT, < MEDIA ESC) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, LEFT, U_BTN2) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NUM, LEFT, &kp DOT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(SYM, LEFT, &kp LPAR) @@ -38,6 +41,7 @@ thumbcombos_ ## layer ## _ ## position { \ #endif #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BASE, RIGHT, < FUN DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(EXTRA, RIGHT, < FUN DEL) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(BUTTON, RIGHT, U_BTN2) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, RIGHT, &kp DEL) MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, RIGHT, U_BTN2)