From 598597e3cac7b0aad1102471d073426c226bafe4 Mon Sep 17 00:00:00 2001 From: js0ny Date: Thu, 17 Jul 2025 21:51:40 +0800 Subject: [PATCH] qwerty... --- tools/fish/conf.d/keymap.fish | 2 +- tools/nvim/lua/keymaps/basic.lua | 44 ++++++++++++++++---------------- tools/screen/screenrc | 2 +- tools/tmux/tmux.conf | 2 +- tools/zsh/mod/keymap.zsh | 30 +++++++++++----------- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tools/fish/conf.d/keymap.fish b/tools/fish/conf.d/keymap.fish index 4e79ff5..65ba532 100644 --- a/tools/fish/conf.d/keymap.fish +++ b/tools/fish/conf.d/keymap.fish @@ -13,7 +13,7 @@ fish_vi_key_bindings -source $DOTFILES/tools/fish/conf.d/keymap/+colemak.fish +# source $DOTFILES/tools/fish/conf.d/keymap/+colemak.fish # Emacs Hybrid bind -M default ctrl-p up-or-search diff --git a/tools/nvim/lua/keymaps/basic.lua b/tools/nvim/lua/keymaps/basic.lua index 87ae316..e5a4569 100644 --- a/tools/nvim/lua/keymaps/basic.lua +++ b/tools/nvim/lua/keymaps/basic.lua @@ -4,7 +4,7 @@ local keymaps_basic = { -- Modification of Original Keymap - Colemak -- https://github.com/LazyVim/LazyVim/blob/d1529f650fdd89cb620258bdeca5ed7b558420c7/lua/lazyvim/config/keymaps.lua#L8 { mode = mode_arrow, - keys = "n", + keys = "j", cmd = "v:count == 0 ? 'gj' : 'j'", opts = { desc = "Down", expr = true, silent = true }, }, @@ -16,7 +16,7 @@ local keymaps_basic = { -- Modification of Original Keymap - Colemak }, { mode = mode_arrow, - keys = "e", + keys = "k", cmd = "v:count == 0 ? 'gk' : 'k'", opts = { desc = "Up", expr = true, silent = true }, }, @@ -29,7 +29,7 @@ local keymaps_basic = { -- Modification of Original Keymap - Colemak { mode = "o", - keys = "n", + keys = "j", cmd = "j", opts = { desc = "Down", silent = true }, }, @@ -41,7 +41,7 @@ local keymaps_basic = { -- Modification of Original Keymap - Colemak }, { mode = "o", - keys = "e", + keys = "k", cmd = "k", opts = { desc = "Up", silent = true }, }, @@ -52,25 +52,25 @@ local keymaps_basic = { -- Modification of Original Keymap - Colemak opts = { desc = "Up", silent = true }, }, - { mode = mode_arrow, keys = "h", cmd = "h", opts = { desc = "Left", silent = true } }, - { mode = mode_arrow, keys = "i", cmd = "l", opts = { desc = "Right", silent = true } }, - { mode = {"n"}, keys = "H", cmd = "bprevious", opts = { desc = "Previous Buffer" } }, - { mode = {"n"}, keys = "I", cmd = "bnext", opts = { desc = "Next Buffer" } }, - { mode = {"v", "o", "x"}, keys = "H", cmd = "^", opts = { desc = "Start of Line" } }, - { mode = {"v", "o", "x"}, keys = "I", cmd = "$", opts = { desc = "End of Line" } }, - { mode = mode_arrow, keys = "N", cmd = "5j", opts = { desc = "Up 5 Lines" } }, - { mode = mode_arrow, keys = "E", cmd = "5e", opts = { desc = "Down 5 Lines" } }, - { keys = "Y", cmd = "y$", opts = { desc = "Yank to End of Line" } }, - { mode = mode_arrow, keys = "N", cmd = "5j" }, - { mode = mode_arrow, keys = "E", cmd = "5k" }, - { mode = { "n", "o", "x" }, keys = "l", cmd = "i", opts = { desc = "Insert" } }, - { keys = "L", cmd = "I", opts = { desc = "Insert at Start of Line" } }, - { mode = mode_arrow, keys = "k", cmd = "n", opts = { desc = "Next Search" } }, - { mode = mode_arrow, keys = "K", cmd = "N", opts = { desc = "Previous Search" } }, - { mode = mode_arrow, keys = "j", cmd = "e", opts = { desc = "jump to end of word" } }, - { mode = mode_arrow, keys = "J", cmd = "E", opts = { desc = "jump to end of WORD" } }, + { mode = mode_arrow, keys = "h", cmd = "h", opts = { desc = "Left", silent = true } }, + -- { mode = mode_arrow, keys = "i", cmd = "l", opts = { desc = "Right", silent = true } }, + { mode = { "n" }, keys = "H", cmd = "bprevious", opts = { desc = "Previous Buffer" } }, + { mode = { "n" }, keys = "L", cmd = "bnext", opts = { desc = "Next Buffer" } }, + { mode = { "v", "o", "x" }, keys = "H", cmd = "^", opts = { desc = "Start of Line" } }, + { mode = { "v", "o", "x" }, keys = "L", cmd = "$", opts = { desc = "End of Line" } }, + { mode = mode_arrow, keys = "J", cmd = "5j", opts = { desc = "Up 5 Lines" } }, + { mode = mode_arrow, keys = "K", cmd = "5e", opts = { desc = "Down 5 Lines" } }, + { keys = "Y", cmd = "y$", opts = { desc = "Yank to End of Line" } }, + { mode = mode_arrow, keys = "J", cmd = "5j" }, + { mode = mode_arrow, keys = "K", cmd = "5k" }, + -- { mode = { "n", "o", "x" }, keys = "l", cmd = "i", opts = { desc = "Insert" } }, + -- { keys = "L", cmd = "I", opts = { desc = "Insert at Start of Line" } }, + -- { mode = mode_arrow, keys = "k", cmd = "n", opts = { desc = "Next Search" } }, + -- { mode = mode_arrow, keys = "K", cmd = "N", opts = { desc = "Previous Search" } }, + -- { mode = mode_arrow, keys = "j", cmd = "e", opts = { desc = "jump to end of word" } }, + -- { mode = mode_arrow, keys = "J", cmd = "E", opts = { desc = "jump to end of WORD" } }, -- https://github.com/LazyVim/LazyVim/blob/d1529f650fdd89cb620258bdeca5ed7b558420c7/lua/lazyvim/config/keymaps.lua#L60 - { keys = "", cmd = "nohlsearchdiffupdate", opts = { desc = "Clear Search Highlight" } }, + { keys = "", cmd = "nohlsearchdiffupdate", opts = { desc = "Clear Search Highlight" } }, } return keymaps_basic diff --git a/tools/screen/screenrc b/tools/screen/screenrc index 957cb4b..61be9ff 100644 --- a/tools/screen/screenrc +++ b/tools/screen/screenrc @@ -49,7 +49,7 @@ markkeys h=^B:l=^F:$=^E:^U=^Z:^D=^V bind x kill -source ~/.config/screen/+colemak.screenrc +source ~/.config/screen/+qwerty.screenrc # Reload config (not directly supported in screen, but added for reference) diff --git a/tools/tmux/tmux.conf b/tools/tmux/tmux.conf index b16d669..ef6d214 100644 --- a/tools/tmux/tmux.conf +++ b/tools/tmux/tmux.conf @@ -53,7 +53,7 @@ unbind '"' bind - split-window -v unbind % bind ` resize-pane -Z -source-file ~/.config/tmux/+colemak.tmux +source-file ~/.config/tmux/+qwerty.tmux diff --git a/tools/zsh/mod/keymap.zsh b/tools/zsh/mod/keymap.zsh index bc285dc..a146e09 100644 --- a/tools/zsh/mod/keymap.zsh +++ b/tools/zsh/mod/keymap.zsh @@ -15,21 +15,21 @@ bindkey -v # Vi Keybindings # e # v # bindkey -M vicmd 'h' vi-backward-char # No change -bindkey -M vicmd 'n' down-line-or-history -bindkey -M vicmd 'e' up-line-or-history -bindkey -M vicmd 'i' vi-forward-char - -# Similar position to [i] in QWERTY -bindkey -M vicmd 'l' vi-insert -bindkey -M vicmd 'L' vi-insert-bol -# Ne{[k]s}t -bindkey -M vicmd 'k' vi-repeat-search -bindkey -M vicmd 'K' vi-rev-repeat-search -# [J]ump -bindkey -M vicmd 'j' vi-forward-word-end -bindkey -M vicmd 'J' vi-forward-blank-word-end -# Use N to Join -bindkey -M vicmd 'N' vi-join +# bindkey -M vicmd 'n' down-line-or-history +# bindkey -M vicmd 'e' up-line-or-history +# bindkey -M vicmd 'i' vi-forward-char +# +# # Similar position to [i] in QWERTY +# bindkey -M vicmd 'l' vi-insert +# bindkey -M vicmd 'L' vi-insert-bol +# # Ne{[k]s}t +# bindkey -M vicmd 'k' vi-repeat-search +# bindkey -M vicmd 'K' vi-rev-repeat-search +# # [J]ump +# bindkey -M vicmd 'j' vi-forward-word-end +# bindkey -M vicmd 'J' vi-forward-blank-word-end +# # Use N to Join +# bindkey -M vicmd 'N' vi-join # Emacs Hybrid bindkey '^A' beginning-of-line