nnn/patches/colemak/mainline.diff

122 lines
4.2 KiB
Diff
Raw Normal View History

# Description: Change key bindings for comfortable use with Colemak keyboard
# layout. This diff was made in 4.7 release version of nnn.
2022-07-09 11:42:38 +00:00
#
# Author: github.com/jacmoe
2022-07-09 11:42:38 +00:00
diff --git a/src/nnn.c b/src/nnn.c
2023-10-08 07:28:58 +00:00
index 21a7370b..2ddb4053 100644
2022-07-09 11:42:38 +00:00
--- a/src/nnn.c
+++ b/src/nnn.c
2023-10-08 07:28:58 +00:00
@@ -5109,12 +5109,12 @@ static void show_help(const char *path)
2023-06-15 02:54:00 +00:00
"2(___n))\n"
2022-07-09 11:42:38 +00:00
"0\n"
"1NAVIGATION\n"
2023-06-15 02:54:00 +00:00
- "9Up k Up%16PgUp ^U Page up\n"
- "9Dn j Down%14PgDn ^D Page down\n"
+ "9Up e Up%16PgUp ^U Page up\n"
+ "9Dn n Down%14PgDn ^D Page down\n"
"9Lt h Parent%12~ ` @ - ~, /, start, prev\n"
- "5Ret Rt l Open%20' First file/match\n"
- "9g ^A Top%21J Jump to entry/offset\n"
- "9G ^E End%20^J Toggle auto-advance on open\n"
+ "5Ret Rt i Open%20' First file/match\n"
+ "9g ^E Top%21J Jump to entry/offset\n"
+ "9G ^N End%20^J Toggle auto-advance on open\n"
"8B (,) Book(mark)%11b ^/ Select bookmark\n"
"a1-4 Context%11(Sh)Tab Cycle/new context\n"
2023-10-08 07:28:58 +00:00
"62Esc ^Q Quit%19^y Next young\n"
@@ -5122,20 +5122,20 @@ static void show_help(const char *path)
"cq Quit context\n"
2022-07-09 11:42:38 +00:00
"0\n"
"1FILTER & PROMPT\n"
2023-06-15 02:54:00 +00:00
- "c/ Filter%17^N Toggle type-to-nav\n"
+ "c/ Filter%17^M Toggle type-to-nav\n"
"aEsc Exit prompt%12^L Toggle last filter\n"
"c. Toggle hidden%05Alt+Esc Unfilter, quit context\n"
2022-07-09 11:42:38 +00:00
"0\n"
"1FILES\n"
2023-06-15 02:54:00 +00:00
- "9o ^O Open with%15n Create new/link\n"
+ "9o ^O Open with%15c Create new/link\n"
"9f ^F File stats%14d Detail mode toggle\n"
"b^R Rename/dup%14r Batch rename\n"
- "cz Archive%17e Edit file\n"
+ "cz Archive%17y Edit file\n"
"c* Toggle exe%14> Export list\n"
"6Space + (Un)select%12m-m Select range/clear\n"
"ca Select all%14A Invert sel\n"
"9p ^P Copy here%12w ^W Cp/mv sel as\n"
- "9v ^V Move here%15E Edit sel list\n"
+ "9v ^V Move here%15l Edit sel list\n"
"9x ^X Delete%18S Listed sel size\n"
2023-01-29 22:05:49 +00:00
"aEsc Send to FIFO\n"
2022-07-09 11:42:38 +00:00
"0\n"
diff --git a/src/nnn.h b/src/nnn.h
index 3e4ea19c..b0eb7cdb 100644
2022-07-09 11:42:38 +00:00
--- a/src/nnn.h
+++ b/src/nnn.h
@@ -137,12 +137,12 @@ static struct key bindings[] = {
2022-07-09 11:42:38 +00:00
{ '\r', SEL_OPEN },
/* Pure navigate inside */
{ KEY_RIGHT, SEL_NAV_IN },
- { 'l', SEL_NAV_IN },
+ { 'i', SEL_NAV_IN },
/* Next */
- { 'j', SEL_NEXT },
+ { 'n', SEL_NEXT },
{ KEY_DOWN, SEL_NEXT },
/* Previous */
- { 'k', SEL_PREV },
+ { 'e', SEL_PREV },
{ KEY_UP, SEL_PREV },
/* Page down */
{ KEY_NPAGE, SEL_PGDN },
2023-01-29 22:05:49 +00:00
@@ -155,11 +155,11 @@ static struct key bindings[] = {
2022-07-09 11:42:38 +00:00
/* First entry */
{ KEY_HOME, SEL_HOME },
{ 'g', SEL_HOME },
- { CONTROL('A'), SEL_HOME },
+ { CONTROL('E'), SEL_HOME },
/* Last entry */
{ KEY_END, SEL_END },
{ 'G', SEL_END },
- { CONTROL('E'), SEL_END },
+ { CONTROL('N'), SEL_END },
/* Go to first file */
{ '\'', SEL_FIRST },
2022-07-31 14:10:50 +00:00
/* Jump to an entry number/offset */
@@ -199,7 +199,7 @@ static struct key bindings[] = {
2022-07-09 11:42:38 +00:00
/* Filter */
{ '/', SEL_FLTR },
/* Toggle filter mode */
- { CONTROL('N'), SEL_MFLTR },
+ { CONTROL('M'), SEL_MFLTR },
2022-07-09 11:42:38 +00:00
/* Toggle hide .dot files */
{ '.', SEL_HIDDEN },
/* Detailed listing */
@@ -226,7 +226,7 @@ static struct key bindings[] = {
2022-07-09 11:42:38 +00:00
/* Invert selection in current dir */
{ 'A', SEL_SELINV },
/* List, edit selection */
- { 'E', SEL_SELEDIT },
+ { 'l', SEL_SELEDIT },
/* Copy from selection buffer */
{ 'p', SEL_CP },
{ CONTROL('P'), SEL_CP },
@@ -243,7 +243,7 @@ static struct key bindings[] = {
2022-07-09 11:42:38 +00:00
{ 'o', SEL_OPENWITH },
{ CONTROL('O'), SEL_OPENWITH },
/* Create a new file */
- { 'n', SEL_NEW },
+ { 'c', SEL_NEW },
/* Show rename prompt */
{ CONTROL('R'), SEL_RENAME },
/* Rename contents of current dir */
@@ -255,7 +255,7 @@ static struct key bindings[] = {
2022-07-09 11:42:38 +00:00
/* Toggle auto-advance on file open */
{ CONTROL('J'), SEL_AUTONEXT },
/* Edit in EDITOR */
- { 'e', SEL_EDIT },
+ { 'y', SEL_EDIT },
/* Run a plugin */
{ ';', SEL_PLUGIN },
2023-01-29 22:05:49 +00:00
/* Show total size of listed selection */