Update bash and zsh to use vi mode (#8)

* Update bash and zsh to use vi mode

* Update keymaps and add better around/inside textobjects for tmux

Author: mau-mauricelim

.bashrc

@@ -27,7 +27,7 @@ done
 # Set variable identifying the chroot you work in
 [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ] && debian_chroot=$(cat /etc/debian_chroot)
 # Color prompt
-PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+PS1='\n${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\n\$ '
 # If this is an xterm set the title to user@host:dir
 PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
 
@@ -45,4 +45,4 @@ fi
 # zoxide
 if command -v zoxide >/dev/null; then
     eval "$(zoxide init --cmd cd bash)"
-fi
+fi

.commonrc

@@ -13,6 +13,10 @@ export XDG_RUNTIME_DIR="$XDG_CONFIG_HOME/local/runtime-dir"
 [ -d "$XDG_RUNTIME_DIR" ] || mkdir -p "$XDG_RUNTIME_DIR"
 [ "$(stat -c "%a" "$XDG_RUNTIME_DIR")" = "700" ] || chmod 700 "$XDG_RUNTIME_DIR"
 
+# NOTE: Ctrl-X + Ctrl-E : Edits the current line in the $EDITOR program
+export VISUAL=vim
+export EDITOR=vim
+
 # Set system locale
 export LANG=C.UTF-8
 export LANGUAGE=C.UTF-8
@@ -22,6 +26,9 @@ export PAGER=less
 # Enable 256 colors with xterm
 export TERM=xterm-256color
 
+# Disable the freeze/unfreeze behavior for Ctrl-S/Q
+stty -ixon
+
 addToPath () { [[ "$PATH" != *"$1"* ]] && export PATH="$PATH:$1"; }
 addToPathFront () { [[ "$PATH" != *"$1"* ]] && export PATH="$1:$PATH"; }
 

.config/alias/.alias

@@ -2,6 +2,7 @@ if command -v nvim >/dev/null; then
     # Don't connect to the X server.
     # Shortens startup time in a terminal, but the window title and clipboard will not be used.
     alias vi="nvim -X"
+    export VISUAL=nvim
     export EDITOR=nvim
     export MANPAGER='nvim +Man!'
 fi
@@ -22,6 +23,10 @@ else
 fi
 
 if command -v lazygit &> /dev/null; then alias lg="lazygit"; fi
+# Copy and pasting from Windows to Linux
+# ^M is the keyboard equivalent to \r or Ctrl-V + Ctrl-M in Vim
+# dos2unix convert or translate the ^M characters
+if command -v dos2unix &> /dev/null; then alias d2u="dos2unix"; fi
 
 alias cl="clear"
 

.config/nvim/lua/config/keymaps.lua

@@ -104,6 +104,8 @@ vim.keymap.set('n', 'x', 'charcol(".") == charcol("$") ? "J" : "x"', { expr = tr
 
 -- Save file
 vim.keymap.set({ 'i', 'x', 'n', 's' }, '<C-s>', '<cmd>w<cr><Esc>', { desc = 'Save file' })
+-- `:cq` to quit, without saving, with a nonzero exit code to indicate failure - bash will not execute the command
+vim.keymap.set('n', 'ZC', '<cmd>cq<CR>', { desc = 'Quit without saving with a nonzero exit code' })
 -- New file
 vim.keymap.set('n', '<Leader>nf', '<cmd>enew<CR>', { desc = '[N]ew [F]ile' })
 -- Disable go to sleep keymap
@@ -146,7 +148,9 @@ vim.keymap.set('n', 'cA', 'ggdGi', { desc = '[C]hange [A]ll lines' })
 vim.keymap.set('n', 'yA', '<cmd>%y<CR>', { desc = '[Y]ank [A]ll lines', silent = true })
 -- Select to end of line: similar to `C`, `D` and `Y`
 vim.keymap.set('n', 'L', 'v$h', { desc = 'Select to end of line' })
+vim.keymap.set('v', 'L', '$h', { desc = 'Select to end of line' })
 vim.keymap.set('n', 'H', 'v^', { desc = 'Select to start of line' })
+vim.keymap.set('v', 'H', '^', { desc = 'Select to start of line' })
 -- Select pasted text: similar to `gv`
 vim.keymap.set('n', 'gp', [['`[' . strpart(getregtype(), 0, 1) . '`]']], { expr = true, desc = 'Select previous pasted text' })
 

.config/nvim/lua/plugins/mini.lua

@@ -122,6 +122,7 @@ return { -- Collection of various small independent plugins/modules
     -- Add/delete/replace surroundings (brackets, quotes, etc.)
     -- Supports dot-repeat
     --
+    -- Examples:
     -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
     -- - sd'   - [S]urround [D]elete [']quotes
     -- - sr)'  - [S]urround [R]eplace [)] [']

.config/tmux/tmux.conf

@@ -39,7 +39,17 @@ bind-key C-Space last-window
 # Don't exit copy mode when dragging with mouse
 # Does not work if tmux-yank is enabled
 # unbind -T copy-mode-vi MouseDragEnd1Pane
-bind-key k copy-mode
+
+# NOTE: Use `tmux list-key` to see the key bindings
+# Enter copy-mode and move one line up/down
+bind-key k copy-mode \; send-key k
+bind-key j copy-mode \; send-key j
+# Enter copy-mode and search upwards
+# bind-key / copy-mode \; send-key ?
+# `n` to always search forward and `N` backward
+bind-key / copy-mode \; bind-key -T copy-mode-vi n send-keys -X search-reverse \; bind-key -T copy-mode-vi N send-keys -X search-again \; command-prompt -i -p "(search up)" "send -X search-backward-incremental \"%%%\""
+bind-key -T copy-mode-vi / \; bind-key -T copy-mode-vi N send-keys -X search-reverse \; bind-key -T copy-mode-vi n send-keys -X search-again \; command-prompt -i -p "(search down)" "send -X search-forward-incremental \"%%%\""
+bind-key -T copy-mode-vi ? \; bind-key -T copy-mode-vi n send-keys -X search-reverse \; bind-key -T copy-mode-vi N send-keys -X search-again \; command-prompt -i -p "(search up)" "send -X search-backward-incremental \"%%%\""
 
 # vim mode
 bind-key -T copy-mode-vi v {
@@ -54,6 +64,18 @@ bind-key -T copy-mode-vi v {
     }
 }
 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
+bind-key -T copy-mode-vi L {
+    if-shell -F "#{selection_present}" {} { send-key v }
+    send-key $
+    send-key h
+}
+bind-key -T copy-mode-vi H {
+    if-shell -F "#{selection_present}" {} { send-key v }
+    send-key ^
+}
+
+# Better Around/Inside textobjects
+source-file $XDG_CONFIG_HOME/tmux/tmux.textobjects.conf
 
 # Start numbering at 1 instead of 0
 set -g base-index 1
@@ -88,4 +110,4 @@ if "test ! -d $XDG_CONFIG_HOME/tmux/plugins/tpm" \
    "run 'git clone -q --depth=1 https://github.com/tmux-plugins/tpm $XDG_CONFIG_HOME/tmux/plugins/tpm && $XDG_CONFIG_HOME/tmux/plugins/tpm/bin/install_plugins'"
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run  "$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm"
+run "$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm"

.config/tmux/tmux.textobjects.conf

@@ -0,0 +1,63 @@
+# Better Around/Inside textobjects
+# Adapted from https://github.com/kite12580/.vim/blob/main/config/.tmux.conf
+bind -T copy-mode-vi i switch-client -T copyModeMultiKey_i
+bind -T copyModeMultiKey_i  w send-keys -X select-word
+bind -T copyModeMultiKey_i  W send-keys -X clear-selection \; send-keys -X previous-space \; send-keys -X begin-selection \; send-keys -X next-space-end
+bind -T copyModeMultiKey_i  ( send-keys -X clear-selection \; send-keys -X jump-to-forward  ')' \; send-keys -X begin-selection \; send-keys -X jump-to-backward '('
+bind -T copyModeMultiKey_i  ) send-keys -X clear-selection \; send-keys -X jump-to-forward  ')' \; send-keys -X begin-selection \; send-keys -X jump-to-backward '('
+bind -T copyModeMultiKey_i \{ send-keys -X clear-selection \; send-keys -X jump-to-forward  '}' \; send-keys -X begin-selection \; send-keys -X jump-to-backward '{'
+bind -T copyModeMultiKey_i \} send-keys -X clear-selection \; send-keys -X jump-to-forward  '}' \; send-keys -X begin-selection \; send-keys -X jump-to-backward '{'
+bind -T copyModeMultiKey_i  [ send-keys -X clear-selection \; send-keys -X jump-to-forward  ']' \; send-keys -X begin-selection \; send-keys -X jump-to-backward '['
+bind -T copyModeMultiKey_i  ] send-keys -X clear-selection \; send-keys -X jump-to-forward  ']' \; send-keys -X begin-selection \; send-keys -X jump-to-backward '['
+bind -T copyModeMultiKey_i  < send-keys -X clear-selection \; send-keys -X jump-to-forward  '>' \; send-keys -X begin-selection \; send-keys -X jump-to-backward '<'
+bind -T copyModeMultiKey_i  > send-keys -X clear-selection \; send-keys -X jump-to-forward  '>' \; send-keys -X begin-selection \; send-keys -X jump-to-backward '<'
+bind -T copyModeMultiKey_i  ` send-keys -X clear-selection \; send-keys -X jump-to-backward '`' \; send-keys -X begin-selection \; send-keys -X jump-to-forward  '`'
+bind -T copyModeMultiKey_i \' send-keys -X clear-selection \; send-keys -X jump-to-backward "'" \; send-keys -X begin-selection \; send-keys -X jump-to-forward  "'"
+bind -T copyModeMultiKey_i \" send-keys -X clear-selection \; send-keys -X jump-to-backward '"' \; send-keys -X begin-selection \; send-keys -X jump-to-forward  '"'
+bind -T copyModeMultiKey_i  l send-keys -X clear-selection \; send-keys -X back-to-indentation \; send-keys -X begin-selection \; send-keys -X end-of-line \; send-keys -X cursor-left \; send-keys -X other-end
+bind -T copyModeMultiKey_i  b {
+    send-keys -X clear-selection
+    send -X search-forward  '[])}>]'
+    send-keys -X begin-selection
+    send -X search-backward '[[({<]'
+    send-key o
+    send-key h
+    send-key o
+    send-key l
+}
+# cursor has to be inside [q]uotes
+bind -T copyModeMultiKey_i q {
+    send-keys -X clear-selection
+    send -X search-forward  "[`'\"]"
+    send-keys -X begin-selection
+    send -X search-backward "[`'\"]"
+    send-key o
+    send-key h
+    send-key o
+    send-key l
+}
+bind -T copy-mode-vi a switch-client -T copyModeMultiKey_a
+bind -T copyModeMultiKey_a  ( send-keys -X clear-selection \; send-keys -X jump-forward  ')' \; send-keys -X begin-selection \; send-keys -X jump-backward '('
+bind -T copyModeMultiKey_a  ) send-keys -X clear-selection \; send-keys -X jump-forward  ')' \; send-keys -X begin-selection \; send-keys -X jump-backward '('
+bind -T copyModeMultiKey_a \{ send-keys -X clear-selection \; send-keys -X jump-forward  '}' \; send-keys -X begin-selection \; send-keys -X jump-backward '{'
+bind -T copyModeMultiKey_a \} send-keys -X clear-selection \; send-keys -X jump-forward  '}' \; send-keys -X begin-selection \; send-keys -X jump-backward '{'
+bind -T copyModeMultiKey_a  [ send-keys -X clear-selection \; send-keys -X jump-forward  ']' \; send-keys -X begin-selection \; send-keys -X jump-backward '['
+bind -T copyModeMultiKey_a  ] send-keys -X clear-selection \; send-keys -X jump-forward  ']' \; send-keys -X begin-selection \; send-keys -X jump-backward '['
+bind -T copyModeMultiKey_a  < send-keys -X clear-selection \; send-keys -X jump-forward  '>' \; send-keys -X begin-selection \; send-keys -X jump-backward '<'
+bind -T copyModeMultiKey_a  > send-keys -X clear-selection \; send-keys -X jump-forward  '>' \; send-keys -X begin-selection \; send-keys -X jump-backward '<'
+bind -T copyModeMultiKey_a  ` send-keys -X clear-selection \; send-keys -X jump-backward '`' \; send-keys -X begin-selection \; send-keys -X jump-forward  '`'
+bind -T copyModeMultiKey_a \' send-keys -X clear-selection \; send-keys -X jump-backward "'" \; send-keys -X begin-selection \; send-keys -X jump-forward  "'"
+bind -T copyModeMultiKey_a \" send-keys -X clear-selection \; send-keys -X jump-backward '"' \; send-keys -X begin-selection \; send-keys -X jump-forward  '"'
+bind -T copyModeMultiKey_a  b {
+    send-keys -X clear-selection
+    send -X search-forward  '[])}>]'
+    send-keys -X begin-selection
+    send -X search-backward '[[({<]'
+}
+# cursor has to be inside [q]uotes
+bind -T copyModeMultiKey_a q {
+    send-keys -X clear-selection
+    send -X search-forward  "[`'\"]"
+    send-keys -X begin-selection
+    send -X search-backward "[`'\"]"
+}

.config/zsh/bindkey-vi.zsh

@@ -0,0 +1,67 @@
+# Retrieve emacs bindings in the form of bindkey commands
+local emacs_binding=$(bindkey -L)
+
+# https://thevaluable.dev/zsh-install-configure-mouseless - Zsh With Vim Flavors
+# Use vi mode
+bindkey -v
+# Makes the switch between modes quicker
+export KEYTIMEOUT=10
+# Apply emacs bindings to vi
+eval $emacs_binding
+
+# Exit insert mode with `kj`
+bindkey -M viins 'kj' vi-cmd-mode
+
+# Change cursor shape when switching between modes
+cursor_mode() {
+    cursor_block='\e[2 q'
+    cursor_beam='\e[6 q'
+    function zle-keymap-select {
+        if [[ ${KEYMAP} == vicmd ]] ||
+            [[ $1 = 'block' ]]; then
+            echo -ne $cursor_block
+        elif [[ ${KEYMAP} == main ]] ||
+            [[ ${KEYMAP} == viins ]] ||
+            [[ ${KEYMAP} = '' ]] ||
+            [[ $1 = 'beam' ]]; then
+            echo -ne $cursor_beam
+        fi
+    }
+    zle-line-init() {
+        echo -ne $cursor_beam
+    }
+    zle -N zle-keymap-select
+    zle -N zle-line-init
+}
+cursor_mode
+
+# Adding Text Objects
+# Examples:
+#  - va)  - [V]isually select [A]round [)]paren
+#  - ci'  - [C]hange [I]nside [']quote
+autoload -Uz select-bracketed select-quoted
+zle -N select-quoted
+zle -N select-bracketed
+for km in viopp visual; do
+  bindkey -M $km -- '-' vi-up-line-or-history
+  for c in {a,i}${(s..)^:-\'\"\`\|,./:;=+@}; do
+    bindkey -M $km $c select-quoted
+  done
+  for c in {a,i}${(s..)^:-'()[]{}<>bB'}; do
+    bindkey -M $km $c select-bracketed
+  done
+done
+
+# Add/delete/replace surroundings (brackets, quotes, etc.)
+# Examples:
+# - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
+# - sd'   - [S]urround [D]elete [']quotes
+# - sr)'  - [S]urround [R]eplace [)] [']
+autoload -Uz surround
+zle -N delete-surround surround
+zle -N add-surround surround
+zle -N change-surround surround
+bindkey -M vicmd sr change-surround
+bindkey -M vicmd sd delete-surround
+bindkey -M vicmd sa add-surround
+bindkey -M visual sa add-surround

.config/zsh/bindkey.zsh

@@ -4,13 +4,19 @@
 # Use emacs keybindings even if our EDITOR is set to vi
 bindkey -e
 
+# Use vi mode
+[ -f $ZDOTDIR/bindkey-vi.zsh ] && source $ZDOTDIR/bindkey-vi.zsh
+
 # Load widgets that are not loaded by default.
 autoload -U up-line-or-beginning-search
 zle -N up-line-or-beginning-search
 
 autoload -U down-line-or-beginning-search
 zle -N down-line-or-beginning-search
 
+autoload edit-command-line
+zle -N edit-command-line
+
 function () {
     emulate -L zsh -o no_aliases
 
@@ -51,6 +57,9 @@ function () {
         kLFT5  '^[[1;5D'  backward-word                  # Ctrl + LeftArrow
         x      '^U'       backward-kill-line             # Ctrl + U
         x      '^U^U'     kill-whole-line                # Ctrl + UU
+        # vi mode
+        x      '^Q'       edit-command-line              # Ctrl + Q - edit command line in vim buffer
+        x      '^?'       backward-delete-char           # Fix backspace bug when switching between modes
     ); do
         bindkey -M emacs ${terminfo[$kcap]:-$seq} $widget
         bindkey -M viins ${terminfo[$kcap]:-$seq} $widget
@@ -72,4 +81,3 @@ FZF_CTRL_F_COMMAND () {
 }
 zle -N FZF_CTRL_F_COMMAND
 bindkey '^f' FZF_CTRL_F_COMMAND
-

.inputrc

@@ -0,0 +1,27 @@
+set editing-mode vi
+# NOTE: bash 4.3 and readline 6.3 and above
+set show-mode-in-prompt on
+set vi-ins-mode-string \1\e[6 q\2\e[106;30mI\e[0m
+set vi-cmd-mode-string \1\e[2 q\2\e[102;30mN\e[0m
+
+set keymap vi-insert
+"kj": vi-movement-mode
+"\ee": emacs-editing-mode
+"\C-n": next-history
+"\C-p": previous-history
+"\C-a": beginning-of-line
+"\C-e": end-of-line
+
+set keymap vi-command
+"\ee": emacs-editing-mode
+"\C-n": next-history
+"\C-p": previous-history
+"\C-a": beginning-of-line
+"\C-e": end-of-line
+
+set keymap emacs
+"\ee": vi-editing-mode
+
+# v goes vi-editing-mode in cmd mode
+# `:cq` to quit, without saving, with a nonzero exit code to indicate failure - bash will not execute the command
+# - `ZC` custom nvim keymap