From 4516750bf1a15b7fe3cca1be59ef74081823dd67 Mon Sep 17 00:00:00 2001
From: Yuri Zamyatin <yuri@yrz.am>
Date: Tue, 8 Apr 2025 22:26:13 +0000
Subject: [PATCH] wip

---
 arch-user/config/readline/inputrc | 24 +++++++++++++---------
 arch-user/config/vim/vimrc        | 33 ++++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/arch-user/config/readline/inputrc b/arch-user/config/readline/inputrc
index efafe57..dc42395 100644
--- a/arch-user/config/readline/inputrc
+++ b/arch-user/config/readline/inputrc
@@ -1,30 +1,36 @@
 set editing-mode vi
 
+########### prompt ##############
 set show-mode-in-prompt on
 set vi-ins-mode-string \1\e[1 q\2
 set vi-cmd-mode-string \1\e[2 q\2
+#################################
 
-
+##### remap - colemak-dh #######
 set keymap vi-command
 
+# n -> h
 "n":backward-char
 "N":beginning-of-line
-
-"i":next-history
-"\C-i":accept-line
-
+# e -> k
 "e":previous-history
 "\C-e":kill-line
-
+# i -> j
+"i":next-history
+"\C-i":accept-line
+# o -> l
 "o":forward-char
 "\C-o":clear-screen
 
-
+# k -> n
 "k":vi-search-again
 "K":vi-search-again
-
+# j -> e
 "j":vi-end-word
 "J":vi-end-word
-
+# l -> i
 "l":vi-insertion-mode
 "L":vi-insert-beg
+# h -> o
+# noop
+#################################
diff --git a/arch-user/config/vim/vimrc b/arch-user/config/vim/vimrc
index e347c0f..71624f4 100644
--- a/arch-user/config/vim/vimrc
+++ b/arch-user/config/vim/vimrc
@@ -22,18 +22,41 @@ set ruler
 " W - Save file as superuser
 command! W execute 'w !sudo tee % > /dev/null' <bar> edit!
 
-
-" colemak-dh
+"####### remap - colemak-dh #######
+" n -> h
 noremap n h
+noremap N H
+noremap! <C-n> <C-h>
+" e -> k 
 noremap e k
+noremap e K
+noremap! <C-e> <C-k>
+" i -> j
 noremap i j
+noremap I J
+noremap! <C-i> <C-j>
+" o -> l
 noremap o l
+noremap O L
+noremap! <C-o> <C-l>
 
+" k -> n
 noremap k n
-noremap l i
-noremap h o
+noremap K N
+noremap! <C-k> <C-n>
+" j -> e
 noremap j e
-
+noremap J E
+noremap! <C-j> <C-e>
+" l -> i
+noremap l i
+noremap L I
+noremap! <C-l> <C-i>
+" h -> o
+noremap h o
+noremap H O
+noremap! <C-h> <C-o>
+"#################################
 set langmap=йЙцЦуУкКеЕнНгГшШщЩзЗхХъЪфФыЫвВаАпПрРоОлЛдДжЖэЭяЯчЧсСмМиИтТьЬбБюЮ.\\,;qQwWfFpPbBjJlLuUyY;:[{]}aArRsStTgGmMnNeEiIoO'\"xXcCdDvVzZkKhH\\,<.>/?
 noremap о ь
 noremap л т