- Nvim Theme changed to github-dark-dimmed - keeps it in sync with the kitty theme

- Reorged multiple nvim settings (using LazyVim as primary now)

common/.vim/autoload/plug.vim

@@ -1,4 +1,4 @@
-" vim-plug: Vim plugin manager
+" VIM-PLUG: vIM PLUGIN MANAGER
 " ============================
 "
 " Download plug.vim and put it in ~/.vim/autoload

common/.vim/configs.vim

@@ -20,8 +20,8 @@ set showcmd         " Write out commands on status line
 set laststatus=2    " Show a status line
 set wrap            " Wrap text
 set number          " Show line numbers
-set ruler
 set relativenumber  " Relative line numbers
+set ruler
 set shortmess+=I    " Disable the default Vim startup message.
 set noerrorbells novisualbell t_vb= " Disable audible bell because it's annoying.
 set mouse+=a        " Enable mouse support
@@ -31,10 +31,8 @@ set nrformats-=octal
 set formatoptions+=j
 set display+=lastline
 set display+=truncate
-set history=1000
 set tabpagemax=50
 set viminfo^=!
-set sessionoptions-=options
 set viewoptions-=options
 set nolangremap
 set list
@@ -43,9 +41,11 @@ set scrolloff=5
 set isfname+={,},@-@
 set updatetime=50
 set noswapfile
+set history=1000
 set undofile
 set undolevels=10000
 set undoreload=100000
+set sessionoptions-=options
 set timeoutlen=500
 
 " Vim, by default, won't let you jump to a different file without saving the
@@ -89,7 +89,3 @@ if !has('gui_running')
   hi LineNr ctermbg=NONE guibg=NONE
   set termguicolors
 endif
-
-" NERDTree Plugin configurations
-let g:NERDTreeShowHidden = 1
-let g:NERDTreeWinSize = 25

common/.vim/key_maps.vim

@@ -38,8 +38,8 @@ vnoremap K :m '<-2<CR>gv=gv
 
 " Better indenting
 vnoremap <  <gv
-vnoremap >  >gv
 xnoremap <  <gv
+vnoremap >  >gv
 xnoremap >  >gv
 
 " Keeps the cursor at the same place when doing J
@@ -76,10 +76,6 @@ nnoremap <expr> N  'nN'[v:searchforward]
 xnoremap <expr> N  'nN'[v:searchforward]
 onoremap <expr> N  'nN'[v:searchforward]
 
-" Clear search highlights
-nnoremap <esc> :nohlsearch<CR><esc>
-inoremap <esc> :nohlsearch<CR><esc>
-
 " <ctrl-q> to save everything and quit Neovim
 nnoremap <C-q> :wqa<CR>
 vnoremap <C-q> :wqa<CR>
@@ -87,12 +83,12 @@ nnoremap <C-s> :wa<CR>
 vnoremap <C-s> :wa<CR>
 
 " Move cursor in insert mode
-inoremap <C-b> <ESC>^i
-inoremap <C-e> <END>
-inoremap <C-h> <Left>
-inoremap <C-l> <Right>
-inoremap <C-j> <Down>
-inoremap <C-k> <Up>
+inoremap <M-b> <ESC>^i
+inoremap <M-e> <END>
+inoremap <M-h> <Left>
+inoremap <M-l> <Right>
+inoremap <M-j> <Down>
+inoremap <M-k> <Up>
 
 " Copy entire content of the current buffer
 nnoremap <C-c> :%y+<CR>
@@ -103,4 +99,10 @@ nnoremap <leader>/ :nohlsearch<CR>:diffupdate<CR>:normal! <C-L><CR>
 " Changes the pwd to the opened file's directory
 nnoremap <leader>cd :lcd %:h<CR>
 
-map <leader>j <Plug>(easymotion-s)
+
+" Map easymotion Plugin to <Leader>j
+nnoremap <leader>j <Plug>(easymotion-s)
+
+" Show the undo tree
+nnoremap <leader>u :UndotreeToggle<CR>
+

common/.vim/plugins.vim

@@ -13,6 +13,7 @@ call plug#begin('~/.vim/plugged')
     Plug 'preservim/nerdtree' "Nerd Tree
     Plug 'tpope/vim-obsession' "Obsessions -> saves sessions
     Plug 'christoomey/vim-tmux-navigator' "Syncs with Tmux pane navigation keymaps
+    Plug 'mbbill/undotree' "Show the undo tree
     "------------Style Plugins------------"
     " Status Styles
     Plug 'itchyny/lightline.vim'

common/.vim/vimrc

@@ -33,9 +33,10 @@ autocmd! bufwritepost $VIMRC source %
 " Save inside vim config directory
 set undodir=$VIMDIR/undo//
 
-" Map easymotion Plugin to <Leader>j
-map <leader>j <Plug>(easymotion-s)
-
 " Map nerdtree to <Leader>e
 " Changes the pwd and opens the VCS root
 nnoremap <leader>e :tcd %:h<CR> :NERDTreeToggleVCS<CR>
+
+" NERDTree Plugin configurations
+let g:NERDTreeShowHidden = 1
+let g:NERDTreeWinSize = 25