Update .vimrc (prevent deleting whitespace on empty lines when exiting Normal mode)

.bashrc

@@ -1,8 +1,14 @@
-bind "set completion-ignore-case on"
+if [[ $- = *i* ]]; then
-bind "set show-all-if-ambiguous on"
+  bind "set completion-ignore-case on"
+  bind "set show-all-if-ambiguous on"
 
-bind '"\e[A": history-search-backward'
+  bind '"\e[A": history-search-backward'
-bind '"\e[B": history-search-forward'
+  bind '"\e[B": history-search-forward'
+fi
+
+shopt -s histappend
+HISTCONTROL=ignoreboth
+PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
 
 alias gh='history|grep'
 alias less='less -R --mouse'
@@ -34,6 +40,7 @@ function ssh() {
     tmux rename-window -t"${TMUX_PANE}" "$*"
     command ssh "$@"
     tmux set-window-option automatic-rename "on"
+    vim +q # Fix terminal
   else
     command ssh "$@"
   fi

.ideavimrc

@@ -47,18 +47,22 @@ sethandler <C-Y> a:ide
 sethandler <C-\> a:ide
 
 sethandler <A-B> a:vim
+sethandler <A-E> a:vim
 sethandler <A-H> a:vim
 sethandler <A-J> a:vim
 sethandler <A-K> a:vim
 sethandler <A-L> a:vim
+sethandler <A-M> a:vim
 sethandler <A-N> a:vim
 sethandler <A-O> a:vim
 sethandler <A-P> a:vim
 sethandler <A-S-B> a:vim
+sethandler <A-S-E> a:vim
 sethandler <A-S-H> a:vim
 sethandler <A-S-J> a:vim
 sethandler <A-S-K> a:vim
 sethandler <A-S-L> a:vim
+sethandler <A-S-M> a:vim
 sethandler <A-S-O> a:vim
 sethandler <A-V> a:vim
 sethandler <A-X> a:vim
@@ -76,6 +80,12 @@ sethandler <C-Right> a:vim
 sethandler <S-Left> a:vim
 sethandler <S-Right> a:vim
 
+if &ide =~? 'rider'
+  " These shortcuts are broken in Rider for some reason...
+  sethandler <A-S-H> a:ide
+  sethandler <A-S-L> a:ide
+endif
+
 " Enable plugins (https://github.com/JetBrains/ideavim/wiki/IdeaVim-Plugins)
 Plug 'argtextobj.vim'
 Plug 'vim-exchange'
@@ -123,8 +133,8 @@ nnoremap L [w
 nnoremap H [b
 
 " Navigate to end of previous word
-noremap <A-b> ge
+noremap <A-e> ge
-noremap <A-S-b> gE
+noremap <A-S-e> gE
 
 " Navigate unmatched parentheses/braces
 noremap g( [(
@@ -157,8 +167,8 @@ xnoremap > >gv
 xnoremap = =gv
 
 " Extend selection
-xmap x <Action>(EditorSelectWord)
+map <A-m> <Action>(EditorSelectWord)
-xmap X <Action>(EditorUnSelectWord)
+map <A-S-m> <Action>(EditorUnSelectWord)
 
 " Turn capital letters into opposite actions
 " nnoremap U :redo<CR> " Handled by custom version of IdeaVIM
@@ -212,12 +222,15 @@ map <expr> <A-k> pumvisible() ? '<Action>(EditorUp)' : '<Action>(EditorCloneCare
 imap <expr> <A-j> pumvisible() ? '<Action>(EditorDown)' : '<Action>(EditorCloneCaretBelow)'
 imap <expr> <A-k> pumvisible() ? '<Action>(EditorUp)' : '<Action>(EditorCloneCaretAbove)'
 
+xmap gl <Action>(EditorAddCaretPerSelectedLine)
+
 " Manage editor tabs
 map <C-w>m <Action>(MoveEditorToOppositeTabGroup)
 map <C-w>s <Action>(MoveTabDown)
 map <C-w>u <Action>(Unsplit)
 map <C-w>U <Action>(UnsplitAll)
 map <C-w>v <Action>(MoveTabRight)
+map <C-w>p <Action>(PinActiveEditorTab)
 
 noremap <C-w>S <C-w>s
 noremap <C-w>V <C-w>v

.vimrc

@@ -1,5 +1,6 @@
 set autoindent
 set backspace=indent,eol,start
+set completeopt=menuone,preview
 set encoding=utf-8
 set guifont=Cascadia_Mono:h12:cANSI:qDRAFT
 set guioptions-=t " Remove menu tearoff
@@ -16,6 +17,7 @@ set modeline
 set modelines=2
 set mouse=a
 set noerrorbells
+set nojoinspaces
 set noshowcmd
 set noshowmode
 set nrformats-=octal
@@ -38,6 +40,10 @@ set wildmenu
 set winaltkeys=no
 set wrap
 
+if has("patch-9.1.0463")
+  set completeopt+=fuzzy
+endif
+
 " Windows paths
 set packpath=$HOME/.vim,$VIM/vimfiles,$VIMRUNTIME
 set runtimepath=$HOME/.vim,$VIM/vimfiles,$VIMRUNTIME
@@ -60,7 +66,9 @@ highlight SpecialKey ctermfg=8 guifg=#584f46
 
 " Windows GUI
 if has("win32") && has("gui_running")
-  au GUIEnter * simalt ~x " Maximize window
+  autocmd GUIEnter * simalt ~x " Maximize window
+  autocmd GUIEnter * set visualbell t_vb= " Disable bell sound
+  
   set listchars+=tab:▶\ 
   set renderoptions=type:directx " Fix unicode rendering
   set showbreak=→\ 
@@ -116,8 +124,8 @@ omap iH <Plug>CamelCaseMotion_ib
 xmap iH <Plug>CamelCaseMotion_ib
 
 " Navigate to end of previous word
-noremap <M-b> ge
+noremap <M-e> ge
-noremap <M-S-b> gE
+noremap <M-S-e> gE
 
 " Navigate soft-wrapped lines
 nnoremap <expr> j v:count ? 'j' : 'gj'
@@ -173,6 +181,16 @@ xnoremap P p
 " Clear search highlights
 nnoremap <Esc> :nohlsearch<Return><Esc>
 
+" Prevent deleting whitespace on empty lines when exiting Normal mode
+inoremap <silent> <Esc> <C-O>:stopinsert<CR>
+
+" Completion
+inoremap <C-Space> <C-n>
+inoremap <expr> j pumvisible() ? '<C-n>' : 'j'
+inoremap <expr> k pumvisible() ? '<C-p>' : 'k'
+inoremap <expr> <Esc> pumvisible() ? '<C-e>' : '<Esc>'
+inoremap <expr> <Enter> pumvisible() ? '<C-y>' : '<Enter>'
+
 " Use Ctrl for selection and clipboard
 nnoremap <C-a> ggVG
 xnoremap <C-a> ggoG
@@ -181,9 +199,13 @@ xnoremap <C-c> "+y
 xnoremap <C-x> "+x
 
 noremap <C-v> "+gP
-inoremap <C-v> <Esc>:set paste<CR>i<C-r>+<Esc>:set nopaste<CR>i
+inoremap <C-v> <C-o>:set paste<CR><C-r>+<C-o>:set nopaste<CR>
 cnoremap <C-v> <C-r>+
 
+nnoremap <C-s> :w<CR>
+xnoremap <C-s> :<C-U>w<CR>gv
+inoremap <C-s> <C-o>:w<CR>
+
 " Update search register when using f/t
 function FindChar(action, reverse, search_affix)
   let t:reverse_search = a:reverse