[#50] Bind to both emacs and vi keymaps

main
Sorin Ionescu 13 years ago
parent 9f8b41aaec
commit 12a4117525

@ -124,199 +124,202 @@ function prepend-sudo() {
} }
zle -N prepend-sudo zle -N prepend-sudo
zstyle -s ':omz:editor' keymap 'keymap' # Emacs key bindings.
if [[ "$keymap" == (emacs|) ]]; then [[ -n "$keyinfo[Escape]" ]] && \
# Use Emacs key bindings. for key in "$keyinfo[Escape]"{B,b}; \
bindkey -e bindkey -M emacs "$key" emacs-backward-word
[[ -n "$keyinfo[Escape]" ]] && \
[[ -n "$keyinfo[Escape]" ]] && \ for key in "$keyinfo[Escape]"{F,f}; \
for key in "$keyinfo[Escape]"{B,b}; \ bindkey -M emacs "$key" emacs-forward-word
bindkey -M emacs "$key" emacs-backward-word [[ -n "$keyinfo[Escape]" && -n "$keyinfo[Left]" ]] && \
[[ -n "$keyinfo[Escape]" ]] && \ bindkey -M emacs "$keyinfo[Escape]$keyinfo[Left]" emacs-backward-word
for key in "$keyinfo[Escape]"{F,f}; \ [[ -n "$keyinfo[Escape]" && -n "$keyinfo[Right]" ]] && \
bindkey -M emacs "$key" emacs-forward-word bindkey -M emacs "$keyinfo[Escape]$keyinfo[Right]" emacs-forward-word
[[ -n "$keyinfo[Escape]" && -n "$keyinfo[Left]" ]] && \
bindkey -M emacs "$keyinfo[Escape]$keyinfo[Left]" emacs-backward-word # Kill to the beginning of the line.
[[ -n "$keyinfo[Escape]" && -n "$keyinfo[Right]" ]] && \ [[ -n "$keyinfo[Escape]" ]] && \
bindkey -M emacs "$keyinfo[Escape]$keyinfo[Right]" emacs-forward-word for key in "$keyinfo[Escape]"{K,k}; \
bindkey -M emacs "$key" backward-kill-line
# Kill to the beginning of the line.
[[ -n "$keyinfo[Escape]" ]] && \
for key in "$keyinfo[Escape]"{K,k}; \
bindkey -M emacs "$key" backward-kill-line
# Redo. # Redo.
[[ -n "$keyinfo[Escape]" ]] && \ [[ -n "$keyinfo[Escape]" ]] && \
bindkey -M emacs "$keyinfo[Escape]_" redo bindkey -M emacs "$keyinfo[Escape]_" redo
# Search previous character. # Search previous character.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey -M emacs "$keyinfo[Control]X$keyinfo[Control]B" vi-find-prev-char bindkey -M emacs "$keyinfo[Control]X$keyinfo[Control]B" vi-find-prev-char
# Match bracket. # Match bracket.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey -M emacs "$keyinfo[Control]X$keyinfo[Control]]" vi-match-bracket bindkey -M emacs "$keyinfo[Control]X$keyinfo[Control]]" vi-match-bracket
# Edit command in an external editor. # Edit command in an external editor.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey -M emacs "$keyinfo[Control]X$keyinfo[Control]E" edit-command-line bindkey -M emacs "$keyinfo[Control]X$keyinfo[Control]E" edit-command-line
# Expand .... to ../.. # Expand .... to ../..
if zstyle -t ':omz:editor' dot-expansion; then if zstyle -t ':omz:editor' dot-expansion; then
bindkey -M emacs "." expand-dot-to-parent-directory-path bindkey -M emacs "." expand-dot-to-parent-directory-path
fi fi
# Bind to history substring search plugin if enabled; # Bind to history substring search plugin if enabled;
# otherwise, bind to built-in Zsh history search. # otherwise, bind to built-in Zsh history search.
if (( $+widgets[history-incremental-pattern-search-backward] )); then if (( $+widgets[history-incremental-pattern-search-backward] )); then
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey -M emacs "$keyinfo[Control]R" \ bindkey -M emacs "$keyinfo[Control]R" \
history-incremental-pattern-search-backward history-incremental-pattern-search-backward
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey -M emacs "$keyinfo[Control]S" \ bindkey -M emacs "$keyinfo[Control]S" \
history-incremental-pattern-search-forward history-incremental-pattern-search-forward
else else
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey -M emacs "$keyinfo[Control]R" \ bindkey -M emacs "$keyinfo[Control]R" \
history-incremental-search-backward history-incremental-search-backward
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey -M emacs "$keyinfo[Control]S" \ bindkey -M emacs "$keyinfo[Control]S" \
history-incremental-search-forward history-incremental-search-forward
fi fi
elif [[ "$keymap" == vi ]]; then
# Use vi key bindings.
bindkey -v
# Edit command in an external editor. # Vi key bindings.
bindkey -M vicmd "v" edit-command-line
# Show cursor position. # Edit command in an external editor.
bindkey -M vicmd "ga" what-cursor-position bindkey -M vicmd "v" edit-command-line
# Undo/Redo # Show cursor position.
bindkey -M vicmd "u" undo bindkey -M vicmd "ga" what-cursor-position
[[ -n "$keyinfo[Control]" ]] && \
bindkey -M vicmd "$keyinfo[Control]R" redo
# Expand .... to ../.. # Undo/Redo
if zstyle -t ':omz:editor' dot-expansion; then bindkey -M vicmd "u" undo
bindkey -M viins "." expand-dot-to-parent-directory-path [[ -n "$keyinfo[Control]" ]] && \
fi bindkey -M vicmd "$keyinfo[Control]R" redo
# Switch to command mode. # Expand .... to ../..
bindkey -M viins "jk" vi-cmd-mode if zstyle -t ':omz:editor' dot-expansion; then
bindkey -M viins "kj" vi-cmd-mode bindkey -M viins "." expand-dot-to-parent-directory-path
fi
# History # Switch to command mode.
bindkey -M vicmd "gg" beginning-of-history bindkey -M viins "jk" vi-cmd-mode
bindkey -M vicmd "G" end-of-history bindkey -M viins "kj" vi-cmd-mode
# Bind to history substring search plugin if enabled; # History
# otherwise, bind to built-in Zsh history search. bindkey -M vicmd "gg" beginning-of-history
if (( $+plugins[(er)history-substring-search] )); then bindkey -M vicmd "G" end-of-history
bindkey -M vicmd "k" history-substring-search-up
bindkey -M vicmd "j" history-substring-search-down
else
bindkey -M vicmd "k" up-line-or-history
bindkey -M vicmd "j" down-line-or-history
fi
if (( $+widgets[history-incremental-pattern-search-backward] )); then # Bind to history substring search plugin if enabled;
bindkey -M vicmd "?" history-incremental-pattern-search-backward # otherwise, bind to built-in Zsh history search.
bindkey -M vicmd "/" history-incremental-pattern-search-forward if (( $+plugins[(er)history-substring-search] )); then
else bindkey -M vicmd "k" history-substring-search-up
bindkey -M vicmd "?" history-incremental-search-backward bindkey -M vicmd "j" history-substring-search-down
bindkey -M vicmd "/" history-incremental-search-forward
fi
else else
print "omz: invalid keymap: $keymap" >&2 bindkey -M vicmd "k" up-line-or-history
unset keymap bindkey -M vicmd "j" down-line-or-history
return 1
fi fi
unset keymap
# The next key bindings are for both Emacs and Vi.
[[ -n "$keyinfo[Home]" ]] && \
bindkey "$keyinfo[Home]" beginning-of-line
[[ -n "$keyinfo[End]" ]] && \
bindkey "$keyinfo[End]" end-of-line
[[ -n "$keyinfo[Insert]" ]] && \ if (( $+widgets[history-incremental-pattern-search-backward] )); then
bindkey "$keyinfo[Insert]" overwrite-mode bindkey -M vicmd "?" history-incremental-pattern-search-backward
[[ -n "$keyinfo[Delete]" ]] && \ bindkey -M vicmd "/" history-incremental-pattern-search-forward
bindkey "$keyinfo[Delete]" delete-char else
[[ -n "$keyinfo[Backspace]" ]] && \ bindkey -M vicmd "?" history-incremental-search-backward
bindkey "$keyinfo[Backspace]" backward-delete-char && \ bindkey -M vicmd "/" history-incremental-search-forward
stty erase "$keyinfo[Backspace]" fi
[[ -n "$keyinfo[Left]" ]] && \ # Emacs and Vi key bindings.
bindkey "$keyinfo[Left]" backward-char for keymap in 'emacs' 'viins'; do
[[ -n "$keyinfo[Right]" ]] && \ [[ -n "$keyinfo[Home]" ]] && \
bindkey "$keyinfo[Right]" forward-char bindkey -M "$keymap" "$keyinfo[Home]" beginning-of-line
[[ -n "$keyinfo[End]" ]] && \
bindkey -M "$keymap" "$keyinfo[End]" end-of-line
[[ -n "$keyinfo[Insert]" ]] && \
bindkey -M "$keymap" "$keyinfo[Insert]" overwrite-mode
[[ -n "$keyinfo[Delete]" ]] && \
bindkey -M "$keymap" "$keyinfo[Delete]" delete-char
[[ -n "$keyinfo[Backspace]" ]] && \
bindkey -M "$keymap" "$keyinfo[Backspace]" backward-delete-char && \
stty erase "$keyinfo[Backspace]"
[[ -n "$keyinfo[Left]" ]] && \
bindkey -M "$keymap" "$keyinfo[Left]" backward-char
[[ -n "$keyinfo[Right]" ]] && \
bindkey -M "$keymap" "$keyinfo[Right]" forward-char
# Expand history on space.
bindkey -M "$keymap" ' ' magic-space
# Expand history on space. if (( $+plugins[(er)history-substring-search] )); then
bindkey ' ' magic-space [[ -n "$keyinfo[Up]" ]] && \
bindkey -M "$keymap" "$keyinfo[Up]" history-substring-search-up
[[ -n "$keyinfo[Down]" ]] && \
bindkey -M "$keymap" "$keyinfo[Down]" history-substring-search-down
[[ -n "$keyinfo[Control]" ]] && \
bindkey -M "$keymap" "$keyinfo[Control]P" history-substring-search-up
[[ -n "$keyinfo[Control]" ]] && \
bindkey -M "$keymap" "$keyinfo[Control]N" history-substring-search-down
else
[[ -n "$keyinfo[Up]" ]] && \
bindkey -M "$keymap" "$keyinfo[Up]" up-line-or-history
[[ -n "$keyinfo[Down]" ]] && \
bindkey -M "$keymap" "$keyinfo[Down]" down-line-or-history
[[ -n "$keyinfo[Control]" ]] && \
bindkey -M "$keymap" "$keyinfo[Control]P" up-line-or-history
[[ -n "$keyinfo[Control]" ]] && \
bindkey -M "$keymap" "$keyinfo[Control]N" down-line-or-history
fi
if (( $+plugins[(er)history-substring-search] )); then # Clear screen.
[[ -n "$keyinfo[Up]" ]] && \
bindkey "$keyinfo[Up]" history-substring-search-up
[[ -n "$keyinfo[Down]" ]] && \
bindkey "$keyinfo[Down]" history-substring-search-down
[[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]P" history-substring-search-up
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]N" history-substring-search-down bindkey -M "$keymap" "$keyinfo[Control]L" clear-screen
else
[[ -n "$keyinfo[Up]" ]] && \
bindkey "$keyinfo[Up]" up-line-or-history
[[ -n "$keyinfo[Down]" ]] && \
bindkey "$keyinfo[Down]" down-line-or-history
[[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]P" up-line-or-history
[[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]N" down-line-or-history
fi
# Clear screen. # Expand command name to full path.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Escape]" ]] && \
bindkey "$keyinfo[Control]L" clear-screen for key in "$keyinfo[Escape]"{E,e}; \
bindkey -M "$keymap" "$key" expand-cmd-path
# Expand command name to full path. # Duplicate the previous word.
[[ -n "$keyinfo[Escape]" ]] && \ [[ -n "$keyinfo[Escape]" ]] && \
for key in "$keyinfo[Escape]"{E,e}; \ for key in "$keyinfo[Escape]"{M,m}; \
bindkey "$key" expand-cmd-path bindkey -M "$keymap" "$key" copy-prev-shell-word
# Duplicate the previous word. # Use a more flexible push-line.
[[ -n "$keyinfo[Escape]" ]] && \ [[ -n "$keyinfo[Control]" && -n "$keyinfo[Escape]" ]] && \
for key in "$keyinfo[Escape]"{M,m}; \ for key in "$keyinfo[Control]Q" "$keyinfo[Escape]"{q,Q}; \
bindkey "$key" copy-prev-shell-word bindkey -M "$keymap" "$key" push-line-or-edit
# Bind Shift + Tab to go to the previous menu item. # Bind Shift + Tab to go to the previous menu item.
[[ -n "$keyinfo[BackTab]" ]] && \ [[ -n "$keyinfo[BackTab]" ]] && \
bindkey "$keyinfo[BackTab]" reverse-menu-complete bindkey -M "$keymap" "$keyinfo[BackTab]" reverse-menu-complete
# Complete in the middle of word. # Complete in the middle of word.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]I" expand-or-complete-prefix bindkey -M "$keymap" "$keyinfo[Control]I" expand-or-complete-prefix
# Convert .... to ../.. automatically. # Convert .... to ../.. automatically.
if zstyle -t ':omz:editor' dot-expansion; then if zstyle -t ':omz:editor' dot-expansion; then
# Do not expand during incremental search. # Do not expand during incremental search.
bindkey -M isearch . self-insert 2>/dev/null bindkey -M "$keymap" -M isearch . self-insert 2>/dev/null
fi fi
# Display an indicator when completing. # Display an indicator when completing.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]I" expand-or-complete-prefix-with-indicator bindkey -M "$keymap" "$keyinfo[Control]I" \
expand-or-complete-prefix-with-indicator
# Use a more flexible push-line. # Insert 'sudo ' at the beginning of the line.
[[ -n "$keyinfo[Control]" && -n "$keyinfo[Escape]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
for key in "$keyinfo[Control]Q" "$keyinfo[Escape]"{q,Q}; \ bindkey -M "$keymap" "$keyinfo[Control]X$keyinfo[Control]S" prepend-sudo
bindkey "$key" push-line-or-edit done
# Insert 'sudo ' at the beginning of the line. # Set the key layout.
[[ -n "$keyinfo[Control]" ]] && \ zstyle -s ':omz:editor' keymap 'keymap'
bindkey "$keyinfo[Control]X$keyinfo[Control]S" prepend-sudo if [[ "$keymap" == (emacs|) ]]; then
bindkey -e
elif [[ "$keymap" == vi ]]; then
bindkey -v
else
print "omz: invalid keymap: $keymap" >&2
fi
unset keymap
unset key unset key

Loading…
Cancel
Save