From b19ef12408993ed6ead98ba8a8f46316d760e853 Mon Sep 17 00:00:00 2001 From: mitchell Date: Sun, 1 Mar 2020 22:32:03 -0500 Subject: [PATCH] Add fish_user_key_bindings function; Remove fish_vi_key_bindings customer version; Rebind tmux prefix to Ctrl-a --- .../functions/fish_user_key_bindings.fish | 3 + .../fish/functions/fish_vi_key_bindings.fish | 278 ------------------ .tmux.conf | 4 + 3 files changed, 7 insertions(+), 278 deletions(-) create mode 100644 .config/fish/functions/fish_user_key_bindings.fish delete mode 100644 .config/fish/functions/fish_vi_key_bindings.fish diff --git a/.config/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish new file mode 100644 index 0000000..90a9a82 --- /dev/null +++ b/.config/fish/functions/fish_user_key_bindings.fish @@ -0,0 +1,3 @@ +function fish_user_key_bindings + bind -s --preset -M insert jj "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char repaint-mode; end" +end diff --git a/.config/fish/functions/fish_vi_key_bindings.fish b/.config/fish/functions/fish_vi_key_bindings.fish deleted file mode 100644 index 10bcfdc..0000000 --- a/.config/fish/functions/fish_vi_key_bindings.fish +++ /dev/null @@ -1,278 +0,0 @@ -function fish_vi_key_bindings --description 'vi-like key bindings for fish' - if contains -- -h $argv - or contains -- --help $argv - echo "Sorry but this function doesn't support -h or --help" - return 1 - end - - # Erase all bindings if not explicitly requested otherwise to - # allow for hybrid bindings. - # This needs to be checked here because if we are called again - # via the variable handler the argument will be gone. - set -l rebind true - if test "$argv[1]" = "--no-erase" - set rebind false - set -e argv[1] - else - bind --erase --all --preset # clear earlier bindings, if any - end - - # Allow just calling this function to correctly set the bindings. - # Because it's a rather discoverable name, users will execute it - # and without this would then have subtly broken bindings. - if test "$fish_key_bindings" != "fish_vi_key_bindings" - and test "$rebind" = "true" - # Allow the user to set the variable universally. - set -q fish_key_bindings - or set -g fish_key_bindings - # This triggers the handler, which calls us again and ensures the user_key_bindings - # are executed. - set fish_key_bindings fish_vi_key_bindings - return - end - - # The default escape timeout is 300ms. But for users of Vi bindings that can be slightly - # annoying when trying to switch to Vi "normal" mode. So set a shorter timeout in this case - # unless the user has explicitly set the delay. - set -q fish_escape_delay_ms - or set -g fish_escape_delay_ms 100 - - set -l init_mode insert - # These are only the special vi-style keys - # not end/home, we share those. - set -l eol_keys \$ g\$ - set -l bol_keys \^ 0 g\^ - - if contains -- $argv[1] insert default visual - set init_mode $argv[1] - else if set -q argv[1] - # We should still go on so the bindings still get set. - echo "Unknown argument $argv" >&2 - end - - # Inherit shared key bindings. - # Do this first so vi-bindings win over default. - for mode in insert default visual - __fish_shared_key_bindings -M $mode - end - - bind -s --preset -M insert \r execute - bind -s --preset -M insert \n execute - - bind -s --preset -M insert "" self-insert - - # Add way to kill current command line while in insert mode. - bind -s --preset -M insert \cc __fish_cancel_commandline - # Add a way to switch from insert to normal (command) mode. - # Note if we are paging, we want to stay in insert mode - # See #2871 - bind -s --preset -M insert jj "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char force-repaint; end" - - # Default (command) mode - bind -s --preset :q exit - bind -s --preset -m insert \cc __fish_cancel_commandline - bind -s --preset -M default h backward-char - bind -s --preset -M default l forward-char - bind -s --preset -m insert \n execute - bind -s --preset -m insert \r execute - bind -s --preset -m insert i force-repaint - bind -s --preset -m insert I beginning-of-line force-repaint - bind -s --preset -m insert a forward-char force-repaint - bind -s --preset -m insert A end-of-line force-repaint - bind -s --preset -m visual v begin-selection force-repaint - - #bind -s --preset -m insert o "commandline -a \n" down-line force-repaint - #bind -s --preset -m insert O beginning-of-line "commandline -i \n" up-line force-repaint # doesn't work - - bind -s --preset gg beginning-of-buffer - bind -s --preset G end-of-buffer - - for key in $eol_keys - bind -s --preset $key end-of-line - end - for key in $bol_keys - bind -s --preset $key beginning-of-line - end - - bind -s --preset u history-search-backward - bind -s --preset \cr history-search-forward - - bind -s --preset [ history-token-search-backward - bind -s --preset ] history-token-search-forward - - bind -s --preset k up-or-search - bind -s --preset j down-or-search - bind -s --preset b backward-word - bind -s --preset B backward-bigword - bind -s --preset ge backward-word - bind -s --preset gE backward-bigword - bind -s --preset w forward-word forward-char - bind -s --preset W forward-bigword forward-char - bind -s --preset e forward-char forward-word backward-char - bind -s --preset E forward-bigword backward-char - - # OS X SnowLeopard doesn't have these keys. Don't show an annoying error message. - # Vi/Vim doesn't support these keys in insert mode but that seems silly so we do so anyway. - bind -s --preset -M insert -k home beginning-of-line 2>/dev/null - bind -s --preset -M default -k home beginning-of-line 2>/dev/null - bind -s --preset -M insert -k end end-of-line 2>/dev/null - bind -s --preset -M default -k end end-of-line 2>/dev/null - - # Vi moves the cursor back if, after deleting, it is at EOL. - # To emulate that, move forward, then backward, which will be a NOP - # if there is something to move forward to. - bind -s --preset -M default x delete-char forward-char backward-char - bind -s --preset -M default X backward-delete-char - bind -s --preset -M insert -k dc delete-char forward-char backward-char - bind -s --preset -M default -k dc delete-char forward-char backward-char - - # Backspace deletes a char in insert mode, but not in normal/default mode. - bind -s --preset -M insert -k backspace backward-delete-char - bind -s --preset -M default -k backspace backward-char - bind -s --preset -M insert \ch backward-delete-char - bind -s --preset -M default \ch backward-char - bind -s --preset -M insert \x7f backward-delete-char - bind -s --preset -M default \x7f backward-char - bind -s --preset -M insert \e\[3\;2~ backward-delete-char # Mavericks Terminal.app shift-ctrl-delete - bind -s --preset -M default \e\[3\;2~ backward-delete-char # Mavericks Terminal.app shift-ctrl-delete - - bind -s --preset dd kill-whole-line - bind -s --preset D kill-line - bind -s --preset d\$ kill-line - bind -s --preset d\^ backward-kill-line - bind -s --preset dw kill-word - bind -s --preset dW kill-bigword - bind -s --preset diw forward-char forward-char backward-word kill-word - bind -s --preset diW forward-char forward-char backward-bigword kill-bigword - bind -s --preset daw forward-char forward-char backward-word kill-word - bind -s --preset daW forward-char forward-char backward-bigword kill-bigword - bind -s --preset de kill-word - bind -s --preset dE kill-bigword - bind -s --preset db backward-kill-word - bind -s --preset dB backward-kill-bigword - bind -s --preset dge backward-kill-word - bind -s --preset dgE backward-kill-bigword - bind -s --preset df begin-selection forward-jump kill-selection end-selection - bind -s --preset dt begin-selection forward-jump backward-char kill-selection end-selection - bind -s --preset dF begin-selection backward-jump kill-selection end-selection - bind -s --preset dT begin-selection backward-jump forward-char kill-selection end-selection - - bind -s --preset -m insert s delete-char force-repaint - bind -s --preset -m insert S kill-whole-line force-repaint - bind -s --preset -m insert cc kill-whole-line force-repaint - bind -s --preset -m insert C kill-line force-repaint - bind -s --preset -m insert c\$ kill-line force-repaint - bind -s --preset -m insert c\^ backward-kill-line force-repaint - bind -s --preset -m insert cw kill-word force-repaint - bind -s --preset -m insert cW kill-bigword force-repaint - bind -s --preset -m insert ciw forward-char forward-char backward-word kill-word force-repaint - bind -s --preset -m insert ciW forward-char forward-char backward-bigword kill-bigword force-repaint - bind -s --preset -m insert caw forward-char forward-char backward-word kill-word force-repaint - bind -s --preset -m insert caW forward-char forward-char backward-bigword kill-bigword force-repaint - bind -s --preset -m insert ce kill-word force-repaint - bind -s --preset -m insert cE kill-bigword force-repaint - bind -s --preset -m insert cb backward-kill-word force-repaint - bind -s --preset -m insert cB backward-kill-bigword force-repaint - bind -s --preset -m insert cge backward-kill-word force-repaint - bind -s --preset -m insert cgE backward-kill-bigword force-repaint - - bind -s --preset '~' capitalize-word - bind -s --preset gu downcase-word - bind -s --preset gU upcase-word - - bind -s --preset J end-of-line delete-char - bind -s --preset K 'man (commandline -t) 2>/dev/null; or echo -n \a' - - bind -s --preset yy kill-whole-line yank - bind -s --preset Y kill-whole-line yank - bind -s --preset y\$ kill-line yank - bind -s --preset y\^ backward-kill-line yank - bind -s --preset yw kill-word yank - bind -s --preset yW kill-bigword yank - bind -s --preset yiw forward-char forward-char backward-word kill-word yank - bind -s --preset yiW forward-char forward-char backward-bigword kill-bigword yank - bind -s --preset yaw forward-char forward-char backward-word kill-word yank - bind -s --preset yaW forward-char forward-char backward-bigword kill-bigword yank - bind -s --preset ye kill-word yank - bind -s --preset yE kill-bigword yank - bind -s --preset yb backward-kill-word yank - bind -s --preset yB backward-kill-bigword yank - bind -s --preset yge backward-kill-word yank - bind -s --preset ygE backward-kill-bigword yank - - bind -s --preset f forward-jump - bind -s --preset F backward-jump - bind -s --preset t forward-jump-till - bind -s --preset T backward-jump-till - bind -s --preset ';' repeat-jump - bind -s --preset , repeat-jump-reverse - - # in emacs yank means paste - bind -s --preset p yank - bind -s --preset P backward-char yank - bind -s --preset gp yank-pop - - bind -s --preset '"*p' "commandline -i ( xsel -p; echo )[1]" - bind -s --preset '"*P' backward-char "commandline -i ( xsel -p; echo )[1]" - - # - # Lowercase r, enters replace_one mode - # - bind -s --preset -m replace_one r force-repaint - bind -s --preset -M replace_one -m default '' delete-char self-insert backward-char force-repaint - bind -s --preset -M replace_one -m default \e cancel force-repaint - - # - # visual mode - # - bind -s --preset -M visual h backward-char - bind -s --preset -M visual l forward-char - - bind -s --preset -M visual k up-line - bind -s --preset -M visual j down-line - - bind -s --preset -M visual b backward-word - bind -s --preset -M visual B backward-bigword - bind -s --preset -M visual ge backward-word - bind -s --preset -M visual gE backward-bigword - bind -s --preset -M visual w forward-word - bind -s --preset -M visual W forward-bigword - bind -s --preset -M visual e forward-word - bind -s --preset -M visual E forward-bigword - bind -s --preset -M visual o swap-selection-start-stop force-repaint - - bind -s --preset -M visual f forward-jump - bind -s --preset -M visual t forward-jump-till - bind -s --preset -M visual F backward-jump - bind -s --preset -M visual T backward-jump-till - - for key in $eol_keys - bind -s --preset -M visual $key end-of-line - end - for key in $bol_keys - bind -s --preset -M visual $key beginning-of-line - end - - bind -s --preset -M visual -m insert c kill-selection end-selection force-repaint - bind -s --preset -M visual -m default d kill-selection end-selection force-repaint - bind -s --preset -M visual -m default x kill-selection end-selection force-repaint - bind -s --preset -M visual -m default X kill-whole-line end-selection force-repaint - bind -s --preset -M visual -m default y kill-selection yank end-selection force-repaint - bind -s --preset -M visual -m default '"*y' "commandline -s | xsel -p; commandline -f end-selection force-repaint" - - bind -s --preset -M visual -m default \cc end-selection force-repaint - bind -s --preset -M visual -m default \e end-selection force-repaint - - # Make it easy to turn an unexecuted command into a comment in the shell history. Also, remove - # the commenting chars so the command can be further edited then executed. - bind -s --preset -M default \# __fish_toggle_comment_commandline - bind -s --preset -M visual \# __fish_toggle_comment_commandline - - # Set the cursor shape - # After executing once, this will have defined functions listening for the variable. - # Therefore it needs to be before setting fish_bind_mode. - fish_vi_cursor - - set fish_bind_mode $init_mode - -end diff --git a/.tmux.conf b/.tmux.conf index eed5bb3..069e9bc 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -2,6 +2,10 @@ set -g default-terminal "xterm-256color" setw -g mouse on setw -g mode-keys vi +set -g prefix C-a +bind C-a send-prefix +unbind C-b + bind j select-pane -D bind k select-pane -U bind h select-pane -L