Merge branch 'dev' of https://github.com/Donaldttt/dotfiles into dev

.vimrc

@@ -7,7 +7,7 @@
         let g:vim_version = matchstr(execute('version'), 'NVIM v\zs[^\n]*')
     else
         let g:vim_type = 'vim'
-        let g:vim_version = matchstr(execute('version'), 'NVIM v\zs[^\n]*')
+        let g:vim_version = matchstr(execute('version'), 'Vi IMproved \zs[^\n]*')
     endif
     let g:vim_version = str2float(g:vim_version)
     let g:dotfile_path = '~/.dotfiles/'
@@ -78,9 +78,15 @@
 
 " Vim UI {
 "
-    set tabpagemax=15               " Only show 15 tabs
-    set showmode                    " Display the current mode
-    set cursorline                  " Highlight current line
+    " set tabpagemax=15               " Only show 15 tabs
+    " set showmode                    " Display the current mode
+    set cursorline                    " Highlight current line
+
+    " get rid of current line highlight, instead just highlight the number column
+    augroup CLClear
+        autocmd! ColorScheme * hi clear CursorLine
+    augroup END
+
     set cmdheight=1                 " get rid of the extra useless line at the bottom(not working, probably a plugin is changing the value)
 
     "highlight clear SignColumn      " SignColumn should match background
@@ -91,6 +97,7 @@
         set ruler                   " Show the ruler
         set rulerformat=%30(%=\:b%n%y%m%r%w\ %l,%c%V\ %P%) " A ruler on steroids
         set showcmd                 " Show partial commands in status line and
+
     endif
 
     set backspace=indent,eol,start  " Backspace for dummies
@@ -109,6 +116,7 @@
     set scrolloff=5                 " Minimum lines to keep above and below cursor
     set sidescrolloff=5            " Minimum lines to keep at the left or right of the cursor
 
+
 " }
 
 " Formatting {