Merge pull request #44 from xiantang/dev_dev

Dev dev

.vimrc

@@ -101,13 +101,4 @@ let g:currentmode={
        \ 'c'  : 'Command ',
        \}
 
-function! GitBranch()
-  return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
-endfunction
-
-function! StatuslineGit()
-  let l:branchname = GitBranch()
-  return strlen(l:branchname) > 0?'  '.l:branchname.' ':''
-endfunction
-set statusline=%{toupper(g:currentmode[mode()])}%f%{StatuslineGit()}\ %h%m%r\ %=%-14.(%l,%c%V%)\ %y\ %P
-
+set statusline=%{toupper(g:currentmode[mode()])}%f\ %h%m%r\ %=%-14.(%l,%c%V%)\ %y\ %P

lua/plugins/ui.lua

@@ -25,6 +25,14 @@ return {
 		event = "VeryLazy",
 		config = function()
 			require("scrollbar").setup({
+				handlers = {
+					cursor = true,
+					diagnostic = false,
+					gitsigns = false, -- Requires gitsigns
+					handle = true,
+					search = false, -- Requires hlslens
+					ale = false, -- Requires ALE
+				},
 				set_highlights = true,
 			})
 		end,