aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/by-name/fi/fish/config/keybindings/02_command.fish57
1 files changed, 32 insertions, 25 deletions
diff --git a/modules/by-name/fi/fish/config/keybindings/02_command.fish b/modules/by-name/fi/fish/config/keybindings/02_command.fish
index 56f64b32..7cea46c5 100644
--- a/modules/by-name/fi/fish/config/keybindings/02_command.fish
+++ b/modules/by-name/fi/fish/config/keybindings/02_command.fish
@@ -1,13 +1,38 @@
+bind --preset --mode default h 'fish_vi_run_count backward-char'
+bind --preset --mode default t 'fish_vi_run_count down-or-search'
+bind --preset --mode default n 'fish_vi_run_count up-or-search'
+bind --preset --mode default s 'fish_vi_run_count forward-char'
+bind --preset --mode default left backward-char
+bind --preset --mode default down down-or-search
+bind --preset --mode default up up-or-search
+bind --preset --mode default right forward-char
+
+bind --preset --mode default b 'fish_vi_run_count backward-word'
+bind --preset --mode default B 'fish_vi_run_count backward-bigword'
+bind --preset --mode default g,e 'fish_vi_run_count backward-word-end'
+bind --preset --mode default g,E 'fish_vi_run_count backward-bigword-end'
+bind --preset --mode default w 'fish_vi_run_count forward-word-vi'
+bind --preset --mode default W 'fish_vi_run_count forward-bigword-vi'
+bind --preset --mode default e 'fish_vi_run_count forward-word-end'
+bind --preset --mode default E 'fish_vi_run_count forward-bigword-end'
+
bind --preset --mode default ctrl-y yank
bind --preset --mode default alt-y yank-pop
-bind --preset --mode default right forward-char
-bind --preset --mode default left backward-char
+
+bind --preset --mode default ctrl-v edit_command_buffer
+
bind --preset --mode default ctrl-right forward-token
bind --preset --mode default ctrl-left backward-token
+
+# bind --preset --mode default ctrl-v fish_clipboard_paste
+bind --preset --mode default \",\*,y,y fish_clipboard_copy
+bind --preset --mode default \",\*,Y fish_clipboard_copy
+bind --preset --mode default \",+,y,y fish_clipboard_copy
+bind --preset --mode default \",+,Y fish_clipboard_copy
+
bind --preset --mode default pageup beginning-of-history
bind --preset --mode default pagedown end-of-history
bind --preset --mode default ctrl-x fish_vi_dec
-bind --preset --mode default ctrl-v fish_clipboard_paste
bind --preset --mode default escape 'set -g __fish_vi_count'
bind --preset --mode default ctrl-\[ 'set -g __fish_vi_count'
bind --preset --mode default tab complete
@@ -15,8 +40,6 @@ bind --preset --mode default ctrl-i complete
bind --preset --mode default ctrl-s pager-toggle-search
bind --preset --mode default shift-tab complete-and-search
bind --preset --mode default shift-delete history-delete or backward-delete-char
-bind --preset --mode default down down-or-search
-bind --preset --mode default up up-or-search
bind --preset --mode default shift-right forward-bigword
bind --preset --mode default shift-left backward-bigword
bind --preset --mode default alt-b prevd-or-backward-word
@@ -47,8 +70,6 @@ bind --preset --mode default f1 __fish_man_page
bind --preset --mode default alt-h __fish_man_page
bind --preset --mode default alt-p __fish_paginate
bind --preset --mode default alt-# __fish_toggle_comment_commandline
-bind --preset --mode default alt-e edit_command_buffer
-bind --preset --mode default alt-v edit_command_buffer
bind --preset --mode default :,q exit
bind --preset --mode default 1 'fish_vi_arg_digit 1'
bind --preset --mode default 2 'fish_vi_arg_digit 2'
@@ -60,18 +81,8 @@ bind --preset --mode default 7 'fish_vi_arg_digit 7'
bind --preset --mode default 8 'fish_vi_arg_digit 8'
bind --preset --mode default 9 'fish_vi_arg_digit 9'
bind --preset --mode default 0 'if test -n "$__fish_vi_count"; fish_vi_arg_digit 0; else; commandline -f beginning-of-line; end'
-bind --preset --mode default h 'fish_vi_run_count backward-char'
-bind --preset --mode default l 'fish_vi_run_count forward-char'
-bind --preset --mode default k 'fish_vi_run_count up-or-search'
-bind --preset --mode default j 'fish_vi_run_count down-or-search'
-bind --preset --mode default b 'fish_vi_run_count backward-word'
-bind --preset --mode default B 'fish_vi_run_count backward-bigword'
-bind --preset --mode default g,e 'fish_vi_run_count backward-word-end'
-bind --preset --mode default g,E 'fish_vi_run_count backward-bigword-end'
-bind --preset --mode default w 'fish_vi_run_count forward-word-vi'
-bind --preset --mode default W 'fish_vi_run_count forward-bigword-vi'
-bind --preset --mode default e 'fish_vi_run_count forward-word-end'
-bind --preset --mode default E 'fish_vi_run_count forward-bigword-end'
+
+
bind --preset --mode default x __fish_vi_delete_char
bind --preset --mode default X __fish_vi_backward_delete_char
@@ -125,10 +136,6 @@ bind --preset --mode default g,u downcase-word
bind --preset --mode default g,U upcase-word
bind --preset --mode default J end-of-line delete-char
bind --preset --mode default K 'man (commandline -t) 2>/dev/null; or echo -n \\a'
-bind --preset --mode default \",\*,y,y fish_clipboard_copy
-bind --preset --mode default \",\*,Y fish_clipboard_copy
-bind --preset --mode default \",+,y,y fish_clipboard_copy
-bind --preset --mode default \",+,Y fish_clipboard_copy
bind --preset --mode default Y kill-whole-line yank
bind --preset --mode default y,\$ kill-line yank
bind --preset --mode default y,^ backward-kill-line yank
@@ -144,7 +151,7 @@ bind --preset --mode default y,a backward-jump and repeat-jump-reverse and begin
bind --preset --mode default % jump-to-matching-bracket
bind --preset --mode default f forward-jump
bind --preset --mode default F backward-jump
-bind --preset --mode default t forward-jump-till
+# bind --preset --mode default t forward-jump-till
bind --preset --mode default T backward-jump-till
bind --preset --mode default \; repeat-jump
bind --preset --mode default comma repeat-jump-reverse
@@ -162,7 +169,7 @@ bind --preset --mode default --sets-mode replace R repaint-mode
bind --preset --mode default ctrl-a fish_vi_inc
bind --preset --mode default \# __fish_toggle_comment_commandline
-bind --preset --mode default --sets-mode insert s delete-char repaint-mode
+# bind --preset --mode default --sets-mode insert s delete-char repaint-mode
bind --preset --mode default --sets-mode insert S kill-inner-line repaint-mode
bind --preset --mode default --sets-mode insert C kill-line repaint-mode
bind --preset --mode default --sets-mode insert c,\$ kill-line repaint-mode