From 4c51e254227bfe01a8f81fcda442e85e6277b994 Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Sun, 15 May 2022 17:26:40 +1000 Subject: [PATCH] Change to X macros for layer list - Supports adding and removing layers from custom_config.h - Add "U_" prefix to layer names - Populate keymap from X macro - Rename miryoku_alternatives.h to miryoku_layer_alternatives.h - Rename miryoku_layer.h to miryoku_layer_selection.h - Remove miryoku_layer_names.h - Add miryoku_layer_list.h --- miryoku/miryoku.dtsi | 45 +---- miryoku/miryoku.h | 4 +- ...natives.h => miryoku_layer_alternatives.h} | 166 +++++++++--------- miryoku/miryoku_babel/miryoku_layer_list.h | 32 ++++ miryoku/miryoku_babel/miryoku_layer_names.h | 14 -- ...yoku_layer.h => miryoku_layer_selection.h} | 4 +- miryoku/miryoku_kludge_bottomrowcombos.dtsi | 74 ++++---- miryoku/miryoku_kludge_thumbcombos.dtsi | 58 +++--- miryoku/miryoku_kludge_toprowcombos.dtsi | 74 ++++---- 9 files changed, 228 insertions(+), 243 deletions(-) rename miryoku/miryoku_babel/{miryoku_alternatives.h => miryoku_layer_alternatives.h} (76%) create mode 100644 miryoku/miryoku_babel/miryoku_layer_list.h delete mode 100644 miryoku/miryoku_babel/miryoku_layer_names.h rename miryoku/miryoku_babel/{miryoku_layer.h => miryoku_layer_selection.h} (99%) diff --git a/miryoku/miryoku.dtsi b/miryoku/miryoku.dtsi index 7b828dc..c00d19d 100644 --- a/miryoku/miryoku.dtsi +++ b/miryoku/miryoku.dtsi @@ -13,46 +13,13 @@ / { keymap { compatible = "zmk,keymap"; - BASE_layer { - label = "Base"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_BASE, MIRYOKU_LAYER_BASE) >; - }; - EXTRA_layer { - label = "Extra"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_EXTRA, MIRYOKU_LAYER_EXTRA) >; - }; - TAP_layer { - label = "Tap"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_TAP, MIRYOKU_LAYER_TAP) >; - }; - BUTTON_layer { - label = "Button"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_BUTTON, MIRYOKU_LAYER_BUTTON) >; - }; - NAV_layer { - label = "Nav"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_NAV, MIRYOKU_LAYER_NAV) >; - }; - MOUSE_layer { - label = "Mouse"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_MOUSE, MIRYOKU_LAYER_MOUSE) >; - }; - MEDIA_layer { - label = "Media"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_MEDIA, MIRYOKU_LAYER_MEDIA) >; - }; - NUM_layer { - label = "Num"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_NUM, MIRYOKU_LAYER_NUM) >; - }; - SYM_layer { - label = "Sym"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_SYM, MIRYOKU_LAYER_SYM) >; - }; - FUN_layer { - label = "Fun"; - bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_FUN, MIRYOKU_LAYER_FUN) >; +#define MIRYOKU_X(LAYER, STRING) \ + U_##LAYER## { \ + label = STRING; \ + bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_##LAYER, MIRYOKU_LAYER_##LAYER) >; \ }; +MIRYOKU_LAYER_LIST +#undef MIRYOKU_X }; }; diff --git a/miryoku/miryoku.h b/miryoku/miryoku.h index c10da69..933d775 100644 --- a/miryoku/miryoku.h +++ b/miryoku/miryoku.h @@ -3,8 +3,8 @@ #pragma once -#include "miryoku_babel/miryoku_layer_names.h" -#include "miryoku_babel/miryoku_layer.h" +#include "miryoku_babel/miryoku_layer_selection.h" +#include "miryoku_babel/miryoku_layer_list.h" #define U_MACRO_VA_ARGS(macro, ...) macro(__VA_ARGS__) #define U_STRINGIFY(x) #x diff --git a/miryoku/miryoku_babel/miryoku_alternatives.h b/miryoku/miryoku_babel/miryoku_layer_alternatives.h similarity index 76% rename from miryoku/miryoku_babel/miryoku_alternatives.h rename to miryoku/miryoku_babel/miryoku_layer_alternatives.h index 49ab764..3e7555d 100644 --- a/miryoku/miryoku_babel/miryoku_alternatives.h +++ b/miryoku/miryoku_babel/miryoku_layer_alternatives.h @@ -1,4 +1,4 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku // generated -*- buffer-read-only: t -*- // target: zmk @@ -9,122 +9,122 @@ #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, \ -< BUTTON W, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &hm RALT SLASH, < BUTTON SQT, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON W, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &hm RALT SLASH, < U_BUTTON SQT, \ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP \ &kp Q, &kp H, &kp O, &kp U, &kp X, &kp G, &kp C, &kp R, &kp F, &kp Z, \ &hm LGUI Y, &hm LALT I, &hm LCTRL E, &hm LSHFT A, &kp DOT, &kp D, &hm LSHFT S, &hm LCTRL T, &hm LALT N, &hm LGUI B, \ -< BUTTON J, &hm RALT SLASH, &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, &hm RALT P, < BUTTON V, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON J, &hm RALT SLASH, &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, &hm RALT P, < U_BUTTON V, \ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP \ &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, \ -< BUTTON Z, &hm RALT X, &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP \ &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, \ -< BUTTON Z, &hm RALT X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP \ &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, \ -< BUTTON Z, &hm RALT X, &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP \ &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, \ -< BUTTON SLASH, &hm RALT Q, &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, &hm RALT V, < BUTTON Z, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON SLASH,&hm RALT Q, &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, &hm RALT V, < U_BUTTON Z, \ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP \ &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, \ -< BUTTON F, &hm RALT M, &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, &hm RALT K, < BUTTON Y, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON F, &hm RALT M, &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, &hm RALT K, < U_BUTTON Y, \ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP \ &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, \ -< BUTTON Z, &hm RALT X, &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP \ &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, \ -< BUTTON Z, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Z, &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, \ -< BUTTON Y, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < FUN DEL, < NUM BSPC, < SYM RET, < MOUSE TAB, < NAV SPC, < MEDIA ESC, U_NP, U_NP +< U_BUTTON Y, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_FUN DEL, < U_NUM BSPC, < U_SYM RET, < U_MOUSE TAB, < U_NAV SPC, < U_MEDIA ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_AZERTY \ &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, \ -< BUTTON W, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &hm RALT SLASH, < BUTTON SQT, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON W, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &hm RALT SLASH, < U_BUTTON SQT, \ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_BEAKL15 \ &kp Q, &kp H, &kp O, &kp U, &kp X, &kp G, &kp C, &kp R, &kp F, &kp Z, \ &hm LGUI Y, &hm LALT I, &hm LCTRL E, &hm LSHFT A, &kp DOT, &kp D, &hm LSHFT S, &hm LCTRL T, &hm LALT N, &hm LGUI B, \ -< BUTTON J, &hm RALT SLASH, &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, &hm RALT P, < BUTTON V, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON J, &hm RALT SLASH, &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, &hm RALT P, < U_BUTTON V, \ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAK \ &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, \ -< BUTTON Z, &hm RALT X, &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH \ &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, \ -< BUTTON Z, &hm RALT X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK \ &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, \ -< BUTTON Z, &hm RALT X, &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK \ &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, \ -< BUTTON SLASH, &hm RALT Q, &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, &hm RALT V, < BUTTON Z, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON SLASH,&hm RALT Q, &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, &hm RALT V, < U_BUTTON Z, \ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_HALMAK \ &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, \ -< BUTTON F, &hm RALT M, &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, &hm RALT K, < BUTTON Y, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON F, &hm RALT M, &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, &hm RALT K, < U_BUTTON Y, \ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_WORKMAN \ &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, \ -< BUTTON Z, &hm RALT X, &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTY \ &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, \ -< BUTTON Z, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON Z, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Z, &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, \ -< BUTTON Y, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, < BUTTON SLASH, \ -U_NP, U_NP, < MEDIA ESC, < NAV SPC, < MOUSE TAB, < SYM RET, < NUM BSPC, < FUN DEL, U_NP, U_NP +< U_BUTTON Y, &hm RALT X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &hm RALT DOT, < U_BUTTON SLASH,\ +U_NP, U_NP, < U_MEDIA ESC, < U_NAV SPC, < U_MOUSE TAB, < U_SYM RET, < U_NUM BSPC, < U_FUN DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_AZERTY_FLIP \ @@ -249,134 +249,134 @@ U_NP, U_NP, &kp ESC, &kp SPC, &kp #define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP \ -&kp PG_UP, &kp HOME, &kp UP, &kp END, &kp INS, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +&kp PG_UP, &kp HOME, &kp UP, &kp END, &kp INS, U_NA, &to U_BASE, &to U_EXTRA, &to U_TAP, &bootloader, \ &kp PG_DN, &kp LEFT, &kp DOWN, &kp RIGHT, &u_caps_word, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ -U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, &to NAV, &to NUM, &kp RALT, U_NA, \ +U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, &to U_NAV, &to U_NUM, &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, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +&kp HOME, &kp PG_DN, &kp PG_UP, &kp END, &kp INS, U_NA, &to U_BASE, &to U_EXTRA, &to U_TAP, &bootloader, \ &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, &u_caps_word, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ -U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, &to NAV, &to NUM, &kp RALT, U_NA, \ +U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, &to U_NAV, &to U_NUM, &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, &to TAP, &to EXTRA, &to BASE, U_NA, &kp INS, &kp HOME, &kp UP, &kp END, &kp PG_UP, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, &kp INS, &kp HOME, &kp UP, &kp END, &kp PG_UP, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &u_caps_word, &kp LEFT, &kp DOWN, &kp RIGHT, &kp PG_DN, \ -U_NA, &kp RALT, &to NUM, &to NAV, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +U_NA, &kp RALT, &to U_NUM, &to U_NAV, 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, &to TAP, &to EXTRA, &to BASE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, 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, &u_caps_word, \ -U_NA, &kp RALT, &to NUM, &to NAV, U_NA, &kp HOME, &kp PG_DN, &kp PG_UP, &kp END, &kp INS, \ +U_NA, &kp RALT, &to U_NUM, &to U_NAV, 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, &to TAP, &to EXTRA, &to BASE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &u_caps_word, &kp LEFT, &kp DOWN, &kp UP, &kp RIGHT, \ -U_NA, &kp RALT, &to NUM, &to NAV, U_NA, &kp INS, &kp HOME, &kp PG_DN, &kp PG_UP, &kp END, \ +U_NA, &kp RALT, &to U_NUM, &to U_NAV, 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, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +U_WH_U, U_WH_L, U_MS_U, U_WH_R, U_NU, U_NA, &to U_BASE, &to U_EXTRA, &to U_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, &to MOUSE, &to SYM, &kp RALT, U_NA, \ +U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, &to U_MOUSE, &to U_SYM, &kp RALT, U_NA, \ U_NP, U_NP, U_BTN3, U_BTN1, U_BTN2, 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, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +U_WH_L, U_WH_D, U_WH_U, U_WH_R, U_NU, U_NA, &to U_BASE, &to U_EXTRA, &to U_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, &to MOUSE, &to SYM, &kp RALT, U_NA, \ +U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_NA, &to U_MOUSE, &to U_SYM, &kp RALT, U_NA, \ U_NP, U_NP, U_BTN3, U_BTN1, U_BTN2, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT \ -&bootloader, &to TAP, &to EXTRA, &to BASE, U_NA, U_NU, U_WH_L, U_MS_U, U_WH_R, U_WH_U, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, 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, &to SYM, &to MOUSE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +U_NA, &kp RALT, &to U_SYM, &to U_MOUSE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN2, U_BTN1, U_BTN3, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE_VI \ -&bootloader, &to TAP, &to EXTRA, &to BASE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, 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, &to SYM, &to MOUSE, U_NA, U_WH_L, U_WH_D, U_WH_U, U_WH_R, U_NU, \ +U_NA, &kp RALT, &to U_SYM, &to U_MOUSE, 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_BTN2, U_BTN1, U_BTN3, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MOUSE \ -&bootloader, &to TAP, &to EXTRA, &to BASE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, 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, &to SYM, &to MOUSE, U_NA, U_NU, U_WH_L, U_WH_D, U_WH_U, U_WH_R, \ +U_NA, &kp RALT, &to U_SYM, &to U_MOUSE, 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_BTN2, U_BTN1, U_BTN3, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \ -&u_rgb_hui, &u_rgb_sai, &kp C_VOL_UP, &u_rgb_bri, &rgb_ug RGB_TOG, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +&u_rgb_hui, &u_rgb_sai, &kp C_VOL_UP, &u_rgb_bri, &rgb_ug RGB_TOG, U_NA, &to U_BASE, &to U_EXTRA, &to U_TAP, &bootloader, \ &u_rgb_eff, &kp C_PREV, &kp C_VOL_DN, &kp C_NEXT, &u_ep_tog, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ -&u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_bt_sel_3, &u_out_tog, U_NA, &to MEDIA, &to FUN, &kp RALT, U_NA, \ +&u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_bt_sel_3, &u_out_tog, U_NA, &to U_MEDIA, &to U_FUN, &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 \ -&u_rgb_eff, &u_rgb_hui, &u_rgb_sai, &u_rgb_bri, &rgb_ug RGB_TOG, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +&u_rgb_eff, &u_rgb_hui, &u_rgb_sai, &u_rgb_bri, &rgb_ug RGB_TOG, U_NA, &to U_BASE, &to U_EXTRA, &to U_TAP, &bootloader, \ &kp C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, &u_ep_tog, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ -&u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_bt_sel_3, &u_out_tog, U_NA, &to MEDIA, &to FUN, &kp RALT, U_NA, \ +&u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_bt_sel_3, &u_out_tog, U_NA, &to U_MEDIA, &to U_FUN, &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, &to TAP, &to EXTRA, &to BASE, U_NA, &rgb_ug RGB_TOG, &u_rgb_eff, &kp C_VOL_UP, &u_rgb_hui, &u_rgb_sai, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, &rgb_ug RGB_TOG, &u_rgb_eff, &kp C_VOL_UP, &u_rgb_hui, &u_rgb_sai, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &u_ep_tog, &kp C_PREV, &kp C_VOL_DN, &kp C_NEXT, &u_rgb_bri, \ -U_NA, &kp RALT, &to FUN, &to MEDIA, U_NA, &u_out_tog, &u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_bt_sel_3, \ +U_NA, &kp RALT, &to U_FUN, &to U_MEDIA, U_NA, &u_out_tog, &u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_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, &to TAP, &to EXTRA, &to BASE, U_NA, &u_rgb_eff, &u_rgb_hui, &u_rgb_sai, &u_rgb_bri, &rgb_ug RGB_TOG, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, &u_rgb_eff, &u_rgb_hui, &u_rgb_sai, &u_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, &u_ep_tog, \ -U_NA, &kp RALT, &to FUN, &to MEDIA, U_NA, &u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_bt_sel_3, &u_out_tog, \ +U_NA, &kp RALT, &to U_FUN, &to U_MEDIA, U_NA, &u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_bt_sel_3, &u_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, &to TAP, &to EXTRA, &to BASE, U_NA, &rgb_ug RGB_TOG, &u_rgb_eff, &u_rgb_hui, &u_rgb_sai, &u_rgb_bri, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, &rgb_ug RGB_TOG, &u_rgb_eff, &u_rgb_hui, &u_rgb_sai, &u_rgb_bri, \ &kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &u_ep_tog, &kp C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, \ -U_NA, &kp RALT, &to FUN, &to MEDIA, U_NA, &u_out_tog, &u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_bt_sel_3, \ +U_NA, &kp RALT, &to U_FUN, &to U_MEDIA, U_NA, &u_out_tog, &u_bt_sel_0, &u_bt_sel_1, &u_bt_sel_2, &u_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, &to TAP, &to EXTRA, &to BASE, U_NA, &kp LBKT, &kp NUM_7, &kp NUM_8, &kp NUM_9, &kp RBKT, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, &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, &to NAV, &to NUM, U_NA, &kp BSLH, &kp NUM_1, &kp NUM_2, &kp NUM_3, &kp GRAVE, \ +U_NA, &kp RALT, &to U_NAV, &to U_NUM, 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, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +&kp LBKT, &kp NUM_7, &kp NUM_8, &kp NUM_9, &kp RBKT, U_NA, &to U_BASE, &to U_EXTRA, &to U_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, &to NUM, &to NAV, &kp RALT, U_NA, \ +&kp GRAVE, &kp NUM_1, &kp NUM_2, &kp NUM_3, &kp BSLH, U_NA, &to U_NUM, &to U_NAV, &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, &to TAP, &to EXTRA, &to BASE, U_NA, &kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, &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, &to MOUSE, &to SYM, U_NA, &kp PIPE, &kp EXCL, &kp AT, &kp HASH, &kp TILDE, \ +U_NA, &kp RALT, &to U_MOUSE, &to U_SYM, 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, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +&kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, U_NA, &to U_BASE, &to U_EXTRA, &to U_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, &to SYM, &to MOUSE, &kp RALT, U_NA, \ +&kp TILDE, &kp EXCL, &kp AT, &kp HASH, &kp PIPE, U_NA, &to U_SYM, &to U_MOUSE, &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, &to TAP, &to EXTRA, &to BASE, U_NA, &kp PSCRN, &kp F7, &kp F8, &kp F9, &kp F12, \ +&bootloader, &to U_TAP, &to U_EXTRA, &to U_BASE, U_NA, &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, &to MEDIA, &to FUN, U_NA, &kp PAUSE_BREAK, &kp F1, &kp F2, &kp F3, &kp F10, \ +U_NA, &kp RALT, &to U_MEDIA, &to U_FUN, 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, U_NA, &to BASE, &to EXTRA, &to TAP, &bootloader, \ +&kp F12, &kp F7, &kp F8, &kp F9, &kp PSCRN, U_NA, &to U_BASE, &to U_EXTRA, &to U_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, &to FUN, &to MEDIA, &kp RALT, U_NA, \ +&kp F10, &kp F1, &kp F2, &kp F3, &kp PAUSE_BREAK, U_NA, &to U_FUN, &to U_MEDIA, &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_list.h b/miryoku/miryoku_babel/miryoku_layer_list.h new file mode 100644 index 0000000..cb1adbe --- /dev/null +++ b/miryoku/miryoku_babel/miryoku_layer_list.h @@ -0,0 +1,32 @@ +// Copyright 2022 Manna Harbour +// https://github.com/manna-harbour/miryoku +// generated -*- buffer-read-only: t -*- + +#pragma once + +#if !defined (MIRYOKU_LAYER_LIST) + +#define MIRYOKU_LAYER_LIST \ +MIRYOKU_X(BASE, "Base") \ +MIRYOKU_X(EXTRA, "Extra") \ +MIRYOKU_X(TAP, "Tap") \ +MIRYOKU_X(BUTTON, "Button") \ +MIRYOKU_X(NAV, "Nav") \ +MIRYOKU_X(MOUSE, "Mouse") \ +MIRYOKU_X(MEDIA, "Media") \ +MIRYOKU_X(NUM, "Num") \ +MIRYOKU_X(SYM, "Sym") \ +MIRYOKU_X(FUN, "Fun") + +#define U_BASE 0 +#define U_EXTRA 1 +#define U_TAP 2 +#define U_BUTTON 3 +#define U_NAV 4 +#define U_MOUSE 5 +#define U_MEDIA 6 +#define U_NUM 7 +#define U_SYM 8 +#define U_FUN 9 + +#endif diff --git a/miryoku/miryoku_babel/miryoku_layer_names.h b/miryoku/miryoku_babel/miryoku_layer_names.h deleted file mode 100644 index ad14006..0000000 --- a/miryoku/miryoku_babel/miryoku_layer_names.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2021 Manna Harbour -// https://github.com/manna-harbour/miryoku -// generated -*- buffer-read-only: t -*- - -#define BASE 0 -#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_babel/miryoku_layer.h b/miryoku/miryoku_babel/miryoku_layer_selection.h similarity index 99% rename from miryoku/miryoku_babel/miryoku_layer.h rename to miryoku/miryoku_babel/miryoku_layer_selection.h index 7189f9a..4e3e4bf 100644 --- a/miryoku/miryoku_babel/miryoku_layer.h +++ b/miryoku/miryoku_babel/miryoku_layer_selection.h @@ -1,10 +1,10 @@ -// Copyright 2021 Manna Harbour +// Copyright 2022 Manna Harbour // https://github.com/manna-harbour/miryoku // generated -*- buffer-read-only: t -*- #pragma once -#include "miryoku_alternatives.h" +#include "miryoku_layer_alternatives.h" #if !defined(MIRYOKU_LAYER_BASE) #if defined (MIRYOKU_LAYERS_FLIP) diff --git a/miryoku/miryoku_kludge_bottomrowcombos.dtsi b/miryoku/miryoku_kludge_bottomrowcombos.dtsi index 28c97bc..95a0ffd 100644 --- a/miryoku/miryoku_kludge_bottomrowcombos.dtsi +++ b/miryoku/miryoku_kludge_bottomrowcombos.dtsi @@ -2,11 +2,11 @@ // https://github.com/manna-harbour/miryoku #define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_TERM 50 -#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(layer, position, binding) \ -bottomrowcombos_ ## layer ## _ ## position { \ - layers = ; \ - key-positions = ; \ - bindings = ; \ +#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(LAYER, POSITION, BINDING) \ +bottomrowcombos_ ## LAYER ## _ ## POSITION { \ + layers = ; \ + key-positions = ; \ + bindings = ; \ timeout-ms = ; \ }; @@ -40,47 +40,47 @@ bottomrowcombos_ ## layer ## _ ## position { \ #elif defined (MIRYOKU_ALPHAS_QWERTY) #elif defined (MIRYOKU_ALPHAS_QWERTZ) #else - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BASE, LEFTPINKIE, < BUTTON Z) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BASE, LEFTINNERINDEX, &kp V) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BASE, RIGHTINNERINDEX, &kp K) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BASE, RIGHTPINKIE, < BUTTON SLASH) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BASE, LEFTPINKIE, < U_BUTTON Z) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BASE, LEFTINNERINDEX, &kp V) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BASE, RIGHTINNERINDEX, &kp K) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BASE, RIGHTPINKIE, < U_BUTTON SLASH) #endif #if defined (MIRYOKU_NAV_INVERTEDT) #elif defined (MIRYOKU_NAV_VI) #else - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NAV, LEFTPINKIE, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NAV, LEFTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NAV, RIGHTINNERINDEX, &kp INS) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NAV, RIGHTPINKIE, &kp END) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NAV, LEFTPINKIE, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NAV, LEFTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NAV, RIGHTINNERINDEX, &kp INS) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NAV, RIGHTPINKIE, &kp END) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MOUSE, LEFTPINKIE, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MOUSE, LEFTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MOUSE, RIGHTINNERINDEX, U_NU) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MOUSE, RIGHTPINKIE, U_WH_R) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MOUSE, LEFTPINKIE, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MOUSE, LEFTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MOUSE, RIGHTINNERINDEX, U_NU) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MOUSE, RIGHTPINKIE, U_WH_R) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MEDIA, LEFTPINKIE, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MEDIA, LEFTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MEDIA, RIGHTINNERINDEX, &bt BT_CLR) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(MEDIA, RIGHTPINKIE, &bt BT_SEL 3) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MEDIA, LEFTPINKIE, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MEDIA, LEFTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MEDIA, RIGHTINNERINDEX, &u_out_tog) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_MEDIA, RIGHTPINKIE, &u_bt_sel_3) #endif - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NUM, LEFTPINKIE, &kp GRAVE) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NUM, LEFTINNERINDEX, &kp BSLH) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NUM, RIGHTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(NUM, RIGHTPINKIE, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NUM, LEFTPINKIE, &kp GRAVE) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NUM, LEFTINNERINDEX, &kp BSLH) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NUM, RIGHTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_NUM, RIGHTPINKIE, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(SYM, LEFTPINKIE, &kp TILDE) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(SYM, LEFTINNERINDEX, &kp PIPE) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(SYM, RIGHTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(SYM, RIGHTPINKIE, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_SYM, LEFTPINKIE, &kp TILDE) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_SYM, LEFTINNERINDEX, &kp PIPE) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_SYM, RIGHTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_SYM, RIGHTPINKIE, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(FUN, LEFTPINKIE, &kp F10) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(FUN, LEFTINNERINDEX, &kp PAUSE_BREAK) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(FUN, RIGHTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(FUN, RIGHTPINKIE, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_FUN, LEFTPINKIE, &kp F10) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_FUN, LEFTINNERINDEX, &kp PAUSE_BREAK) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_FUN, RIGHTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_FUN, RIGHTPINKIE, U_NA) #endif - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BUTTON, LEFTPINKIE, U_UND) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BUTTON, LEFTINNERINDEX, U_RDO) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BUTTON, RIGHTINNERINDEX, U_RDO) - MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(BUTTON, RIGHTPINKIE, U_UND) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BUTTON, LEFTPINKIE, U_UND) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BUTTON, LEFTINNERINDEX, U_RDO) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BUTTON, RIGHTINNERINDEX, U_RDO) + MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_MACRO(U_BUTTON, RIGHTPINKIE, U_UND) }; }; diff --git a/miryoku/miryoku_kludge_thumbcombos.dtsi b/miryoku/miryoku_kludge_thumbcombos.dtsi index ebe5e25..9696c90 100644 --- a/miryoku/miryoku_kludge_thumbcombos.dtsi +++ b/miryoku/miryoku_kludge_thumbcombos.dtsi @@ -2,11 +2,11 @@ // https://github.com/manna-harbour/miryoku #define MIRYOKU_KLUDGE_THUMBCOMBOS_TERM 200 -#define MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(layer, position, binding) \ -thumbcombos_ ## layer ## _ ## position { \ - layers = ; \ - key-positions = ; \ - bindings = ; \ +#define MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(LAYER, POSITION, BINDING) \ +thumbcombos_ ## LAYER ## _ ## POSITION { \ + layers = ; \ + key-positions = ; \ + bindings = ; \ timeout-ms = ; \ }; @@ -15,37 +15,37 @@ thumbcombos_ ## layer ## _ ## position { \ compatible = "zmk,combos"; #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_BTN3) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, LEFT, &kp DEL) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, LEFT, U_BTN3) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MEDIA, LEFT, &kp C_MUTE) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BASE, LEFT, < U_FUN DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_EXTRA, LEFT, < U_FUN DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BUTTON, LEFT, U_BTN3) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_NAV, LEFT, &kp DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_MOUSE, LEFT, U_BTN3) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_MEDIA, LEFT, &kp C_MUTE) #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_BTN3) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NUM, RIGHT, &kp DOT) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(SYM, RIGHT, &kp RPAR) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(FUN, RIGHT, &kp K_APP) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BASE, RIGHT, < U_MEDIA ESC) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_EXTRA, RIGHT, < U_MEDIA ESC) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BUTTON, RIGHT, U_BTN3) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_NUM, RIGHT, &kp DOT) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_SYM, RIGHT, &kp RPAR) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_FUN, RIGHT, &kp K_APP) #endif #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_BTN3) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NUM, LEFT, &kp DOT) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(SYM, LEFT, &kp LPAR) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(FUN, LEFT, &kp K_APP) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BASE, LEFT, < U_MEDIA ESC) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_EXTRA, LEFT, < U_MEDIA ESC) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BUTTON, LEFT, U_BTN3) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_NUM, LEFT, &kp DOT) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_SYM, LEFT, &kp LPAR) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_FUN, LEFT, &kp K_APP) #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_BTN3) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(NAV, RIGHT, &kp DEL) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MOUSE, RIGHT, U_BTN3) - MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(MEDIA, RIGHT, &kp C_MUTE) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BASE, RIGHT, < U_FUN DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_EXTRA, RIGHT, < U_FUN DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_BUTTON, RIGHT, U_BTN3) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_NAV, RIGHT, &kp DEL) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_MOUSE, RIGHT, U_BTN3) + MIRYOKU_KLUDGE_THUMBCOMBOS_MACRO(U_MEDIA, RIGHT, &kp C_MUTE) #endif #endif }; diff --git a/miryoku/miryoku_kludge_toprowcombos.dtsi b/miryoku/miryoku_kludge_toprowcombos.dtsi index 8b7f311..fd9a626 100644 --- a/miryoku/miryoku_kludge_toprowcombos.dtsi +++ b/miryoku/miryoku_kludge_toprowcombos.dtsi @@ -2,11 +2,11 @@ // https://github.com/manna-harbour/miryoku #define MIRYOKU_KLUDGE_TOPROWCOMBOS_TERM 50 -#define MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(layer, position, binding) \ -toprowcombos_ ## layer ## _ ## position { \ - layers = ; \ - key-positions = ; \ - bindings = ; \ +#define MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(LAYER, POSITION, BINDING) \ +toprowcombos_ ## LAYER ## _ ## POSITION { \ + layers = ; \ + key-positions = ; \ + bindings = ; \ timeout-ms = ; \ }; @@ -40,47 +40,47 @@ toprowcombos_ ## layer ## _ ## position { \ #elif defined (MIRYOKU_ALPHAS_QWERTY) #elif defined (MIRYOKU_ALPHAS_QWERTZ) #else - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BASE, LEFTPINKIE, &kp Q) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BASE, LEFTINNERINDEX, &kp B) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BASE, RIGHTINNERINDEX, &kp J) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BASE, RIGHTPINKIE, &kp SQT) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BASE, LEFTPINKIE, &kp Q) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BASE, LEFTINNERINDEX, &kp B) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BASE, RIGHTINNERINDEX, &kp J) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BASE, RIGHTPINKIE, &kp SQT) #endif #if defined (MIRYOKU_NAV_INVERTEDT) #elif defined (MIRYOKU_NAV_VI) #else - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NAV, LEFTPINKIE, &bootloader) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NAV, LEFTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NAV, RIGHTINNERINDEX, U_RDO) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NAV, RIGHTPINKIE, U_UND) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NAV, LEFTPINKIE, &bootloader) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NAV, LEFTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NAV, RIGHTINNERINDEX, U_RDO) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NAV, RIGHTPINKIE, U_UND) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MOUSE, LEFTPINKIE, &bootloader) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MOUSE, LEFTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MOUSE, RIGHTINNERINDEX, U_RDO) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MOUSE, RIGHTPINKIE, U_UND) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MOUSE, LEFTPINKIE, &bootloader) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MOUSE, LEFTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MOUSE, RIGHTINNERINDEX, U_RDO) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MOUSE, RIGHTPINKIE, U_UND) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MEDIA, LEFTPINKIE, &bootloader) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MEDIA, LEFTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MEDIA, RIGHTINNERINDEX, &rgb_ug RGB_TOG) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(MEDIA, RIGHTPINKIE, &rgb_ug RGB_BRI) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MEDIA, LEFTPINKIE, &bootloader) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MEDIA, LEFTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MEDIA, RIGHTINNERINDEX, &rgb_ug RGB_TOG) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_MEDIA, RIGHTPINKIE, &u_rgb_bri) #endif - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NUM, LEFTPINKIE, &kp LBKT) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NUM, LEFTINNERINDEX, &kp RBKT) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NUM, RIGHTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(NUM, RIGHTPINKIE, &bootloader) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NUM, LEFTPINKIE, &kp LBKT) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NUM, LEFTINNERINDEX, &kp RBKT) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NUM, RIGHTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_NUM, RIGHTPINKIE, &bootloader) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(SYM, LEFTPINKIE, &kp LBRC) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(SYM, LEFTINNERINDEX, &kp RBRC) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(SYM, RIGHTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(SYM, RIGHTPINKIE, &bootloader) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_SYM, LEFTPINKIE, &kp LBRC) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_SYM, LEFTINNERINDEX, &kp RBRC) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_SYM, RIGHTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_SYM, RIGHTPINKIE, &bootloader) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(FUN, LEFTPINKIE, &kp F12) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(FUN, LEFTINNERINDEX, &kp PSCRN) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(FUN, RIGHTINNERINDEX, U_NA) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(FUN, RIGHTPINKIE, &bootloader) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_FUN, LEFTPINKIE, &kp F12) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_FUN, LEFTINNERINDEX, &kp PSCRN) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_FUN, RIGHTINNERINDEX, U_NA) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_FUN, RIGHTPINKIE, &bootloader) #endif - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BUTTON, LEFTPINKIE, U_UND) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BUTTON, LEFTINNERINDEX, U_RDO) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BUTTON, RIGHTINNERINDEX, U_RDO) - MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(BUTTON, RIGHTPINKIE, U_UND) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BUTTON, LEFTPINKIE, U_UND) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BUTTON, LEFTINNERINDEX, U_RDO) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BUTTON, RIGHTINNERINDEX, U_RDO) + MIRYOKU_KLUDGE_TOPROWCOMBOS_MACRO(U_BUTTON, RIGHTPINKIE, U_UND) }; };