From ff2bd15e66849aefb603956d1fe1fc66ff02653b Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Tue, 26 Oct 2021 00:00:39 +1100 Subject: [PATCH] Integrate tangle scripts for Miryoku QMK and Miryoku ZMK --- miryoku/babel/alternatives.h | 235 ------------------ miryoku/babel/layer_names.h | 13 - miryoku/miryoku.dtsi | 53 +--- miryoku/miryoku.h | 41 +++ miryoku/miryoku_babel/miryoku_alternatives.h | 235 ++++++++++++++++++ .../miryoku_layer.h} | 3 +- miryoku/miryoku_babel/miryoku_layer_names.h | 12 + readme.org | 79 +++--- welcome.org | 12 +- 9 files changed, 341 insertions(+), 342 deletions(-) delete mode 100644 miryoku/babel/alternatives.h delete mode 100644 miryoku/babel/layer_names.h create mode 100644 miryoku/miryoku.h create mode 100644 miryoku/miryoku_babel/miryoku_alternatives.h rename miryoku/{layer.h => miryoku_babel/miryoku_layer.h} (98%) create mode 100644 miryoku/miryoku_babel/miryoku_layer_names.h diff --git a/miryoku/babel/alternatives.h b/miryoku/babel/alternatives.h deleted file mode 100644 index ad97388..0000000 --- a/miryoku/babel/alternatives.h +++ /dev/null @@ -1,235 +0,0 @@ -// Copyright 2021 Manna Harbour -// https://github.com/manna-harbour/miryoku -// generated -*- buffer-read-only: t -*- - -#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, \ -< 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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - -#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 - - -#define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP \ -&kp PG_UP, &kp HOME, &kp UP, &kp END, &kp INS, U_NA, U_NA, U_NA, U_NA, &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, U_NA, U_NA, U_NA, U_NA, &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_VI \ -&bootloader, U_NA, 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 - -#define MIRYOKU_ALTERNATIVES_NAV \ -&bootloader, U_NA, 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 - - -#define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP \ -U_NU, U_NU, &kp KP_N8, U_NU, U_NU, U_NA, U_NA, U_NA, U_NA, &bootloader, \ -U_NU, &kp KP_N4, &kp KP_N2, &kp KP_N6, 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_NU, U_NU, &kp KP_N5, U_NA, U_NA, U_NA, U_NP, U_NP - -#define MIRYOKU_ALTERNATIVES_MOUSE_FLIP \ -U_NU, U_NU, U_NU, U_NU, U_NU, U_NA, U_NA, U_NA, U_NA, &bootloader, \ -&kp KP_N4, &kp KP_N2, &kp KP_N8, &kp KP_N6, 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_NU, U_NU, &kp KP_N5, U_NA, U_NA, U_NA, U_NP, U_NP - -#define MIRYOKU_ALTERNATIVES_MOUSE_VI \ -&bootloader, U_NA, 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 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_N5, U_NU, U_NU, U_NP, U_NP - -#define MIRYOKU_ALTERNATIVES_MOUSE \ -&bootloader, U_NA, 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, 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_N5, U_NU, U_NU, U_NP, U_NP - - -#define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \ -&bt BT_SEL 0, &bt BT_SEL 1, &kp C_VOL_UP, &bt BT_SEL 2, &bt BT_SEL 3, U_NA, U_NA, U_NA, U_NA, &bootloader, \ -&bt BT_CLR, &kp C_PREV, &kp C_VOL_DN, &kp C_NEXT, &out OUT_TOG, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ -&rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, &rgb_ug RGB_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, U_NA, U_NA, U_NA, U_NA, &bootloader, \ -&kp C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, &out OUT_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, &bt BT_CLR, 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_VI \ -&bootloader, U_NA, 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 C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, &out OUT_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, &bt BT_CLR, \ -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, U_NA, 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 C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_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 C_STOP, &kp C_PP, &kp C_MUTE, U_NP, U_NP - - -#define MIRYOKU_ALTERNATIVES_NUM_FLIP \ -&bootloader, U_NA, U_NA, U_NA, 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, 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, U_NA, U_NA, U_NA, U_NA, &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, U_NA, U_NA, U_NA, 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, 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, U_NA, U_NA, U_NA, U_NA, &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, U_NA, U_NA, U_NA, 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, 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, U_NA, U_NA, U_NA, U_NA, &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 - - -#define MIRYOKU_ALTERNATIVES_BUTTON \ -U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, &trans, &trans, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ -U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ -U_NP, U_NP, U_NU, U_NU, &kp KP_N5, &kp KP_N5, U_NU, U_NU, U_NP, U_NP diff --git a/miryoku/babel/layer_names.h b/miryoku/babel/layer_names.h deleted file mode 100644 index 96c50a8..0000000 --- a/miryoku/babel/layer_names.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2021 Manna Harbour -// https://github.com/manna-harbour/miryoku -// generated -*- buffer-read-only: t -*- - -#define BASE 0 -#define TAP 1 -#define BUTTON 2 -#define NAV 3 -#define MOUSE 4 -#define MEDIA 5 -#define NUM 6 -#define SYM 7 -#define FUN 8 diff --git a/miryoku/miryoku.dtsi b/miryoku/miryoku.dtsi index e6406a0..e85ab3b 100644 --- a/miryoku/miryoku.dtsi +++ b/miryoku/miryoku.dtsi @@ -1,6 +1,5 @@ // Copyright 2021 Manna Harbour // https://github.com/manna-harbour/miryoku -// generated -*- buffer-read-only: t -*- #include #include @@ -8,41 +7,7 @@ #include #include -#include "babel/layer_names.h" - -#include "layer.h" - -#define U_EXPAND(macro, ...) macro(__VA_ARGS__) - -#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(LG(Z)) -#define U_PST &kp LG(V) -#define U_CPY &kp LG(C) -#define U_CUT &kp LG(X) -#define U_UND &kp LG(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 +#include "miryoku.h" / { behaviors { @@ -62,35 +27,35 @@ compatible = "zmk,keymap"; BASE_layer { label = "Base"; - bindings = < U_EXPAND(MIRYOKU_MAPPING, MIRYOKU_LAYER_BASE) >; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_BASE) >; }; BUTTON_layer { label = "Button"; - bindings = < U_EXPAND(MIRYOKU_MAPPING, MIRYOKU_LAYER_BUTTON) >; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_BUTTON) >; }; NAV_layer { label = "Nav"; - bindings = < U_EXPAND(MIRYOKU_MAPPING, MIRYOKU_LAYER_NAV) >; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_NAV) >; }; MOUSE_layer { label = "Mouse"; - bindings = < U_EXPAND(MIRYOKU_MAPPING, MIRYOKU_LAYER_MOUSE) >; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_MOUSE) >; }; MEDIA_layer { label = "Media"; - bindings = < U_EXPAND(MIRYOKU_MAPPING, MIRYOKU_LAYER_MEDIA) >; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_MEDIA) >; }; NUM_layer { label = "Num"; - bindings = < U_EXPAND(MIRYOKU_MAPPING, MIRYOKU_LAYER_NUM) >; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_NUM) >; }; SYM_layer { label = "Sym"; - bindings = < U_EXPAND(MIRYOKU_MAPPING, MIRYOKU_LAYER_SYM) >; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_SYM) >; }; FUN_layer { label = "Fun"; - bindings = < U_EXPAND(MIRYOKU_MAPPING, MIRYOKU_LAYER_FUN) >; + bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_FUN) >; }; }; }; diff --git a/miryoku/miryoku.h b/miryoku/miryoku.h new file mode 100644 index 0000000..c3c6d08 --- /dev/null +++ b/miryoku/miryoku.h @@ -0,0 +1,41 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku + +#pragma once + +#include "miryoku_babel/miryoku_layer_names.h" +#include "miryoku_babel/miryoku_layer.h" + +#define U_MACRO_VA_ARGS(macro, ...) macro(__VA_ARGS__) + +#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(LG(Z)) +#define U_PST &kp LG(V) +#define U_CPY &kp LG(C) +#define U_CUT &kp LG(X) +#define U_UND &kp LG(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 + + diff --git a/miryoku/miryoku_babel/miryoku_alternatives.h b/miryoku/miryoku_babel/miryoku_alternatives.h new file mode 100644 index 0000000..7ba3f10 --- /dev/null +++ b/miryoku/miryoku_babel/miryoku_alternatives.h @@ -0,0 +1,235 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku +// generated -*- buffer-read-only: t -*- +// target: zmk + +#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, \ +< 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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + +#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 + + +#define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP \ +&kp PG_UP, &kp HOME, &kp UP, &kp END, &kp INS, U_NA, U_NA, U_NA, U_NA, &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, U_NA, U_NA, U_NA, U_NA, &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_VI \ +&bootloader, U_NA, 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 + +#define MIRYOKU_ALTERNATIVES_NAV \ +&bootloader, U_NA, 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 + + +#define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP \ +U_NU, U_NU, &kp KP_N8, U_NU, U_NU, U_NA, U_NA, U_NA, U_NA, &bootloader, \ +U_NU, &kp KP_N4, &kp KP_N2, &kp KP_N6, 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_NU, U_NU, &kp KP_N5, U_NA, U_NA, U_NA, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_MOUSE_FLIP \ +U_NU, U_NU, U_NU, U_NU, U_NU, U_NA, U_NA, U_NA, U_NA, &bootloader, \ +&kp KP_N4, &kp KP_N2, &kp KP_N8, &kp KP_N6, 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_NU, U_NU, &kp KP_N5, U_NA, U_NA, U_NA, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_MOUSE_VI \ +&bootloader, U_NA, 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 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_N5, U_NU, U_NU, U_NP, U_NP + +#define MIRYOKU_ALTERNATIVES_MOUSE \ +&bootloader, U_NA, 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, 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_N5, U_NU, U_NU, U_NP, U_NP + + +#define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \ +&bt BT_SEL 0, &bt BT_SEL 1, &kp C_VOL_UP, &bt BT_SEL 2, &bt BT_SEL 3, U_NA, U_NA, U_NA, U_NA, &bootloader, \ +&bt BT_CLR, &kp C_PREV, &kp C_VOL_DN, &kp C_NEXT, &out OUT_TOG, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ +&rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI, &rgb_ug RGB_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, U_NA, U_NA, U_NA, U_NA, &bootloader, \ +&kp C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, &out OUT_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, &bt BT_CLR, 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_VI \ +&bootloader, U_NA, 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 C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_NEXT, &out OUT_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, &bt BT_CLR, \ +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, U_NA, 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 C_PREV, &kp C_VOL_DN, &kp C_VOL_UP, &kp C_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 C_STOP, &kp C_PP, &kp C_MUTE, U_NP, U_NP + + +#define MIRYOKU_ALTERNATIVES_NUM_FLIP \ +&bootloader, U_NA, U_NA, U_NA, 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, 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, U_NA, U_NA, U_NA, U_NA, &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, U_NA, U_NA, U_NA, 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, 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, U_NA, U_NA, U_NA, U_NA, &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, U_NA, U_NA, U_NA, 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, 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, U_NA, U_NA, U_NA, U_NA, &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 + + +#define MIRYOKU_ALTERNATIVES_BUTTON \ +U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, &none, &none, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ +U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ +U_NP, U_NP, U_NU, U_NU, &kp KP_N5, &kp KP_N5, U_NU, U_NU, U_NP, U_NP diff --git a/miryoku/layer.h b/miryoku/miryoku_babel/miryoku_layer.h similarity index 98% rename from miryoku/layer.h rename to miryoku/miryoku_babel/miryoku_layer.h index 1f56fbb..90de36d 100644 --- a/miryoku/layer.h +++ b/miryoku/miryoku_babel/miryoku_layer.h @@ -1,9 +1,10 @@ // Copyright 2021 Manna Harbour // https://github.com/manna-harbour/miryoku +// generated -*- buffer-read-only: t -*- #pragma once -#include "babel/alternatives.h" +#include "miryoku_alternatives.h" #if !defined(MIRYOKU_LAYER_BASE) #if defined (MIRYOKU_LAYERS_FLIP) diff --git a/miryoku/miryoku_babel/miryoku_layer_names.h b/miryoku/miryoku_babel/miryoku_layer_names.h new file mode 100644 index 0000000..6c06c6c --- /dev/null +++ b/miryoku/miryoku_babel/miryoku_layer_names.h @@ -0,0 +1,12 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku +// 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 diff --git a/readme.org b/readme.org index b84baed..921fa80 100644 --- a/readme.org +++ b/readme.org @@ -1,51 +1,42 @@ # Copyright 2021 Manna Harbour # https://github.com/manna-harbour/miryoku -#+Title: Miryoku ZMK [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/miryoku-roa-32.png]] +* Miryoku ZMK [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/miryoku-roa-32.png]] [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/cover/miryoku-kle-cover.png]] [[https://github.com/manna-harbour/miryoku/][Miryoku]] is an ergonomic, minimal, orthogonal, and universal keyboard layout. This is the Miryoku implementation for [[https://zmkfirmware.dev/][ZMK]]. -* Contents :TOC_1: -- [[#building][Building]] -- [[#miryoku-keymap][Miryoku Keymap]] -- [[#configuration-options][Configuration Options]] -- [[#config-file][Config File]] -- [[#example-config-file][Example Config File]] -- [[#mapping][Mapping]] -- [[#keyboard-keymaps][Keyboard Keymaps]] -- [[#contact][Contact]] -* Building +** Building -** Supported Keyboards +*** Supported Keyboards See the various Test [[#github-actions-workflows][workflow]] files for lists of supported keyboards. -*** Board Only +**** Board Only Any [[https://github.com/zmkfirmware/zmk/tree/main/app/boards/arm][board supported by ZMK]] with a [[#keyboard-keymaps][keymap in Miryoku ZMK]]. -*** Board / Shield Combination +**** Board / Shield Combination Any compatible combination of [[https://github.com/zmkfirmware/zmk/tree/main/app/boards/arm][board supported by ZMK]] and [[https://github.com/zmkfirmware/zmk/tree/main/app/boards/shields][shield supported by ZMK]] with a [[#keyboard-keymaps][keymap in Miryoku ZMK]]. -*** Out of Tree Boards and Shields +**** Out of Tree Boards and Shields Additionally, some out of tree boards and shields are automatically supported by the included [[#github-actions-workflows][workflows]]. See [[.github/workflows/outboards]]. -** Local Builds +*** Local Builds Clone this repo and use for [[https://zmk.dev/docs/development/build-flash#building-from-zmk-config-folder][ZMK_CONFIG]]. -** GitHub Actions Workflows +*** GitHub Actions Workflows Workflow files are in [[.github/workflows]]. To access a workflow, log in to GitHub, visit the [[https://github.com/manna-harbour/zmk-config/actions][Actions]] tab, and select the workflow. To download the firmware from a workflow run, select the workflow, select the workflow run, select the desired Artifacts, and unzip the downloaded zip file. @@ -54,22 +45,22 @@ Workflow files are in [[.github/workflows]]. To access a workflow, log in to Gi The ~kconfig~ option can be used to generate a ~keyboard.conf~. Join multiple lines with ~\n~. -*** Build Examples +**** Build Examples Fork this repo, copy one of the included Build Example workflow files, edit the ~name~ value, and edit the values for each matrix option as desired. -*** Build Inputs +**** Build Inputs Fork this repo, select the [[https://github.com/manna-harbour/zmk-config/actions/workflows/build-inputs.yml][Build Inputs]] workflow, select Run workflow, and fill out the form as desired. Multiple (comma and / or space separated) values can be entered in each field. Activate Run workflow, and wait for successful completion. -*** Prebuilt Firmware +**** Prebuilt Firmware Some prebuilt firmware is available from previous workflow runs. -* Miryoku Keymap +** Miryoku Keymap The Miryoku keymap is a ZMK DT keymap file using C preprocessor macros for [[#configuration-options][configuration options]] and to abstract the physical layout. The file is [[miryoku/miryoku.dtsi]]. The file is included into the [[#keyboard-keymaps][keyboard's keymap]] after the config file and mapping with: @@ -78,22 +69,22 @@ The Miryoku keymap is a ZMK DT keymap file using C preprocessor macros for [[#co #+END_SRC -* Configuration Options +** Configuration Options [[https://github.com/manna-harbour/qmk_firmware/blob/miryoku/users/manna-harbour_miryoku/miryoku.org#alternative-layouts][Keymap configuration options]] and [[#mapping][mapping]] configuration options are given in the documentation in the form ~option=value~. -** Use in Local Builds +*** Use in Local Builds Convert to the form ~#define option_value~ and add to the [[#config-file][config file]]. -** Use in Workflow Builds +*** Use in Workflow Builds Convert to the form ~value~ (uppercase or lowercase) and use with the corresponding ~option~. Use ~default~ to represent the default value. -* Config File +** Config File The config file can be used to provide [[#configuration-options][configuration options]] for all [[#Local-Builds][local builds]]. The file is [[miryoku/config.h]]. See the [[#example-config-file][example config file]]. The config file is included into the keyboard's keymap file before the mapping with: @@ -101,7 +92,8 @@ The config file can be used to provide [[#configuration-options][configuration o #include "../miryoku/config.h" #+END_SRC -* Example Config File + +** Example Config File Below is an example [[#config-file][config file]] with the following keymap [[#configuration-options][configuration options]]: @@ -119,7 +111,7 @@ Below is an example [[#config-file][config file]] with the following keymap [[#c #+END_SRC -* Mapping +** Mapping The keymap is mapped onto keyboards with different physical layouts. The keymap is specified in terms of the ~MIRYOKU_MAPPING~ macro. The macro is defined in a C header file for each physical layout. Unused keys are mapped to ~&none~. The files are in [[miryoku/mapping/]]. The mapping file is included into the keyboard's keymap file before the Miryoku keymap with e.g. @@ -130,72 +122,69 @@ The keymap is mapped onto keyboards with different physical layouts. The keymap On each hand, only the main alpha block of 3 rows by 5 columns and the 3 most appropriate thumb keys are used. -** Notes +*** Notes Notes or diagrams are included where the selection of keys is not obvious or where alternatives are provided via mapping [[#configuration-options][configuration options]]. -*** 34-ferris + +**** 34-ferris ~MIRYOKU_COMBO_TPS=ENABLE~ Combos of primary and secondary thumb keys emulate the missing tertiary thumb key. This [[#configuration-options][configuration option]] is enabled automatically for this mapping and can be enabled on other mappings for compatibility. -*** 48-planck +**** 48-planck -**** Default +***** Default -[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/kle-miryoku-mapping-ortho_4x12.png]] +[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-ortho_4x12.png]] -**** Extended Thumbs +***** Extended Thumbs ~MIRYOKU_MAPPING=EXTENDED_THUMBS~ [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-ortho_4x12-extended_thumbs.png]] -*** 48-lets_split +**** 48-lets_split -**** Default +***** Default [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-ortho_4x12-extended_thumbs.png]] -**** Pinkie Stagger +***** Pinkie Stagger ~MIRYOKU_MAPPING=PINKIE_STAGGER~ [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-ortho_4x12-split.png]] -*** 50-kyria +**** 50-kyria -**** Default +***** Default [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-kyria.png]] -**** Extend Thumbs +***** Extend Thumbs ~MIRYOKU_MAPPING=EXTENDED_THUMBS~ [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-kyria-extended_thumbs.png]] -* Keyboard Keymaps +** Keyboard Keymaps Keymap files for many keyboards included in ZMK are provided in [[config/]]. -* Contact -For feature requests or issues with code or documentation please -[[https://github.com/manna-harbour/zmk-config/issues/new][open an issue]]. - -For more general discussion please [[https://github.com/manna-harbour/manna-harbour/tree/main/contact][contact Manna Harbour]]. +** [[https://github.com/manna-harbour][https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/manna-harbour-boa-32.png]] diff --git a/welcome.org b/welcome.org index 8953c2d..ede2983 100644 --- a/welcome.org +++ b/welcome.org @@ -17,13 +17,17 @@ Please let me know if you have any issues. The keymap can be used now, but there's still some work needed before release. -*** Miryoku documentation +*** +Miryoku documentation+ -Miryoku documentation is being moved from the Miryoku QMK repo to the Miryoku repo. For now, refer to the documentation in Miryoku QMK. ++Miryoku documentation is being moved from the Miryoku QMK repo to the Miryoku repo. For now, refer to the documentation in Miryoku QMK.+ -*** Miyroku Babel +Miryoku documentation is now at https://github.com/manna-harbour/miryoku. -Code generation in Miryoku QMK and Miryoku ZMK is being combined into Miryoku Babel. At the moment the Miryoku ZMK keymap is generated from [[miryoku/miryoku-zmk-babel.org]]. Refer to the documentation in Miryoku QMK. +*** +Miyroku Babel+ + ++Code generation in Miryoku QMK and Miryoku ZMK is being combined into Miryoku Babel. At the moment the Miryoku ZMK keymap is generated from [[miryoku/miryoku-zmk-babel.org]]. Refer to the documentation in Miryoku QMK.+ + +Miryoku Babel is now being used. *** Add new keyboard control layers