Cleaned up keymaps

keyboards/betalupi_ergodox/keymaps/default/keymap.c

@@ -6,8 +6,6 @@
 enum custom_keycodes {
 	M_SHUTDOWN = BETA_SAFE_RANGE,
 	M_RESETWM,
-	RU_LAYER,
-	EN_LAYER,
 	M_RU_CTRL,
 	M_RU_ALT
 };
@@ -21,56 +19,48 @@ enum tap_dance_codes {
 enum layer_indices {
 	LAYER_MAIN_IDX = 0,
 	LAYER_RUSSIAN_IDX,
-	LAYER_COLEMAK_IDX,
 	LAYER_NUMPAD_IDX,
 	LAYER_SYMBOLS_IDX,
 	LAYER_ARROWS_IDX,
 	LAYER_FKEYS_IDX,
 	LAYER_DESKTOP_IDX,
 	LAYER_KEYBOARD_IDX,
+	LAYER_SYMBOLS_RU_IDX
+};
 
-};
-// Used to set system keymap
-enum key_encodings {
-	LANG_NULL,	// For layers that don't care about input lang
-	LANG_EN,
-	LANG_RU
-};
 enum led_indices {
 	// We have seperate indexes for LEDs because
 	// some layers may not need an led map.
 	// This saves memory by avoiding extra empty led maps.
-	LAYER_COLEMAK_LEDS_IDX = 0,
-	LAYER_RUSSIAN_LEDS_IDX,
+	LAYER_RUSSIAN_LEDS_IDX = 0,
 	LAYER_NUMPAD_LEDS_IDX,
 	LAYER_SYMBOLS_LEDS_IDX,
 	LAYER_ARROWS_LEDS_IDX,
 	LAYER_FKEYS_LEDS_IDX,
-	LAYER_DESKTOP_LEDS_IDX
+	LAYER_DESKTOP_LEDS_IDX,
+	LAYER_SYMBOLS_RU_LEDS_IDX
 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[LAYER_MAIN_IDX] = LAYER_MAIN,
 	[LAYER_RUSSIAN_IDX] = LAYER_RUSSIAN,
-	[LAYER_COLEMAK_IDX] = LAYER_COLEMAK,
 	[LAYER_NUMPAD_IDX] = LAYER_NUMPAD,
 	[LAYER_SYMBOLS_IDX] = LAYER_SYMBOLS,
 	[LAYER_ARROWS_IDX] = LAYER_ARROWS,
 	[LAYER_FKEYS_IDX] = LAYER_FKEYS,
 	[LAYER_DESKTOP_IDX] = LAYER_DESKTOP,
-	[LAYER_KEYBOARD_IDX] = LAYER_KEYBOARD
+	[LAYER_KEYBOARD_IDX] = LAYER_KEYBOARD,
+	[LAYER_SYMBOLS_RU_IDX] = LAYER_SYMBOLS_RU
 };
 const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
-	[LAYER_COLEMAK_LEDS_IDX] = LAYER_COLEMAK_LEDS,
 	[LAYER_RUSSIAN_LEDS_IDX] = LAYER_RUSSIAN_LEDS,
 	[LAYER_NUMPAD_LEDS_IDX] = LAYER_NUMPAD_LEDS,
 	[LAYER_SYMBOLS_LEDS_IDX] = LAYER_SYMBOLS_LEDS,
 	[LAYER_ARROWS_LEDS_IDX] = LAYER_ARROWS_LEDS,
 	[LAYER_FKEYS_LEDS_IDX] = LAYER_FKEYS_LEDS,
-	[LAYER_DESKTOP_LEDS_IDX] = LAYER_DESKTOP_LEDS
+	[LAYER_DESKTOP_LEDS_IDX] = LAYER_DESKTOP_LEDS,
+	[LAYER_SYMBOLS_RU_LEDS_IDX] = LAYER_SYMBOLS_RU_LEDS
 };
 
-int current_lang = LANG_EN;
-
 void keyboard_post_init_user(void) {}
 
 
@@ -98,12 +88,12 @@ void rgb_matrix_indicators_user(void) {
 	}
 
 	switch (biton32(layer_state)) {
-		case LAYER_COLEMAK_IDX:
-			set_layer_color(LAYER_COLEMAK_LEDS_IDX);
-			break;
 		case LAYER_RUSSIAN_IDX:
 			set_layer_color(LAYER_RUSSIAN_LEDS_IDX);
 			break;
+		case LAYER_SYMBOLS_RU_IDX:
+			set_layer_color(LAYER_SYMBOLS_RU_LEDS_IDX);
+			break;
 		case LAYER_NUMPAD_IDX:
 			set_layer_color(LAYER_NUMPAD_LEDS_IDX);
 			break;
@@ -127,28 +117,6 @@ void rgb_matrix_indicators_user(void) {
 	}
 }
 
-void set_lang(int lang) { set_lang_long(lang, false); }
-void set_lang_long(int lang, bool force) {
-	if (current_lang != lang || force) {
-		switch (lang) {
-			case LANG_EN:
-				SEND_STRING(SS_LGUI(SS_LSFT(SS_LCTL(SS_TAP(X_0)))));
-				current_lang = lang;
-				break;
-
-			case LANG_RU:
-				SEND_STRING(SS_LGUI(SS_LSFT(SS_LCTL(SS_TAP(X_9)))));
-				current_lang = lang;
-				break;
-
-			case LANG_NULL:
-				break;
-			default:
-				break;
-		}
-	}
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	switch (keycode) {
 		case M_RESETWM:
@@ -163,34 +131,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 			}
 			break;
 
-		case RU_LAYER:
-			if (record->event.pressed) {
-				set_lang(LANG_RU);
-				layer_move(LAYER_RUSSIAN_IDX);
-			}
-			break;
-
-		case EN_LAYER:
-			if (record->event.pressed) {
-				set_lang(LANG_EN);
-				layer_move(LAYER_MAIN_IDX);
-			}
-			break;
-
 		case M_RU_CTRL:
 			if (record->event.pressed) {
-				if (current_lang == LANG_RU) {
-					set_lang_long(LANG_EN, true);
 				layer_move(LAYER_MAIN_IDX);
-					current_lang = LANG_RU;
-				}
 				register_code16(KC_LCTRL);
 			} else {
 				unregister_code16(KC_LCTRL);
-				if (current_lang == LANG_RU) {
 				layer_move(LAYER_RUSSIAN_IDX);
-					set_lang_long(LANG_RU, true);
-				}
 			}
 			break;
 	}
@@ -208,47 +155,16 @@ uint32_t layer_state_set_user(uint32_t state) {
 	ergodox_right_led_3_off();
 
 	switch (layer) {
-		case LAYER_MAIN_IDX:
-			set_lang(LANG_EN);
-			break;
-
-		case LAYER_RUSSIAN_IDX:
-			set_lang(LANG_RU);
-			ergodox_right_led_2_on();
-			break;
-
-		case LAYER_COLEMAK_IDX:
-			set_lang(LANG_EN);
-			ergodox_right_led_2_on();
-			break;
-
 		case LAYER_NUMPAD_IDX:
-			set_lang(LANG_EN);
 			ergodox_right_led_1_on();
 			break;
 
-		case LAYER_SYMBOLS_IDX:
-			set_lang(LANG_EN);
-			break;
-
-		case LAYER_ARROWS_IDX:
-			set_lang(LANG_EN);
-			break;
-
-		case LAYER_FKEYS_IDX:
-			set_lang(LANG_EN);
-			break;
-
-		case LAYER_DESKTOP_IDX:
-			set_lang(LANG_EN);
-			break;
-
 		case LAYER_KEYBOARD_IDX:
-			set_lang(LANG_NULL);
 			ergodox_right_led_1_on();
 			ergodox_right_led_2_on();
 			ergodox_right_led_3_on();
 			break;
+
 		default:
 			break;
 	}

keyboards/betalupi_ergodox/keymaps/default/keymap.h

@@ -2,29 +2,15 @@
 
 #include "betalupi_ergodox.h"
 #include "version.h"
+
 #include "keymap_russian.h"
 #include "keymap_us_international.h"
 
-
 #include "layers.h"
 #include "tapdance.h"
 
 
-#define KC_MAC_UNDO LGUI(KC_Z)
-#define KC_MAC_CUT LGUI(KC_X)
-#define KC_MAC_COPY LGUI(KC_C)
-#define KC_MAC_PASTE LGUI(KC_V)
-#define KC_PC_UNDO LCTL(KC_Z)
-#define KC_PC_CUT LCTL(KC_X)
-#define KC_PC_COPY LCTL(KC_C)
-#define KC_PC_PASTE LCTL(KC_V)
-#define ES_LESS_MAC KC_GRAVE
-#define ES_GRTR_MAC LSFT(KC_GRAVE)
-#define ES_BSLS_MAC ALGR(KC_6)
-#define NO_PIPE_ALT KC_GRAVE
-#define NO_BSLS_ALT KC_EQUAL
-#define LSA_T(kc) MT(MOD_LSFT | MOD_LALT, kc)
-#define BP_NDSH_MAC ALGR(KC_8)
+extern rgb_config_t rgb_matrix_config;
 
 /* Text keyboard
 *
@@ -48,21 +34,6 @@
 *                                 `--------------------'       `----------------------'
 */
 
-/* LED layout template
-#define LAYER_COLEMAK_LEDS LEDS_ergodox(\
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	\
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	              LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF  \
-)
-*/
 
 // LED colors, in HSV.
 #define LC_OFF    LC_HSV(  0,   0,  0)
@@ -76,9 +47,3 @@
 #define LC_RU_G LC_HSV(153, 255, 153)
 #define LC_RU_K LC_HSV(  0, 255, 145)
 
-
-extern int current_lang;
-extern rgb_config_t rgb_matrix_config;
-
-void set_lang(int lang);
-void set_lang_long(int lang, bool force);

keyboards/betalupi_ergodox/keymaps/default/layers.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "layers/main.h"
-#include "layers/colemak.h"
 #include "layers/numpad.h"
 #include "layers/symbols.h"
 #include "layers/arrows.h"
@@ -9,3 +8,4 @@
 #include "layers/desktop.h"
 #include "layers/keyboard.h"
 #include "layers/russian.h"
+#include "layers/symbols_ru.h"

keyboards/betalupi_ergodox/keymaps/default/layers/arrows.h

@@ -3,8 +3,8 @@
 
 #define LAYER_ARROWS LAYOUT_ergodox(\
 	KC_TRANSPARENT, KC_NO,                KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,\
-	KC_TRANSPARENT, LGUI(LCTL(KC_ENTER)), KC_NO,          KC_UP,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
-	KC_LGUI,        LALT(KC_LCTRL),       KC_LEFT,        KC_DOWN,        KC_RIGHT,       KC_NO,\
+	KC_TRANSPARENT, LGUI(LCTL(KC_ENTER)), KC_NO,          KC_UP,          KC_NO,          KC_PGUP,        KC_TRANSPARENT,\
+	KC_LGUI,        LALT(KC_LCTRL),       KC_LEFT,        KC_DOWN,        KC_RIGHT,       KC_PGDN,\
 	KC_TRANSPARENT, LGUI(KC_LCTRL),       KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
 	KC_TRANSPARENT, KC_TRANSPARENT,       KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 \
@@ -14,8 +14,8 @@
 \
 \
 	KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,\
-	KC_TRANSPARENT, KC_NO,          KC_PGUP,        KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
-	KC_NO,          KC_PGDOWN,      KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
+	KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
+	                KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
 	KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,\
 	                KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 \
@@ -26,14 +26,14 @@
 
 #define LAYER_ARROWS_LEDS LEDS_ergodox(\
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_YELLOW,    LC_OFF,       LC_GREEN,     LC_OFF,       LC_OFF, \
-	LC_ORANGE,    LC_GREEN,     LC_GREEN,     LC_GREEN,     LC_OFF, \
+	LC_YELLOW,    LC_OFF,       LC_GREEN,     LC_OFF,       LC_ORANGE, \
+	LC_ORANGE,    LC_GREEN,     LC_GREEN,     LC_GREEN,     LC_ORANGE, \
 	LC_ORANGE,    LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_PINK, \
 	\
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_GREEN,     LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_GREEN,     LC_OFF,       LC_OFF,       LC_OFF, \
+	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
+	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
 	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
 	              LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF  \
 )

keyboards/betalupi_ergodox/keymaps/default/layers/colemak.h

@@ -1,39 +0,0 @@
-#pragma once
-#include "keymap.h"
-
-#define LAYER_COLEMAK LAYOUT_ergodox(\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_Q,           KC_W,           KC_F,           KC_P,           KC_B,           KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_A,           KC_R,           KC_S,           KC_T,           KC_G,\
-	KC_TRANSPARENT, KC_Z,           KC_X,           KC_C,           KC_D,           KC_V,           KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-\
-	KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-\
-\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_J,           KC_L,           KC_U,           KC_O,           KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_M,           KC_N,           KC_E,           KC_TRANSPARENT, KC_I,           KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_K,           KC_H,           KC_O,           KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-\
-	KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT\
-)
-
-#define LAYER_COLEMAK_LEDS LEDS_ergodox(\
-	LC_PINK,      LC_PINK,      LC_PINK,      LC_PINK,      LC_PINK, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	\
-	LC_PINK,      LC_PINK,      LC_PINK,      LC_PINK,      LC_PINK, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
-	              LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF  \
-)

keyboards/betalupi_ergodox/keymaps/default/layers/fkeys.h

@@ -2,26 +2,26 @@
 #include "keymap.h"
 
 #define LAYER_FKEYS LAYOUT_ergodox(\
-	KC_TRANSPARENT, KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_F11,         KC_F12,         KC_F13,         KC_F14,         KC_F15,         KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
+	KC_NO, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,\
+	KC_NO, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_NO,\
+	KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,\
+	KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,\
+	KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,\
 \
-					KC_TRANSPARENT, KC_TRANSPARENT,\
-									KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
+	       KC_NO, KC_NO,\
+	              KC_NO,\
+	KC_NO, KC_NO, KC_NO,\
 \
 \
-	KC_TRANSPARENT, KC_F6,          KC_F7,          KC_F8,          KC_F9,           KC_F10,         KC_TRANSPARENT, \
-	KC_TRANSPARENT, KC_F16,         KC_F17,         KC_F18,         KC_F19,          KC_F20,         KC_TRANSPARENT, \
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
+	KC_NO, KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_NO, \
+	KC_NO, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_NO, \
+	       KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, \
+	KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, \
+	               KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, \
 \
-	KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_TRANSPARENT, \
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT \
+	KC_NO, KC_NO,\
+	KC_NO, \
+	KC_NO, KC_NO, KC_NO \
 )
 
 #define LAYER_FKEYS_LEDS LEDS_ergodox(\

keyboards/betalupi_ergodox/keymaps/default/layers/main.h

@@ -5,7 +5,7 @@
 	KC_ESCAPE,              KC_1,                 KC_2,       KC_3,           KC_4,       KC_5,           TG(LAYER_NUMPAD_IDX),\
 	KC_TAB,                 KC_Q,                 KC_W,       KC_E,           KC_R,       KC_T,           KC_LGUI,\
 	KC_DELETE,              KC_A,                 KC_S,       KC_D,           KC_F,       KC_G,\
-	M_RU_CTRL,      KC_Z,   KC_X,           KC_C,           KC_V,           KC_B,           KC_TRANSPARENT,\
+	M_RU_CTRL,              KC_Z,                 KC_X,       KC_C,           KC_V,       KC_B,           KC_NO,\
 	MO(LAYER_DESKTOP_IDX),  MO(LAYER_FKEYS_IDX),  KC_LALT,    KC_LSHIFT,      MO(LAYER_ARROWS_IDX),\
 \
 	          KC_PSCREEN,   KC_NO,\
@@ -14,10 +14,10 @@
 \
 \
 	LCTL(KC_LALT),  KC_6,   KC_7,     KC_8,   KC_9,                   KC_0,                   LGUI(KC_TAB),\
-	KC_TRANSPARENT, KC_Y,           KC_U,           KC_I,           KC_O,           KC_TRANSPARENT, KC_TRANSPARENT,\
-	KC_H,           KC_J,           KC_K,           MO(LAYER_SYMBOLS_IDX),          KC_L,           KC_TRANSPARENT,\
-	KC_TRANSPARENT, KC_N,           KC_M,           KC_P,           KC_DOT,         KC_COMMA,       KC_TRANSPARENT,\
-	KC_RIGHT,       KC_TRANSPARENT, KC_TRANSPARENT, TO(LAYER_KEYBOARD_IDX),         KC_TRANSPARENT,\
+	KC_NO,          KC_Y,   KC_U,     KC_I,   KC_O,                   KC_NO,                  KC_NO,\
+	                KC_H,   KC_J,     KC_K,   MO(LAYER_SYMBOLS_IDX),  KC_L,                   KC_NO,\
+	KC_NO,          KC_N,   KC_M,     KC_P,   KC_DOT,                 KC_COMMA,               KC_NO,\
+                            KC_RIGHT, KC_NO,  KC_NO,                  TO(LAYER_KEYBOARD_IDX), KC_NO,\
 \
 	LGUI(KC_SPACE),  TO(LAYER_RUSSIAN_IDX),\
 	KC_NO,\

keyboards/betalupi_ergodox/keymaps/default/layers/russian.h

@@ -2,7 +2,7 @@
 #include "keymap.h"
 
 #define LAYER_RUSSIAN LAYOUT_ergodox(\
-	KC_TRANSPARENT, KC_TRANSPARENT,        KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
+	KC_TRANSPARENT, RU_1,                  RU_2,           RU_3,           RU_4,           RU_5,  KC_TRANSPARENT,\
 	KC_TRANSPARENT, RU_CHE,                RU_SHA,         RU_IE,          RU_ER,          RU_TE,          RU_YO,\
 	KC_TRANSPARENT, RU_A,                  RU_ES,          RU_DE,          RU_EF,          RU_GHE,\
 	M_RU_CTRL,      RU_ZE,                 RU_YA,          RU_TSE,         RU_VE,          RU_BE,          RU_E,\
@@ -13,9 +13,9 @@
 	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 \
 \
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, RU_NUM,         RU_RUBL,        KC_TRANSPARENT,\
+	KC_TRANSPARENT, RU_6,           RU_7,           RU_8,                     RU_9,           RU_0,           KC_TRANSPARENT,\
 	RU_SOFT,        RU_U,           RU_YU,          RU_I,                     RU_O,           RU_SHCH,        KC_TRANSPARENT,\
-	RU_HA,          RU_ZHE,         RU_KA,          KC_TRANSPARENT, RU_EL,          KC_TRANSPARENT,\
+	                RU_HA,          RU_ZHE,         RU_KA,          MO(LAYER_SYMBOLS_RU_IDX), RU_EL,          KC_NO,\
 	RU_HARD,        RU_EN,          RU_EM,          RU_PE,                    RU_YERU,        RU_SHTI,        KC_TRANSPARENT,\
 	                                KC_TRANSPARENT, KC_TRANSPARENT,           KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
 \

keyboards/betalupi_ergodox/keymaps/default/layers/symbols.h

@@ -10,7 +10,7 @@
 \
 	       KC_NO, KC_NO,\
 	              KC_NO,\
-	KC_TRANSPARENT, KC_TRANSPARENT, KC_NO,\
+	KC_NO, KC_NO, KC_NO,\
 \
 \
 	KC_NO,          KC_CIRC,        KC_AMPR,        KC_ASTR,        KC_NO,          KC_NO,          KC_NO,\
@@ -21,7 +21,7 @@
 \
 	KC_NO, KC_NO,\
 	KC_NO,\
-	KC_NO,          KC_NO,          KC_TRANSPARENT\
+	KC_NO, KC_NO, KC_NO\
 )
 
 #define LAYER_SYMBOLS_LEDS LEDS_ergodox(\

keyboards/betalupi_ergodox/keymaps/default/layers/symbols_ru.h

@@ -0,0 +1,39 @@
+#pragma once
+#include "keymap.h"
+
+#define LAYER_SYMBOLS_RU LAYOUT_ergodox(\
+	KC_NO,          RU_EXLM,      RU_DQUO,      RU_NUM,         RU_SCLN,        RU_PERC,      KC_NO,\
+	KC_NO,          KC_NO,        RU_LPRN,      RU_RPRN,        RU_QUES,        KC_NO,        KC_NO,\
+	KC_NO,          KC_NO,        KC_NO,        RU_COMM,        RU_DOT,         RU_DQUO,\
+	KC_NO,          KC_NO,        KC_NO,        KC_NO,          RU_EXLM,        KC_NO,        KC_NO,\
+	KC_NO,          KC_NO,        KC_NO,        KC_NO,          KC_NO,\
+\
+	       KC_NO, KC_NO,\
+	              KC_NO,\
+	KC_NO, KC_NO, KC_NO,\
+\
+\
+	KC_NO,          RU_COLN,        RU_QUES,        RU_ASTR,        RU_LPRN,        RU_RPRN,        KC_NO,\
+	KC_NO,          KC_NO,          KC_NO,          RU_SLSH,        KC_NO,          RU_BSLS,        KC_NO,\
+	                RU_UNDS,        RU_MINS,        RU_COLN,        KC_TRANSPARENT, KC_NO,          KC_NO,\
+	KC_NO,          RU_EQL,         RU_PLUS,        RU_SCLN,        KC_NO,          KC_NO,          KC_NO,\
+	                                KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,\
+\
+	KC_NO, KC_NO,\
+	KC_NO,\
+	KC_NO, KC_NO, KC_NO\
+)
+
+#define LAYER_SYMBOLS_RU_LEDS LEDS_ergodox(\
+	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
+	LC_OFF,       LC_CYAN,      LC_CYAN,      LC_PINK,      LC_OFF, \
+	LC_OFF,       LC_OFF,       LC_PINK,      LC_PINK,      LC_PINK, \
+	LC_OFF,       LC_OFF,       LC_OFF,       LC_PINK,      LC_OFF, \
+	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
+	\
+	LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF, \
+	LC_OFF,       LC_OFF,       LC_CYAN,      LC_OFF,       LC_CYAN, \
+	LC_CYAN,      LC_GREEN,     LC_PINK,      LC_ORANGE,    LC_OFF, \
+	LC_GREEN,     LC_GREEN,     LC_PINK,      LC_OFF,       LC_OFF, \
+	              LC_OFF,       LC_OFF,       LC_OFF,       LC_OFF  \
+)