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,12 +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
@@ -65,6 +75,17 @@ sethandler <C-S-W> a:vim
 sethandler <C-U> a:vim
 sethandler <S-BS> a:vim
 
+sethandler <C-Left> a:vim
+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'
@@ -91,24 +112,35 @@ map í 9
 map é 0
 
 " Move some commands closer on Czech keyboard layout
-nnoremap ú @@
-noremap § ;
 map ů %
-map gů g%
+nnoremap ú @@
+noremap , +
 
-" Camel humps
+noremap § `
+noremap §§ ``
+nnoremap m§ m
+
+sunmap ů
+sunmap §
+
+" Enter visual block mode
+map <A-v> <C-v>
+
+" Navigate camel humps
 noremap L [w
 noremap H [b
 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
 
-" Increment/decrement numbers
+" Navigate unmatched parentheses/braces
-noremap <Bar>+ <C-a>
+noremap g( [(
-noremap <Bar>- <C-x>
+noremap g) ])
+noremap g{ [{
+noremap g} ]}
 
 " Edit from cursor to start/end of parenthesized block
 nnoremap c) c])
@@ -117,23 +149,27 @@ nnoremap c( c[((
 nnoremap d( c[((<Esc>l
 
 " Create lines
-nnoremap <A-o> o<Esc>$
+nnoremap go o<Esc>$
-nnoremap <A-S-o> O<Esc>$
+nnoremap gO O<Esc>$
+nnoremap g<CR> i<CR><Esc>l
 
-" Delete lines
+" Edit current line
 nnoremap C cc
 xnoremap C cc
 nnoremap D dd
 xnoremap D dd
-
+nnoremap < <<
-" Enter visual block mode
+nnoremap > >>
-map <A-v> <C-v>
 
 " Indent keeping selection
 xnoremap < <gv
 xnoremap > >gv
 xnoremap = =gv
 
+" Extend selection
+map <A-m> <Action>(EditorSelectWord)
+map <A-S-m> <Action>(EditorUnSelectWord)
+
 " Turn capital letters into opposite actions
 " nnoremap U :redo<CR> " Handled by custom version of IdeaVIM
 
@@ -147,6 +183,11 @@ xnoremap P p
 " Clear search highlights
 nnoremap <Esc> :nohlsearch<Return><Esc>
 
+" Code completion
+if &ide !~? 'rider'
+  imap <expr> ! pumvisible() ? '<Action>(EditorChooseLookupItem)<Esc>mzF.bi!<Esc>`zla' : '!'
+endif
+
 " Show parameter info
 nmap <A-p> <Action>(ParameterInfo)
 imap <A-p> <Action>(ParameterInfo)
@@ -167,12 +208,29 @@ map ] <Action>(MethodDown)
 map { <Plug>(ParagraphPrevMotion)$
 map } <Plug>(ParagraphNextMotion)$
 
+" Move statement/element
+map <A-S-h> <Action>(MoveElementLeft)
+map <A-S-l> <Action>(MoveElementRight)
+
+map <A-S-j> <Action>(MoveStatementDown)
+map <A-S-k> <Action>(MoveStatementUp)
+
+" Multiple carets
+map <expr> <A-j> pumvisible() ? '<Action>(EditorDown)' : '<Action>(EditorCloneCaretBelow)'
+map <expr> <A-k> pumvisible() ? '<Action>(EditorUp)' : '<Action>(EditorCloneCaretAbove)'
+
+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
@@ -203,8 +261,6 @@ map ge <Action>(VcsShowNextChangeMarker)
 map gE <Action>(VcsShowPrevChangeMarker)
 map gf <Action>(VimJumpToSource)<Action>(HideActiveWindow)
 map gi <Action>(GotoImplementation)
-map gj <Action>(EditorCloneCaretBelow)
-map gk <Action>(EditorCloneCaretAbove)
 map gr <Action>(RecentLocations)
 map gR <Action>(RecentChangedFiles)
 map gs <Action>(GotoSuperMethod)
@@ -213,8 +269,6 @@ map gt gg<Action>(KM.GotoNextTypeInFile)
 map gT <Action>(KM.GotoNextTypeInFile)
 map gu <Action>(ShowUsages)
 map gU <Action>(FindUsages)
-map g( <Action>(KM.GotoPreviousErrorInOtherMode)
-map g) <Action>(KM.GotoNextErrorInOtherMode)
 
 " Repurpose 'z' for view actions and debugger
 map za <Action>(Annotate)

.vimrc

@@ -1,5 +1,9 @@
 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
 set history=1024
 set hlsearch
 set ignorecase
@@ -7,19 +11,23 @@ set incsearch
 set infercase
 set laststatus=2
 set linebreak
-set listchars=space:·,tab:>·,trail:~,extends:>,precedes:<
+set list
+set listchars=lead:·,trail:·,tab:→\ ,extends:>,precedes:<
 set modeline
 set modelines=2
 set mouse=a
 set noerrorbells
+set nojoinspaces
 set noshowcmd
 set noshowmode
-set number
 set nrformats-=octal
+set number
 set relativenumber
 set scrolloff=999
 set shiftwidth=0
-set showbreak=↪
+set shortmess-=S " Show search count
+set shortmess-=l " Show full description for lines and bytes
+set showbreak=↪\ 
 set showmatch
 set sidescrolloff=999
 set smartcase
@@ -27,22 +35,44 @@ set tabstop=4
 set ttimeout
 set ttimeoutlen=50
 set ttymouse=xterm2
+set virtualedit=onemore
 set wildmenu
+set winaltkeys=no
 set wrap
 
-" Show full description for lines and bytes
+if has("patch-9.1.0463")
-set shortmess-=l
+  set completeopt+=fuzzy
+endif
 
-" Show search count
+" Windows paths
-set shortmess-=S
+set packpath=$HOME/.vim,$VIM/vimfiles,$VIMRUNTIME
+set runtimepath=$HOME/.vim,$VIM/vimfiles,$VIMRUNTIME
 
 " Color scheme
 syntax enable
-colorscheme custom
+
-highlight LineNr    ctermfg=244
+if has("gui_running")
-highlight IncSearch ctermfg=251 ctermbg=238
+  colorscheme retrobox
-highlight Search    ctermfg=251 ctermbg=238
+  highlight NonText ctermfg=14 guifg=#7c6f64
-highlight Visual    ctermfg=240 ctermbg=250
+else
+  colorscheme custom
+  highlight LineNr    ctermfg=244
+  highlight IncSearch ctermfg=251 ctermbg=238
+  highlight Search    ctermfg=251 ctermbg=238
+  highlight Visual    ctermfg=240 ctermbg=250
+endif
+
+highlight SpecialKey ctermfg=8 guifg=#584f46
+
+" Windows GUI
+if has("win32") && has("gui_running")
+  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=→\ 
+endif
 
 " Fix Alt mappings (https://github.com/vim/vim/issues/2588#issuecomment-697959290)
 for ord in range(65, 90) + range(97, 122)
@@ -68,13 +98,21 @@ map í 9
 map é 0
 
 " Move some commands closer on Czech keyboard layout
-nnoremap ú @@
-noremap § ;
 map ů %
-map gů g%
+nnoremap ú @@
-sunmap ů
+noremap , +
 
-" Camel humps (https://github.com/vim-scripts/camelcasemotion)
+noremap § `
+noremap §§ ``
+nnoremap m§ m
+
+sunmap ů
+sunmap §
+
+" Enter visual block mode
+noremap <M-v> <C-v>
+
+" Navigate camel humps (https://github.com/vim-scripts/camelcasemotion)
 map L <Plug>CamelCaseMotion_w
 map H <Plug>CamelCaseMotion_b
 sunmap L
@@ -86,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'
@@ -95,6 +133,17 @@ xnoremap <expr> j v:count ? 'j' : 'gj'
 nnoremap <expr> k v:count ? 'k' : 'gk'
 xnoremap <expr> k v:count ? 'k' : 'gk'
 
+nnoremap gj j
+xnoremap gj j
+nnoremap gk k
+xnoremap gk k
+
+" Navigate unmatched parentheses/braces
+noremap g( [(
+noremap g) ])
+noremap g{ [{
+noremap g} ]}
+
 " Edit from cursor to start/end of parenthesized block
 nnoremap c) c])
 nnoremap d) d])
@@ -102,17 +151,17 @@ nnoremap c( c[((
 nnoremap d( c[((<Esc>l
 
 " Create lines
-nnoremap <M-o> o<Esc>$
+nnoremap go o<Esc>$
-nnoremap <M-S-o> O<Esc>$ " TODO does not leave insert mode properly?
+nnoremap gO O<Esc>$
+nnoremap g<CR> i<CR><Esc>l
 
-" Delete lines
+" Edit current line
 nnoremap C cc
 xnoremap C cc
 nnoremap D dd
 xnoremap D dd
-
+nnoremap < <<
-" Enter visual block mode
+nnoremap > >>
-map <M-v> <C-v>
 
 " Indent keeping selection
 xnoremap < <gv
@@ -132,6 +181,31 @@ 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
+
+xnoremap <C-c> "+y
+xnoremap <C-x> "+x
+
+noremap <C-v> "+gP
+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