Merge branch 'master' of https://github.com/jdhao/nvim-config

5 files changed, 26 insertions, 24 deletions

diff --git a/docs/Nvim_setup.sh b/docs/Nvim_setup.sh
index f0062d7..475f33d 100755
--- a/docs/Nvim_setup.sh
+++ b/docs/Nvim_setup.sh
@@ -66,7 +66,7 @@ fi
 
 # Install some Python packages used by Neovim plugins.
 echo "Installing Python packages"
-PY_PACKAGES="pynvim jedi pylint flake8 yapf black"
+PY_PACKAGES="pynvim jedi pylint flake8 yapf black vim-vint"
 
 if [[ "$SYSTEM_PYTHON" = true ]]; then
     echo "Using system Python to install $(PY_PACKAGES)"
diff --git a/ginit.vim b/ginit.vim
index c3d3f4c..70c7872 100644
--- a/ginit.vim
+++ b/ginit.vim
@@ -3,17 +3,6 @@ inoremap <silent> <S-Insert>  <C-R>+
 cnoremap <S-Insert> <C-R>+
 nnoremap <silent> <C-6> <C-^>
 
-" Highlight groups for cursor color
-augroup cusor_color
-    autocmd!
-    autocmd ColorScheme * highlight Cursor cterm=bold gui=bold guibg=cyan guifg=black
-    autocmd ColorScheme * highlight Cursor2 guifg=red guibg=red
-augroup END
-
-" Set up cursor color and shape in various mode, ref:
-" https://github.com/neovim/neovim/wiki/FAQ#how-to-change-cursor-color-in-the-terminal
-set guicursor=n-v-c:block-Cursor/lCursor,i-ci-ve:ver25-Cursor2/lCursor2,r-cr:hor20,o:hor20
-
 " To check if neovim-qt is running, use `exists('g:GuiLoaded')`,
 " see https://github.com/equalsraf/neovim-qt/issues/219
 if exists('g:GuiLoaded')
@@ -33,12 +22,12 @@ if exists('g:fvim_loaded')
     FVimCursorSmoothBlink v:true
 
     " Background composition, can be 'none', 'blur' or 'acrylic'
-    FVimBackgroundComposition 'none'
-    FVimBackgroundOpacity 0.85
-    FVimBackgroundAltOpacity 0.85
+    FVimBackgroundComposition 'blur'
+    FVimBackgroundOpacity 0.9
+    FVimBackgroundAltOpacity 0.9
 
     " Title bar tweaks (themed with colorscheme)
-    FVimCustomTitleBar v:false
+    FVimCustomTitleBar v:true
 
     " Debug UI overlay
     FVimDrawFPS v:false
@@ -51,16 +40,15 @@ if exists('g:fvim_loaded')
     FVimFontHintLevel 'full'
     FVimFontSubpixel v:true
     FVimFontLigature v:true
-    FVimFontLcdRender v:false
     " can be 'default', '14.0', '-1.0' etc.
-    FVimFontLineHeight '+2.0'
+    FVimFontLineHeight 'default'
 
     " Try to snap the fonts to the pixels, reduces blur
     " in some situations (e.g. 100% DPI).
-    FVimFontAutoSnap v:false
+    FVimFontAutoSnap v:true
 
-    " Font weight tuning, possible valuaes are 100..900
-    FVimFontNormalWeight 400
+    " Font weight tuning, possible values are 100..900
+    FVimFontNormalWeight 100
     FVimFontBoldWeight 700
 
     FVimUIPopupMenu v:false
diff --git a/mappings.vim b/mappings.vim
index 00e8b19..c2ba402 100644
--- a/mappings.vim
+++ b/mappings.vim
@@ -47,9 +47,6 @@ nnoremap<silent> \x :windo lclose <bar> cclose<CR>
 " window, see https://stackoverflow.com/q/4465095/6064933
 nnoremap <silent> \d :bprevious <bar> bdelete #<CR>
 
-" Toggle search highlight, see https://stackoverflow.com/a/26504944/6064933
-nnoremap <silent><expr> <Leader>hl (&hls && v:hlsearch ? ':nohls' : ':set hls')."\n"
-
 " Insert a blank line below or above current line (do not move the cursor),
 " see https://stackoverflow.com/a/16136133/6064933
 nnoremap <expr> oo 'm`' . v:count1 . 'o<Esc>``'
diff --git a/options.vim b/options.vim
index f490c6f..f1ff3a3 100644
--- a/options.vim
+++ b/options.vim
@@ -168,4 +168,15 @@ if executable('rg')
     set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case
     set grepformat=%f:%l:%c:%m
 endif
+
+" Highlight groups for cursor color
+augroup cursor_color
+    autocmd!
+    autocmd ColorScheme * highlight Cursor cterm=bold gui=bold guibg=cyan guifg=black
+    autocmd ColorScheme * highlight Cursor2 guifg=red guibg=red
+augroup END
+
+" Set up cursor color and shape in various mode, ref:
+" https://github.com/neovim/neovim/wiki/FAQ#how-to-change-cursor-color-in-the-terminal
+set guicursor=n-v-c:block-Cursor/lCursor,i-ci-ve:ver25-Cursor2/lCursor2,r-cr:hor20,o:hor20
 "}
diff --git a/plugins.vim b/plugins.vim
index 91c93b7..93f135b 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -479,8 +479,14 @@ let g:Lf_PopupPosition = [0, &columns/4]
 " submodules are not searched by default.
 let g:Lf_UseVersionControlTool = 0
 
+" Disable default mapping
+let g:Lf_ShortcutF = ''
+let g:Lf_ShortcutB = ''
+
 " Search files in popup window
 nnoremap <silent> <leader>f :Leaderf file --popup<CR>
+" Search vim help files
+nnoremap <silent> <leader>h :Leaderf help --popup<CR>
 "}}
 
 "{{ URL related