From 345b7242678868f18d2b08d14799186353e68baa Mon Sep 17 00:00:00 2001 From: Hsieh Chin Fan Date: Tue, 25 Jun 2024 18:24:40 +0800 Subject: Update --- vim/init/basic.vim | 3 ++- vim/init/keymaps.vim | 12 ++++++------ vim/init/plugins.vim | 24 ++++++++++++------------ vim/init/style.vim | 8 ++++---- 4 files changed, 24 insertions(+), 23 deletions(-) (limited to 'vim/init') diff --git a/vim/init/basic.vim b/vim/init/basic.vim index a6d07dc..c2996d2 100644 --- a/vim/init/basic.vim +++ b/vim/init/basic.vim @@ -66,7 +66,8 @@ set autoindent " If current line has indent, automatically set indent for n set cindent set ttimeout set ttimeoutlen=50 -set updatetime=250 +set updatetime=500 +autocmd CursorHold * normal! m' imap l " Change IM to US when exit to Normal mode diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim index 211a0d1..14d813b 100644 --- a/vim/init/keymaps.vim +++ b/vim/init/keymaps.vim @@ -78,7 +78,7 @@ vnoremap , :terminal map pp :setlocal paste! " Switch CDW to root git directory -nnoremap cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h')):pwd +nnoremap cg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h')):pwd " Switch CWD to the directory of the open buffer map cd :cd %:p:h:pwd @@ -450,17 +450,17 @@ endfunc " 下面进行 grep,这样能方便的对相关项目进行搜索 "---------------------------------------------------------------------- if executable('rg') - noremap :AsyncRun! -cwd= rg -n --no-heading - \ --color never -g *.h -g *.c* -g *.py -g *.js -g *.vim + noremap :AsyncRun! -cwd= rg -n --no-heading + \ --color never -g *.h -g *.c* -g *.py -g *.js -g *.vim \ "" elseif has('win32') || has('win64') - noremap :AsyncRun! -cwd= findstr /n /s /C:"" + noremap :AsyncRun! -cwd= findstr /n /s /C:"" \ "\%CD\%\*.h" "\%CD\%\*.c*" "\%CD\%\*.py" "\%CD\%\*.js" \ "\%CD\%\*.vim" \ else - noremap :AsyncRun! -cwd= grep -n -s -R - \ --include='*.h' --include='*.c*' --include='*.py' + noremap :AsyncRun! -cwd= grep -n -s -R + \ --include='*.h' --include='*.c*' --include='*.py' \ --include='*.js' --include='*.vim' \ '' endif diff --git a/vim/init/plugins.vim b/vim/init/plugins.vim index 5b05c8e..d8b1307 100644 --- a/vim/init/plugins.vim +++ b/vim/init/plugins.vim @@ -145,7 +145,7 @@ let g:ale_set_quickfix = 1 " " ""---------------------------------------------------------------------- -"" 默认插件 +"" 默认插件 ""---------------------------------------------------------------------- " "" 全文快速移动,f{char} 即可触发 @@ -276,7 +276,7 @@ let g:ale_set_quickfix = 1 " " " 提供 gist 接口 " Plug 'lambdalisue/vim-gista', { 'on': 'Gista' } -" +" " " ALT_+/- 用于按分隔符扩大缩小 v 选区 " map (expand_region_expand) " map (expand_region_shrink) @@ -305,7 +305,7 @@ let g:ale_set_quickfix = 1 " let g:gutentags_cache_dir = expand('~/.cache/tags') " " " 默认禁用自动生成 -" let g:gutentags_modules = [] +" let g:gutentags_modules = [] " " " 如果有 ctags 可执行就允许动态生成 ctags 文件 " if executable('ctags') @@ -382,7 +382,7 @@ let g:ale_set_quickfix = 1 " " rust 语法增强 " Plug 'rust-lang/rust.vim', { 'for': 'rust' } " -" " vim org-mode +" " vim org-mode " Plug 'jceb/vim-orgmode', { 'for': 'org' } "endif " @@ -469,13 +469,13 @@ let g:ale_set_quickfix = 1 " " " 编辑不同文件类型需要的语法检查器 " let g:ale_linters = { -" \ 'c': ['gcc', 'cppcheck'], -" \ 'cpp': ['gcc', 'cppcheck'], -" \ 'python': ['flake8', 'pylint'], -" \ 'lua': ['luac'], +" \ 'c': ['gcc', 'cppcheck'], +" \ 'cpp': ['gcc', 'cppcheck'], +" \ 'python': ['flake8', 'pylint'], +" \ 'lua': ['luac'], " \ 'go': ['go build', 'gofmt'], " \ 'java': ['javac'], -" \ 'javascript': ['eslint'], +" \ 'javascript': ['eslint'], " \ } " " @@ -660,16 +660,16 @@ let g:ale_set_quickfix = 1 ""---------------------------------------------------------------------- "" Ycm 白名单(非名单内文件不启用 YCM),避免打开个 1MB 的 txt 分析半天 ""---------------------------------------------------------------------- -"let g:ycm_filetype_whitelist = { +"let g:ycm_filetype_whitelist = { " \ "c":1, -" \ "cpp":1, +" \ "cpp":1, " \ "objc":1, " \ "objcpp":1, " \ "python":1, " \ "java":1, " \ "javascript":1, " \ "coffee":1, -" \ "vim":1, +" \ "vim":1, " \ "go":1, " \ "cs":1, " \ "lua":1, diff --git a/vim/init/style.vim b/vim/init/style.vim index 8d056b0..a96601a 100644 --- a/vim/init/style.vim +++ b/vim/init/style.vim @@ -92,7 +92,7 @@ endif hi! SignColumn guibg=NONE ctermbg=NONE " 修改行号为浅灰色,默认主题的黄色行号很难看,换主题可以仿照修改 -highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE +highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE \ gui=NONE guifg=DarkGrey guibg=NONE " 修正补全目录的色彩:默认太难看 @@ -106,7 +106,7 @@ hi! PmenuSel guibg=gray guifg=brown ctermbg=brown ctermfg=gray if has('terminal') && exists(':terminal') == 2 if exists('##TerminalOpen') augroup VimUnixTerminalGroup - au! + au! au TerminalOpen * setlocal nonumber signcolumn=no augroup END endif @@ -174,7 +174,7 @@ function! Vim_NeatBuffer(bufnr, fullname) if l:name == '' return '[No Name]' else - if a:fullname + if a:fullname return fnamemodify(l:name, ':p') else let aname = fnamemodify(l:name, ':p') @@ -193,7 +193,7 @@ function! Vim_NeatBuffer(bufnr, fullname) if l:buftype == 'quickfix' return '[Quickfix]' elseif l:name != '' - if a:fullname + if a:fullname return '-'.fnamemodify(l:name, ':p') else return '-'.fnamemodify(l:name, ':t') -- cgit v1.2.3-70-g09d2