From 78203c016736d6f12bca6d699f51bb5a03ff48f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D1=88=D0=B0=20=D0=A7=D0=B5=D1=80=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85?= <SashaChernykhEmpressOfUniverse@kristinita.ru>
Date: Thu, 1 Sep 2016 11:45:34 +0300
Subject: [PATCH] Add hotkeys for Russian keyboard layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add «q» → «й», «w» → «ц», see http://ru.stackoverflow.com/a/548152/199934
---
 Default.sublime-keymap | 1056 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1056 insertions(+)

diff --git a/Default.sublime-keymap b/Default.sublime-keymap
index 4711807..b92a2aa 100644
--- a/Default.sublime-keymap
+++ b/Default.sublime-keymap
@@ -1044,6 +1044,1062 @@
 		"context": [{"key": "setting.command_mode"}]
 	},
 
+	// This is a motion, but must come after the above binding
+	{ "keys": ["0"], "command": "set_motion", "args": {
+		"motion": "move_to",
+		"motion_args": {"to": "hardbol", "extend": true }},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_has_repeat_digit", "operand": false}
+		]
+	},
+	// For Russian keyboard layout
+	{ "keys": ["escape"], "command": "exit_insert_mode",
+		"context":
+		[
+			{ "key": "setting.command_mode", "operand": false },
+			{ "key": "setting.is_widget", "operand": false }
+		]
+	},
+
+	{ "keys": ["escape"], "command": "exit_visual_mode",
+		"context":
+		[
+			{ "key": "setting.command_mode"},
+			{ "key": "num_selections", "operand": 1},
+			{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": false }
+		]
+	},
+
+	{ "keys": ["escape"], "command": "hide_auto_complete", "context":
+		[
+			{ "key": "auto_complete_visible", "operator": "equal", "operand": true }
+		]
+	},
+
+	{ "keys": ["escape"], "command": "vi_cancel_current_action", "context":
+		[
+			{ "key": "setting.command_mode" },
+			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": false },
+			{ "key": "vi_has_input_state" }
+		]
+	},
+
+	{ "keys": ["ctrl+х"], "command": "exit_insert_mode",
+		"context":
+		[
+			{ "key": "setting.command_mode", "operand": false },
+			{ "key": "setting.is_widget", "operand": false },
+			{ "key": "setting.vintage_ctrl_keys" }
+		]
+	},
+
+	{ "keys": ["ctrl+х"], "command": "exit_visual_mode",
+		"context":
+		[
+			{ "key": "setting.command_mode"},
+			{ "key": "num_selections", "operand": 1},
+			{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": false },
+			{ "key": "setting.vintage_ctrl_keys" }
+		]
+	},
+
+	{ "keys": ["ctrl+х"], "command": "vi_cancel_current_action", "context":
+		[
+			{ "key": "setting.command_mode" },
+			{ "key": "vi_has_input_state" },
+			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": false },
+			{ "key": "setting.vintage_ctrl_keys" }
+		]
+	},
+
+	{ "keys": ["я", "я"], "command" : "center_on_cursor", "context": [{"key": "setting.command_mode"}] },
+	{ "keys": ["я", "е"], "command" : "scroll_cursor_line_to_top", "context": [{"key": "setting.command_mode"}] },
+	{ "keys": ["я", "и"], "command" : "scroll_cursor_line_to_bottom", "context": [{"key": "setting.command_mode"}] },
+
+	{ "keys": ["Я", "Я"], "command" : "vi_save_and_exit", "context": [{"key": "setting.command_mode"}] },
+
+	{ "keys": ["ш"], "command": "enter_insert_mode",
+	  "context":
+	  [
+			{"key": "setting.command_mode"},
+			{"key": "selection_empty"}
+	  ]
+	},
+
+	{ "keys": ["Ш"], "command": "enter_insert_mode", "args":
+		{"insert_command": "vi_move_to_first_non_white_space_character"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Ш"], "command": "enter_insert_mode",
+		"args": {"insert_command": "shrink_selections_to_beginning"},
+		"context": [
+			{"key": "setting.command_mode"},
+			{"key": "selection_empty", "operator": "equal", "operand": false}
+		]
+	},
+
+	{ "keys": ["ф"], "command": "enter_insert_mode", "args":
+		{"insert_command": "move", "insert_args": {"by": "characters", "forward": true} },
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "selection_empty"}
+		]
+	},
+
+	{ "keys": ["Ф"], "command": "enter_insert_mode", "args":
+		{"insert_command": "move_to", "insert_args": {"to": "hardeol"} },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Ф"], "command": "enter_insert_mode",
+		"args": {"insert_command": "shrink_selections_to_end"},
+		"context": [
+			{"key": "setting.command_mode"},
+			{"key": "selection_empty", "operator": "equal", "operand": false}
+		]
+	},
+
+	{ "keys": ["щ"], "command": "enter_insert_mode", "args":
+		{"insert_command": "run_macro_file", "insert_args": {"file": "Packages/Default/Add Line.sublime-macro"} },
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["щ"], "command": "vi_reverse_selections_direction",
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "selection_empty", "operator": "equal", "operand": false}
+		]
+	},
+
+	{ "keys": ["Щ"], "command": "enter_insert_mode", "args":
+		{"insert_command": "run_macro_file", "insert_args": {"file": "Packages/Default/Add Line Before.sublime-macro"} },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["г"], "command": "undo", "context": [{"key": "setting.command_mode"}] },
+	{
+		"keys": ["ctrl+к"], "command": "redo",
+		"context": [{"key": "setting.command_mode"}, {"key": "setting.vintage_ctrl_keys"}]
+	},
+
+
+	{ "keys": ["г"], "command": "visual_lower_case",
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "selection_empty", "operator": "equal", "operand": false, "match_all": false}
+		]
+	},
+
+	{ "keys": ["Г"], "command": "visual_upper_case",
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "selection_empty", "operator": "equal", "operand": false, "match_all": false}
+		]
+	},
+
+	{ "keys": ["м"], "command": "enter_visual_mode",
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["м"], "command": "set_motion_mode", "args": {"mode": "normal"},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_has_action" }
+		]
+	},
+	{ "keys": ["м"], "command": "exit_visual_mode", "args": {"toggle": true},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "selection_empty", "operator": "equal", "operand": false, "match_all": false}
+		]
+	},
+
+	{ "keys": ["М"], "command": "enter_visual_line_mode",
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["М"], "command": "enter_visual_line_mode",
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_motion_mode", "operand": "line"}
+		]
+	},
+	{ "keys": ["М"], "command": "set_motion_mode", "args": {"mode": "line"},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_has_action" }
+		]
+	},
+
+	{ "keys": ["\"", "<character>"], "command": "set_register",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["З"], "command": "vi_paste_left",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["з"], "command": "vi_paste_right",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["."], "command": "show_panel", "args":
+		{
+			"panel": "incremental_find",
+			"select_text": false,
+			"reverse": false
+		},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": [","], "command": "show_panel", "args":
+		{
+			"panel": "incremental_find",
+			"select_text": false,
+			"reverse": true
+		},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Ж"], "command": "show_overlay", "args": {"overlay": "command_palette", "text": "Ж"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["*"], "command": "find_under",
+		"args": {"select_text": false},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["#"], "command": "find_under_prev",
+		"args": {"select_text": false},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{
+		"keys": ["т"], "command": "find_next",
+		"args": {"select_text": false},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{
+		"keys": ["Т"],
+		"command": "find_prev",
+		"args": {"select_text": false},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["О"], "command": "join_lines", "context": [{"key": "setting.command_mode"}] },
+
+	{ "keys": ["ю"], "command": "repeat", "context": [{"key": "setting.command_mode"}] },
+
+	{ "keys": ["к", "enter"], "command": "replace_character",
+		"args": {"character": "\n"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["к", "<character>"], "command": "replace_character",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Ч"], "command": "set_action_motion", "args": {
+		"action": "vi_left_delete",
+		"motion": null },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ч"], "command": "set_action_motion", "args": {
+		"action": "vi_right_delete",
+		"motion": null },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ь", "<character>"], "command": "vi_set_bookmark",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ё", "<character>"], "command": "vi_select_bookmark",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["э", "<character>"], "command": "vi_select_bookmark",
+		"args": {"select_bol": true},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["~"], "command": "set_action_motion", "args": {
+		"action": "swap_case",
+		"motion": "vi_move_by_characters_in_line",
+		"motion_args": {"forward": true, "extend": true, "visual": false } },
+		"context":
+		[
+			{"key": "selection_empty", "operator": "equal", "operand": true},
+			{"key": "setting.command_mode"}
+		]
+	},
+
+	{ "keys": ["~"], "command": "swap_case", "context":
+		[
+			{"key": "selection_empty", "operator": "equal", "operand": false},
+			{"key": "setting.command_mode"}
+		]
+	},
+
+	{ "keys": ["й", "<character>"], "command": "vi_begin_record_macro",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["й"], "command": "vi_end_record_macro",
+		"context": [{"key": "setting.command_mode"}, {"key": "is_recording_macro"}]
+	},
+
+	{ "keys": ["@", "<character>"], "command": "vi_replay_macro",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ctrl+н"], "command": "scroll_lines", "args": {"amount": 1.0 },
+		"context": [{"key": "setting.command_mode"}, {"key": "setting.vintage_ctrl_keys"}]
+	},
+	{ "keys": ["ctrl+у"], "command": "scroll_lines", "args": {"amount": -1.0 },
+		"context": [{"key": "setting.command_mode"}, {"key": "setting.vintage_ctrl_keys"}]
+	},
+
+	{ "keys": ["ctrl+ц", "с"], "command": "close",
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+	{ "keys": ["ctrl+ц", "й"], "command": "close",
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+	{ "keys": ["ctrl+ц", "щ"], "command": "set_layout",
+		"args":
+		{
+			"cols": [0.0, 1.0],
+			"rows": [0.0, 1.0],
+			"cells": [[0, 0, 1, 1]]
+		},
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ctrl+ц", "ы"], "command": "set_layout",
+		"args":
+		{
+			"cols": [0.0, 1.0],
+			"rows": [0.0, 0.5, 1.0],
+			"cells": [[0, 0, 1, 1], [0, 1, 1, 2]]
+		},
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ctrl+ц", "м"], "command": "set_layout",
+		"args":
+		{
+			"cols": [0.0, 0.5, 1.0],
+			"rows": [0.0, 1.0],
+			"cells": [[0, 0, 1, 1], [1, 0, 2, 1]]
+		},
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ctrl+ц", "л"], "command": "move_group_focus",
+		"args": {"direction": "up"},
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ctrl+ц", "о"], "command": "move_group_focus",
+		"args": {"direction": "down"},
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ctrl+ц", "д"], "command": "move_group_focus",
+		"args": {"direction": "right"},
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ctrl+ц", "р"], "command": "move_group_focus",
+		"args": {"direction": "left"},
+		"context": [{"key": "setting.vintage_ctrl_keys"}, {"key": "setting.command_mode"}]
+	},
+
+	//
+	// Actions
+	//
+
+	{ "keys": ["в"], "command": "set_action", "args": {
+		"action": "vi_delete",
+		"description": "Delete"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["н"], "command": "set_action", "args": {
+		"action": "vi_copy",
+		"description": "Yank"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["с"], "command": "set_action", "args": {
+		"action": "enter_insert_mode",
+		"description": "Change",
+		"action_args": {"insert_command": "vi_delete"}},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["п", "г"], "command": "set_action", "args": {"action": "lower_case", "description": "Lower Case"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["п", "Г"], "command": "set_action", "args": {"action": "upper_case", "description": "Upper Case"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["п", "~"], "command": "set_action", "args": {"action": "swap_case", "description": "Swap Case"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["п", ","], "command": "set_action", "args": {"action": "rot13", "description": "Rot13"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["п", "ф"], "command": "show_ascii_info",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["п", "а"], "command": "vi_open_file_under_selection",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{
+		"keys": ["п", "й"], "command": "set_action", "args": {"action": "wrap_lines", "description": "Wrap Lines"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Ю"], "command": "set_action", "args": {"action": "vi_indent", "description": "Indent"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Б"], "command": "set_action", "args": {"action": "vi_unindent", "description": "Unindent"},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["="], "command": "set_action", "args": {"action": "reindent", "description": "Reindent", "action_args": {"force_indent": false}},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	//
+	// Motions
+	//
+	{ "keys": ["Х"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_begin": false, "empty_line": true, "separators": "", "forward": false, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Ъ"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_begin": false, "empty_line": true, "separators": "", "forward": true, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Ц"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_begin": true, "empty_line": true, "separators": "", "forward": true, "extend": true },
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ц"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_begin": true, "punct_begin": true, "empty_line": true, "forward": true, "extend": true },
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["и"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_begin": true, "punct_begin": true, "empty_line": true, "forward": false, "extend": true },
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["И"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_begin": true, "empty_line": true, "separators": "", "forward": false, "extend": true },
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["у"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_end": true, "punct_end": true, "empty_line": true, "forward": true, "extend": true },
+		"inclusive": true,
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["У"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_end": true, "empty_line": true, "separators": "", "forward": true, "extend": true },
+		"inclusive": true,
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	// Make cw act kinda like ce
+	{ "keys": ["ц"], "command": "set_motion", "args": {
+		"motion": "vi_extend_to_end_of_whitespace_or_word",
+		"motion_args": {"repeat": 1},
+		"inclusive": true,
+		"clip_to_line": true },
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "enter_insert_mode"}
+		]
+	},
+
+	// Make cW act kinda like cE
+	{ "keys": ["Ц"], "command": "set_motion", "args": {
+		"motion": "vi_extend_to_end_of_whitespace_or_word",
+		"motion_args": {"repeat": 1, "separators": ""},
+		"inclusive": true,
+		"clip_to_line": true },
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "enter_insert_mode"}
+		]
+	},
+
+	// Bonus: alt+w and alt+b move by sub-words
+	{ "keys": ["alt+ц"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_begin": true, "sub_word_begin": true, "punct_begin": true, "empty_line": true, "forward": true, "extend": true },
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["alt+ц"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_end": true, "sub_word_end": true, "punct_end": true, "empty_line": true, "forward": true, "extend": true },
+		"inclusive": true,
+		"clip_to_line": true },
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "enter_insert_mode"}
+		]
+	},
+	{ "keys": ["alt+и"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "stops", "word_begin": true, "sub_word_begin": true, "punct_begin": true, "empty_line": true, "forward": false, "extend": true },
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["$"], "command": "set_motion", "args": {
+		"motion": "vi_move_to_hard_eol",
+		"motion_args": {"repeat": 1, "extend": true},
+		"inclusive": true,
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["^"], "command": "set_motion", "args": {
+		"motion": "vi_move_to_first_non_white_space_character",
+		"motion_args": {"extend": true },
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["_"], "command": "set_motion", "args": {
+		"motion": "vi_move_to_first_non_white_space_character",
+		"motion_args": {"extend": true, "repeat": 1 },
+		"linewise": true,
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": [" "], "command": "set_motion", "args": {
+		"motion": "vi_move_by_characters",
+		"motion_args": {"forward": true, "extend": true, "visual": false },
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["enter"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "lines", "forward": true, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["backspace"], "command": "set_motion", "args": {
+		"motion": "vi_move_by_characters",
+		"motion_args": {"forward": false, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["shift+enter"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "lines", "forward": true, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["д"], "command": "set_motion", "args": {
+		"motion": "vi_move_by_characters_in_line",
+		"motion_args": {"forward": true, "extend": true, "visual": false }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["р"], "command": "set_motion", "args": {
+		"motion": "vi_move_by_characters_in_line",
+		"motion_args": {"forward": false, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["о"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "lines", "forward": true, "extend": true },
+		"linewise": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["л"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "lines", "forward": false, "extend": true },
+		"linewise": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["П"], "command": "set_motion", "args": {
+		"motion": "vi_goto_line",
+		"motion_args": {"repeat": 1, "explicit_repeat": true, "extend": true,
+						"ending": "eof" },
+		"linewise": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["п", "п"], "command": "set_motion", "args": {
+		"motion": "vi_goto_line",
+		"motion_args": {"repeat": 1, "explicit_repeat": true, "extend": true,
+						"ending": "bof" },
+		"linewise": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["а", "<character>"], "command": "set_motion", "args": {
+		"motion": "vi_move_to_character",
+		"motion_args": {"extend": true },
+		"inclusive": true,
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["А", "<character>"], "command": "set_motion", "args": {
+		"motion": "vi_move_to_character",
+		"motion_args": {"extend": true, "forward": false },
+		"inclusive": true,
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["е", "<character>"], "command": "set_motion", "args": {
+		"motion": "vi_move_to_character",
+		"motion_args": {"extend": true, "before": true },
+		"inclusive": true,
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Е", "<character>"], "command": "set_motion", "args": {
+		"motion": "vi_move_to_character",
+		"motion_args": {"extend": true, "forward": false, "before": true },
+		"inclusive": true,
+		"clip_to_line": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ж"], "command": "set_repeat_move_to_character_motion",
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["б"], "command": "set_repeat_move_to_character_motion",
+		"args": {"reverse": true},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["%"], "command": "set_motion", "args": {
+		"motion": "vi_move_to_brackets",
+		"motion_args": {"repeat": 1},
+		"inclusive": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ctrl+а"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "pages", "forward": true, "extend": true }},
+		"context": [{"key": "setting.command_mode"}, {"key": "setting.vintage_ctrl_keys"}]
+	},
+
+	{ "keys": ["ctrl+и"], "command": "set_motion", "args": {
+		"motion": "move",
+		"motion_args": {"by": "pages", "forward": false, "extend": true }},
+		"context": [{"key": "setting.command_mode"}, {"key": "setting.vintage_ctrl_keys"}]
+	},
+
+	{ "keys": ["ctrl+г"], "command": "vi_scroll_lines",
+		"args": {"forward": false},
+		"context": [{"key": "setting.command_mode"}, {"key": "setting.vintage_ctrl_keys"}]
+	},
+
+	{ "keys": ["ctrl+в"], "command": "vi_scroll_lines",
+		"args": {"forward": true},
+		"context": [{"key": "setting.command_mode"}, {"key": "setting.vintage_ctrl_keys"}]
+	},
+
+	{ "keys": ["Р"], "command": "set_motion", "args": {
+		"motion": "move_caret_to_screen_top",
+		"motion_args": {"repeat": 1},
+		"linewise": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["Ь"], "command": "set_motion", "args": {
+		"motion": "move_caret_to_screen_center",
+		"linewise": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["Д"], "command": "set_motion", "args": {
+		"motion": "move_caret_to_screen_bottom",
+		"motion_args": {"repeat": 1},
+		"linewise": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["я", "ю"], "command": "set_motion", "args": {
+		"motion": "scroll_current_line_to_screen_center",
+		"motion_args": {"repeat": 1}},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["я", "enter"], "command": "set_motion", "args": {
+		"motion": "scroll_current_line_to_screen_top",
+		"motion_args": {"repeat": 1}
+		},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["я", "щ"], "command": "unfold",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["я", "Щ"], "command": "unfold",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["я", "с"], "command": "fold",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["я", "С"], "command": "fold",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["я", "т"], "command": "unfold_all",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["я", "К"], "command": "unfold_all",
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	// Motions to allow double press to mean entire line
+
+	{ "keys": ["с"], "command": "set_motion", "args": {
+		"motion": "vi_span_count_lines",
+		"linewise": true,
+		"motion_args": {"repeat": 1}},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "enter_insert_mode"}
+		]
+	},
+
+	{ "keys": ["в"], "command": "set_motion", "args": {
+		"motion": "expand_selection",
+		"motion_args": {"to": "line" },
+		"mode": "normal"},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "vi_delete"}
+		]
+	},
+
+	{ "keys": ["н"], "command": "set_motion", "args": {
+		"motion": "expand_selection",
+		"motion_args": {"to": "line" },
+		"mode": "normal"},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "vi_copy"}
+		]
+	},
+
+	{ "keys": ["Ю"], "command": "set_motion", "args": {
+		"motion": "expand_selection",
+		"motion_args": {"to": "line" },
+		"mode": "normal"},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "vi_indent"}
+		]
+	},
+
+	{ "keys": ["Б"], "command": "set_motion", "args": {
+		"motion": "expand_selection",
+		"motion_args": {"to": "line" },
+		"mode": "normal"},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "vi_unindent"}
+		]
+	},
+
+	{ "keys": ["="], "command": "set_motion", "args": {
+		"motion": "expand_selection",
+		"mode": "normal"},
+		"context":
+		[
+			{"key": "setting.command_mode"},
+			{"key": "vi_action", "operand": "reindent"}
+		]
+	},
+
+	// Single key, combined action-motions
+
+	{ "keys": ["В"], "command": "set_action_motion", "args": {
+		"action": "vi_delete",
+		"motion": "vi_move_to_hard_eol",
+		"motion_args": {"repeat": 1, "extend": true},
+		"motion_inclusive": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["С"], "command": "set_action_motion", "args": {
+		"action": "enter_insert_mode",
+		"action_args": {"insert_command": "vi_delete"},
+		"motion": "vi_move_to_hard_eol",
+		"motion_args": {"repeat": 1, "extend": true},
+		"motion_inclusive": true },
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Н"], "command": "set_action_motion", "args": {
+		"action": "vi_copy",
+		"motion": "expand_selection",
+		"motion_args": {"to": "line" }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["ы"], "command": "set_action_motion", "args": {
+		"action": "enter_insert_mode",
+		"action_args": {"insert_command": "vi_delete"},
+		"motion": "vi_move_by_characters_in_line",
+		"motion_args": {"forward": true, "extend": true, "visual": false }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	{ "keys": ["Ы"], "command": "set_action_motion", "args": {
+		"action": "enter_insert_mode",
+		"action_args": {"insert_command": "vi_delete"},
+		"motion": "vi_span_count_lines",
+		"motion_linewise": true,
+		"motion_args": {"repeat": 1}},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
+	// Text Object motions
+
+	{ "keys": ["ш", "ц"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_words",
+		"motion_args": {"repeat": 1}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "ц"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_words",
+		"motion_args": {"repeat": 1, "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+
+	{ "keys": ["ш", "Ц"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_big_words",
+		"motion_args": {"repeat": 1}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "Ц"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_big_words",
+		"motion_args": {"repeat": 1, "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+
+	{ "keys": ["ш", "\""], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_quotes",
+		"motion_args": {"character": "\""}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "\""], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_quotes",
+		"motion_args": {"character": "\"", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ш", "э"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_quotes",
+		"motion_args": {"character": "э"}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "э"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_quotes",
+		"motion_args": {"character": "э", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+
+	{ "keys": ["ш", "е"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_tag"},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "е"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_tag",
+		"motion_args": {"outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+
+	{ "keys": ["ш", "("], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "("}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "("], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "(", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ш", ")"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "("}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", ")"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "(", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ш", "и"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "("}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "и"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "(", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+
+	{ "keys": ["ш", "х"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "х"}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "х"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "х", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ш", "ъ"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "х"}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "ъ"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "х", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+
+	{ "keys": ["ш", "Х"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "Х"}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "Х"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "Х", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ш", "Ъ"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "Х"}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "Ъ"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "Х", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ш", "И"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "Х"}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "И"], "command": "set_motion", "args": {
+		"motion": "vi_expand_to_brackets",
+		"motion_args": {"character": "Х", "outer": true}},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+	{ "keys": ["ф", "з"], "command": "set_motion", "args": {
+		"motion": "expand_selection_to_paragraph"},
+		"context": [{"key": "setting.command_mode"}, {"key": "vi_can_enter_text_object"}]
+	},
+
+	//
+	// Repeat digits
+	//
+
+	{ "keys": ["1"], "command": "push_repeat_digit", "args": {"digit": 1},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["2"], "command": "push_repeat_digit", "args": {"digit": 2},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["3"], "command": "push_repeat_digit", "args": {"digit": 3},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["4"], "command": "push_repeat_digit", "args": {"digit": 4},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["5"], "command": "push_repeat_digit", "args": {"digit": 5},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["6"], "command": "push_repeat_digit", "args": {"digit": 6},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["7"], "command": "push_repeat_digit", "args": {"digit": 7},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["8"], "command": "push_repeat_digit", "args": {"digit": 8},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["9"], "command": "push_repeat_digit", "args": {"digit": 9},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["0"], "command": "push_repeat_digit", "args": {"digit": 0},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
 	// This is a motion, but must come after the above binding
 	{ "keys": ["0"], "command": "set_motion", "args": {
 		"motion": "move_to",