diff --git a/vial/keymap.c b/vial/keymap.c index a37dbdc..7e10ff7 100644 --- a/vial/keymap.c +++ b/vial/keymap.c @@ -25,8 +25,8 @@ along with this program. If not, see . // #define LCTRL() C() #define L_ENG 0 -#define L_RU 2 #define L_NUMF 1 +#define L_RU 2 #define L_PUNC 3 #define L_IDK1 4 #define L_IDK2 5 @@ -46,18 +46,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`+---------+---------+---------||---------+---------+---------+' ), - [L_RU] = LAYOUT( - //,-----------------------------------------------------------. ,-----------------------------------------------------------. - KC_ESC, RU_H, RU_G, RU_JA, RU_Y, RU_U, RU_D, RU_CH, RU_M, RU_ZH, RU_E, RU_SC, - //|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------| - RU_F, RU_N, RU_I, RU_JE, RU_O, RU_SF, RU_P, RU_V, RU_T, RU_S, RU_R, RU_TS, - //|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------| - TD(5), RU_SH, RU_B, RU_JU, RU_A, RU_JO, RU_HD, RU_K, RU_L, RU_Z, RU_J, ALT_0, - //|---------+---------+---------+---------+---------+---------+---------||---------+---------+---------+---------+---------+---------+---------| - TD(0), TD(1), KC_LSHIFT, TD(2), TD(3), KC_TAB - //`+---------+---------+---------||---------+---------+---------+' - ), - [L_NUMF] = LAYOUT( //,-----------------------------------------------------------. ,-----------------------------------------------------------. XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, @@ -70,6 +58,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`+---------+---------+---------||---------+---------+---------+' ), + [L_RU] = LAYOUT( + //,-----------------------------------------------------------. ,-----------------------------------------------------------. + KC_ESC, RU_H, RU_G, RU_JA, RU_Y, RU_U, RU_D, RU_CH, RU_M, RU_ZH, RU_E, RU_SC, + //|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------| + RU_F, RU_N, RU_I, RU_JE, RU_O, RU_SF, RU_P, RU_V, RU_T, RU_S, RU_R, RU_TS, + //|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------| + TD(5), RU_SH, RU_B, RU_JU, RU_A, RU_JO, RU_HD, RU_K, RU_L, RU_Z, RU_J, ALT_0, + //|---------+---------+---------+---------+---------+---------+---------||---------+---------+---------+---------+---------+---------+---------| + TD(0), TD(1), KC_LSHIFT, TD(2), TD(3), KC_TAB + //`+---------+---------+---------||---------+---------+---------+' + ), + [L_PUNC] = LAYOUT( //,-----------------------------------------------------------. ,-----------------------------------------------------------. AG_PERC, EN_QUOT, AG_MINS, AG_SLSH, AG_EQL, AG_PLUS, EN_PIPE, AG_RPRN, EN_RCBR, EN_RBRC, EN_GT, EN_TILD, @@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------| KC_LCTL, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_DEL, DF(L_GAME), LA_CAPS, LA_ALSH, LA_CTSH, LA_WISP, KC_LALT, //|-----------+-----------+-----------+-----------+-----------+-----------+-----------||-----------+-----------+-----------+-----------+-----------+-----------+-----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, XXXXXXX, XXXXXXX, KC_LSHIFT, XXXXXXX, XXXXXXX //`+-----------+-----------+-----------||-----------+-----------+-----------+' ),