diff --git a/.github/workflows/test-all-configs.yml b/.github/workflows/test-all-configs.yml index 53552f2..2b29c99 100644 --- a/.github/workflows/test-all-configs.yml +++ b/.github/workflows/test-all-configs.yml @@ -11,7 +11,7 @@ jobs: with: board: '["nice_nano"]' shield: '["corne_left"]' - alphas: '["default","azerty","colemak","colemakdhk","dvorak","halmak","workman","qwerty","qwertz"]' + alphas: '["default","azerty","beakl15","colemak","colemakdhk","dvorak","halmak","workman","qwerty","qwertz"]' nav: '["default","vi","invertedt"]' clipboard: '["default","fun","mac","win"]' layers: '["default","flip"]' diff --git a/miryoku/miryoku_babel/miryoku_alternatives.h b/miryoku/miryoku_babel/miryoku_alternatives.h index 2f25ab3..5908f71 100644 --- a/miryoku/miryoku_babel/miryoku_alternatives.h +++ b/miryoku/miryoku_babel/miryoku_alternatives.h @@ -11,6 +11,12 @@ < 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_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 + #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, \ @@ -65,6 +71,12 @@ U_NP, U_NP, < FUN DEL, < NUM BSPC, < < 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_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 + #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, \ diff --git a/miryoku/miryoku_babel/miryoku_layer.h b/miryoku/miryoku_babel/miryoku_layer.h index a3d007c..b985444 100644 --- a/miryoku/miryoku_babel/miryoku_layer.h +++ b/miryoku/miryoku_babel/miryoku_layer.h @@ -10,6 +10,8 @@ #if defined (MIRYOKU_LAYERS_FLIP) #if defined (MIRYOKU_ALPHAS_AZERTY) #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP + #elif defined (MIRYOKU_ALPHAS_BEAKL15) + #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP #elif defined (MIRYOKU_ALPHAS_COLEMAK) #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP #elif defined (MIRYOKU_ALPHAS_COLEMAKDHK) @@ -30,6 +32,8 @@ #else #if defined (MIRYOKU_ALPHAS_AZERTY) #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_AZERTY + #elif defined (MIRYOKU_ALPHAS_BEAKL15) + #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_BEAKL15 #elif defined (MIRYOKU_ALPHAS_COLEMAK) #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAK #elif defined (MIRYOKU_ALPHAS_COLEMAKDHK)