Added autocompletion for HTML tags, tabs are now shown with a thin line

1 files changed, 24 insertions, 8 deletions

diff --git a/.vimrc b/.vimrc
index 1e3daf9..74262ea 100644
--- a/.vimrc
+++ b/.vimrc
@@ -30,6 +30,7 @@ Plug 'tpope/vim-eunuch'        " Easy UNIX shell commands
 Plug 'mg979/vim-visual-multi'  " Multiple line cursor (and other stuff)
 Plug 'zivyangll/git-blame.vim' " Show who last edited a line
 Plug 'kien/tabman.vim'         " Show open buffers
+Plug 'alvan/vim-closetag'      " Automatically add HTML closing tags
 
 """"""""""""""""""""""""""""""""
 
@@ -39,8 +40,15 @@ call plug#end()
 " Vim settings
 """""""""""""""""""""""""""""""
 
+set list
+" DO NOT remove the trailing space in the next line!
+set listchars=tab:│\ 
+
 autocmd InsertEnter,InsertLeave * set cul! " Highlight current line, when in insert mode
 set backspace=indent,eol,start " Better backspace functionality
+" Map Ctrl-Backspace to delete the previous word in insert mode.
+noremap! <C-BS> <C-w>
+noremap! <C-h> <C-w>
 set scrolloff=0                " Don't keep any screen lines above or below the cursor
 
 " Thin cursor in insert mode in Gnome-Terminal (version >=3.16 ; also works with Terminator)
@@ -71,10 +79,10 @@ imap <C-r> <ESC><C-r>i
 imap <C-s> <ESC>:w<CR>a
 
 " Use Ctrl + hjkl for navigation in insert mode
-inoremap <C-h> <Left>
-inoremap <C-j> <Down>
-inoremap <C-k> <Up>
-inoremap <C-l> <Right>
+" inoremap <C-h> <Left>
+" inoremap <C-j> <Down>
+" inoremap <C-k> <Up>
+" inoremap <C-l> <Right>
 
 " Cyrilic (Bulgarian yawerty layout) support
 ca в w
@@ -91,8 +99,8 @@ ca tt tab ter
 ca te tabe
 
 " Go between tabs with Ctrl+l (tab to the right) and Ctrl+h (tab to the left)
-nnoremap <C-l> :tabn<CR>
-nnoremap <C-h> :tabp<CR>
+" nnoremap <C-l> :tabn<CR>
+" nnoremap <C-h> :tabp<CR>
 
 set number     " Show line numbers to the left
 
@@ -156,10 +164,18 @@ set background=dark " Setting dark mode
 let g:gruvbox_contrast_dark='medium'
 
 """""""""""""""""""""""""""""""
+" DelimitMate
+"""""""""""""""""""""""""""""""
+
+let delimitMate_expand_cr = 1
+" Don't autocomplete diamond brackets in HTML (compatibility with closetag plugin)
+autocmd FileType html let b:delimitMate_matchpairs='(:),[:],{:}'
+
+"""""""""""""""""""""""""""""""
 " NERDTree settings
 """""""""""""""""""""""""""""""
 
-let NERDTreeCustomOpenArgs={'file':{'where': 't'}} " Open file in new tab, doesn't work only for double-click
+let NERDTreeCustomOpenArgs={'file':{'where':'t'}} " Open file in new tab, doesn't work only for double-click
 let NERDTreeShowHidden=1
 " Toggle NERDTree with Tab
 nmap <Tab> :NERDTreeToggle<CR>
@@ -280,7 +296,7 @@ let g:lightline = {
 
 function! LightlineFugitive()
 	if exists('*FugitiveHead')
-	    let branch = FugitiveHead()
+		let branch = FugitiveHead()
 		return branch !=# '' ? ' '.branch : ''
 	endif
 		return ''