From 034c3500e3d2612d10964f3189732108354ca98a Mon Sep 17 00:00:00 2001
From: Jay <jay@lawsnote.com>
Date: Sat, 16 Jan 2021 11:06:20 +0800
Subject: [PATCH] [feat] update config

---
 .gitconfig | 25 +++++++++++++++----------
 .vimrc     | 30 ++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index e43e16c..aeaaebc 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,16 +2,21 @@
 [user]
 # Please adapt and uncomment the following lines:
   name = Jay
-	email = jay@rtj.tw
+  email = jay@lawsnote.com
+[merge]
+  tool = vimdiff
 [diff]
-	tool = vimdiff
+  tool = vimdiff
+  trustExitCode = true
 [difftool]
-	prompt = false
+  prompt = false
 [alias]
-	d = difftool
-	co = checkout
-	ci = commit
-	l = log --oneline --graph --all
-	ls = log --graph --pretty=format:\"%h <%an> %ar %s\" --all
-	st = status
-	br = branch
+  d = difftool
+  co = checkout
+  ci = commit
+  l = log --oneline --graph --all
+  ls = log --graph --pretty=format:\"%h <%an> %ar %s\" --all
+  st = status
+  br = branch
+[mergetool]
+	keepBackup = false
diff --git a/.vimrc b/.vimrc
index 206e686..0a1ae26 100644
--- a/.vimrc
+++ b/.vimrc
@@ -89,9 +89,24 @@ set hlsearch
 set nowrap
 " enable backspace
 set backspace=indent,eol,start
-
+set encoding=utf-8
+" set font
+" set guifont=Hack\ Nerd\ Font:h11
 
 set background=dark
+
+function! AdaptColorscheme()
+    highlight clear CursorLine
+    highlight Normal ctermbg=none
+    highlight LineNr ctermbg=none
+    highlight Folded ctermbg=none
+    highlight NonText ctermbg=none
+    highlight SpecialKey ctermbg=none
+    highlight VertSplit ctermbg=none
+    highlight SignColumn ctermbg=none
+endfunction
+autocmd ColorScheme * call AdaptColorscheme()
+
 " colorscheme turtles
 colorscheme afterglow
 
@@ -122,7 +137,7 @@ call defx#custom#option('_', {
   \ 'direction': 'topleft',
   \ 'buffer_name': '',
   \ 'toggle': 1,
-  \ 'resume': 1
+  \ 'resume': 1,
   \ })
 nmap <F3> :Defx<CR>
 nmap <leader>me :Defx<CR>
@@ -252,6 +267,8 @@ nmap <silent> <Leader>gv :vsplit \| :LspDefinition <CR>
 nmap <silent> <Leader>gf :LspDocumentFormat<CR>
 
 let g:lsp_diagnostics_enabled = 0         " disable diagnostics support
+let g:lsp_diagnostics_float_cursor = 0
+let g:lsp_diagnostics_echo_cursor = 1
 
 " require node module
 " npm i -g dockerfile-language-server-nodejs
@@ -277,6 +294,14 @@ if executable('gopls')
   autocmd FileType go setlocal omnifunc=lsp#complete
 endif
 
+if executable('deno')
+  au User lsp_setup call lsp#register_server({
+    \ 'name': 'deno',
+    \ 'cmd': {server_info->[&shell, &shellcmdflag, 'deno lsp']},
+    \ 'whitelist': ['typescript', 'typescript.tsx', 'typescriptreact'],
+    \ })
+endif
+
 " rustup update
 " rustup component add rls rust-analysis rust-src
 " if executable('rls')
@@ -372,6 +397,7 @@ let g:go_highlight_extra_types = 1
 
 " for rust-vim
 let g:rust_recommended_style = 0
+let g:rustfmt_autosave = 1
 let g:syntastic_rust_checkers = ['cargo']
 
 let g:airline#extensions#tabline#enabled = 1