diff options
Diffstat (limited to 'vim/init')
-rw-r--r-- | vim/init/basic.vim | 3 | ||||
-rw-r--r-- | vim/init/keymaps.vim | 12 | ||||
-rw-r--r-- | vim/init/plugins.vim | 24 | ||||
-rw-r--r-- | vim/init/style.vim | 8 |
4 files changed, 24 insertions, 23 deletions
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 | |||
66 | set cindent | 66 | set cindent |
67 | set ttimeout | 67 | set ttimeout |
68 | set ttimeoutlen=50 | 68 | set ttimeoutlen=50 |
69 | set updatetime=250 | 69 | set updatetime=500 |
70 | autocmd CursorHold * normal! m' | ||
70 | 71 | ||
71 | imap <C-c> <Esc>l | 72 | imap <C-c> <Esc>l |
72 | " Change IM to US when exit to Normal mode | 73 | " 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 <leader>, :terminal<CR> | |||
78 | map <leader>pp :setlocal paste!<cr> | 78 | map <leader>pp :setlocal paste!<cr> |
79 | 79 | ||
80 | " Switch CDW to root git directory | 80 | " Switch CDW to root git directory |
81 | nnoremap <Leader>cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR> | 81 | nnoremap <Leader>cg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR> |
82 | " Switch CWD to the directory of the open buffer | 82 | " Switch CWD to the directory of the open buffer |
83 | map <leader>cd :cd %:p:h<cr>:pwd<cr> | 83 | map <leader>cd :cd %:p:h<cr>:pwd<cr> |
84 | 84 | ||
@@ -450,17 +450,17 @@ endfunc | |||
450 | " 下面进行 grep,这样能方便的对相关项目进行搜索 | 450 | " 下面进行 grep,这样能方便的对相关项目进行搜索 |
451 | "---------------------------------------------------------------------- | 451 | "---------------------------------------------------------------------- |
452 | if executable('rg') | 452 | if executable('rg') |
453 | noremap <silent><F2> :AsyncRun! -cwd=<root> rg -n --no-heading | 453 | noremap <silent><F2> :AsyncRun! -cwd=<root> rg -n --no-heading |
454 | \ --color never -g *.h -g *.c* -g *.py -g *.js -g *.vim | 454 | \ --color never -g *.h -g *.c* -g *.py -g *.js -g *.vim |
455 | \ <C-R><C-W> "<root>" <cr> | 455 | \ <C-R><C-W> "<root>" <cr> |
456 | elseif has('win32') || has('win64') | 456 | elseif has('win32') || has('win64') |
457 | noremap <silent><F2> :AsyncRun! -cwd=<root> findstr /n /s /C:"<C-R><C-W>" | 457 | noremap <silent><F2> :AsyncRun! -cwd=<root> findstr /n /s /C:"<C-R><C-W>" |
458 | \ "\%CD\%\*.h" "\%CD\%\*.c*" "\%CD\%\*.py" "\%CD\%\*.js" | 458 | \ "\%CD\%\*.h" "\%CD\%\*.c*" "\%CD\%\*.py" "\%CD\%\*.js" |
459 | \ "\%CD\%\*.vim" | 459 | \ "\%CD\%\*.vim" |
460 | \ <cr> | 460 | \ <cr> |
461 | else | 461 | else |
462 | noremap <silent><F2> :AsyncRun! -cwd=<root> grep -n -s -R <C-R><C-W> | 462 | noremap <silent><F2> :AsyncRun! -cwd=<root> grep -n -s -R <C-R><C-W> |
463 | \ --include='*.h' --include='*.c*' --include='*.py' | 463 | \ --include='*.h' --include='*.c*' --include='*.py' |
464 | \ --include='*.js' --include='*.vim' | 464 | \ --include='*.js' --include='*.vim' |
465 | \ '<root>' <cr> | 465 | \ '<root>' <cr> |
466 | endif | 466 | 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 | |||
145 | " | 145 | " |
146 | " | 146 | " |
147 | ""---------------------------------------------------------------------- | 147 | ""---------------------------------------------------------------------- |
148 | "" 默认插件 | 148 | "" 默认插件 |
149 | ""---------------------------------------------------------------------- | 149 | ""---------------------------------------------------------------------- |
150 | " | 150 | " |
151 | "" 全文快速移动,<leader><leader>f{char} 即可触发 | 151 | "" 全文快速移动,<leader><leader>f{char} 即可触发 |
@@ -276,7 +276,7 @@ let g:ale_set_quickfix = 1 | |||
276 | " | 276 | " |
277 | " " 提供 gist 接口 | 277 | " " 提供 gist 接口 |
278 | " Plug 'lambdalisue/vim-gista', { 'on': 'Gista' } | 278 | " Plug 'lambdalisue/vim-gista', { 'on': 'Gista' } |
279 | " | 279 | " |
280 | " " ALT_+/- 用于按分隔符扩大缩小 v 选区 | 280 | " " ALT_+/- 用于按分隔符扩大缩小 v 选区 |
281 | " map <m-=> <Plug>(expand_region_expand) | 281 | " map <m-=> <Plug>(expand_region_expand) |
282 | " map <m--> <Plug>(expand_region_shrink) | 282 | " map <m--> <Plug>(expand_region_shrink) |
@@ -305,7 +305,7 @@ let g:ale_set_quickfix = 1 | |||
305 | " let g:gutentags_cache_dir = expand('~/.cache/tags') | 305 | " let g:gutentags_cache_dir = expand('~/.cache/tags') |
306 | " | 306 | " |
307 | " " 默认禁用自动生成 | 307 | " " 默认禁用自动生成 |
308 | " let g:gutentags_modules = [] | 308 | " let g:gutentags_modules = [] |
309 | " | 309 | " |
310 | " " 如果有 ctags 可执行就允许动态生成 ctags 文件 | 310 | " " 如果有 ctags 可执行就允许动态生成 ctags 文件 |
311 | " if executable('ctags') | 311 | " if executable('ctags') |
@@ -382,7 +382,7 @@ let g:ale_set_quickfix = 1 | |||
382 | " " rust 语法增强 | 382 | " " rust 语法增强 |
383 | " Plug 'rust-lang/rust.vim', { 'for': 'rust' } | 383 | " Plug 'rust-lang/rust.vim', { 'for': 'rust' } |
384 | " | 384 | " |
385 | " " vim org-mode | 385 | " " vim org-mode |
386 | " Plug 'jceb/vim-orgmode', { 'for': 'org' } | 386 | " Plug 'jceb/vim-orgmode', { 'for': 'org' } |
387 | "endif | 387 | "endif |
388 | " | 388 | " |
@@ -469,13 +469,13 @@ let g:ale_set_quickfix = 1 | |||
469 | " | 469 | " |
470 | " " 编辑不同文件类型需要的语法检查器 | 470 | " " 编辑不同文件类型需要的语法检查器 |
471 | " let g:ale_linters = { | 471 | " let g:ale_linters = { |
472 | " \ 'c': ['gcc', 'cppcheck'], | 472 | " \ 'c': ['gcc', 'cppcheck'], |
473 | " \ 'cpp': ['gcc', 'cppcheck'], | 473 | " \ 'cpp': ['gcc', 'cppcheck'], |
474 | " \ 'python': ['flake8', 'pylint'], | 474 | " \ 'python': ['flake8', 'pylint'], |
475 | " \ 'lua': ['luac'], | 475 | " \ 'lua': ['luac'], |
476 | " \ 'go': ['go build', 'gofmt'], | 476 | " \ 'go': ['go build', 'gofmt'], |
477 | " \ 'java': ['javac'], | 477 | " \ 'java': ['javac'], |
478 | " \ 'javascript': ['eslint'], | 478 | " \ 'javascript': ['eslint'], |
479 | " \ } | 479 | " \ } |
480 | " | 480 | " |
481 | " | 481 | " |
@@ -660,16 +660,16 @@ let g:ale_set_quickfix = 1 | |||
660 | ""---------------------------------------------------------------------- | 660 | ""---------------------------------------------------------------------- |
661 | "" Ycm 白名单(非名单内文件不启用 YCM),避免打开个 1MB 的 txt 分析半天 | 661 | "" Ycm 白名单(非名单内文件不启用 YCM),避免打开个 1MB 的 txt 分析半天 |
662 | ""---------------------------------------------------------------------- | 662 | ""---------------------------------------------------------------------- |
663 | "let g:ycm_filetype_whitelist = { | 663 | "let g:ycm_filetype_whitelist = { |
664 | " \ "c":1, | 664 | " \ "c":1, |
665 | " \ "cpp":1, | 665 | " \ "cpp":1, |
666 | " \ "objc":1, | 666 | " \ "objc":1, |
667 | " \ "objcpp":1, | 667 | " \ "objcpp":1, |
668 | " \ "python":1, | 668 | " \ "python":1, |
669 | " \ "java":1, | 669 | " \ "java":1, |
670 | " \ "javascript":1, | 670 | " \ "javascript":1, |
671 | " \ "coffee":1, | 671 | " \ "coffee":1, |
672 | " \ "vim":1, | 672 | " \ "vim":1, |
673 | " \ "go":1, | 673 | " \ "go":1, |
674 | " \ "cs":1, | 674 | " \ "cs":1, |
675 | " \ "lua":1, | 675 | " \ "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 | |||
92 | hi! SignColumn guibg=NONE ctermbg=NONE | 92 | hi! SignColumn guibg=NONE ctermbg=NONE |
93 | 93 | ||
94 | " 修改行号为浅灰色,默认主题的黄色行号很难看,换主题可以仿照修改 | 94 | " 修改行号为浅灰色,默认主题的黄色行号很难看,换主题可以仿照修改 |
95 | highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE | 95 | highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE |
96 | \ gui=NONE guifg=DarkGrey guibg=NONE | 96 | \ gui=NONE guifg=DarkGrey guibg=NONE |
97 | 97 | ||
98 | " 修正补全目录的色彩:默认太难看 | 98 | " 修正补全目录的色彩:默认太难看 |
@@ -106,7 +106,7 @@ hi! PmenuSel guibg=gray guifg=brown ctermbg=brown ctermfg=gray | |||
106 | if has('terminal') && exists(':terminal') == 2 | 106 | if has('terminal') && exists(':terminal') == 2 |
107 | if exists('##TerminalOpen') | 107 | if exists('##TerminalOpen') |
108 | augroup VimUnixTerminalGroup | 108 | augroup VimUnixTerminalGroup |
109 | au! | 109 | au! |
110 | au TerminalOpen * setlocal nonumber signcolumn=no | 110 | au TerminalOpen * setlocal nonumber signcolumn=no |
111 | augroup END | 111 | augroup END |
112 | endif | 112 | endif |
@@ -174,7 +174,7 @@ function! Vim_NeatBuffer(bufnr, fullname) | |||
174 | if l:name == '' | 174 | if l:name == '' |
175 | return '[No Name]' | 175 | return '[No Name]' |
176 | else | 176 | else |
177 | if a:fullname | 177 | if a:fullname |
178 | return fnamemodify(l:name, ':p') | 178 | return fnamemodify(l:name, ':p') |
179 | else | 179 | else |
180 | let aname = fnamemodify(l:name, ':p') | 180 | let aname = fnamemodify(l:name, ':p') |
@@ -193,7 +193,7 @@ function! Vim_NeatBuffer(bufnr, fullname) | |||
193 | if l:buftype == 'quickfix' | 193 | if l:buftype == 'quickfix' |
194 | return '[Quickfix]' | 194 | return '[Quickfix]' |
195 | elseif l:name != '' | 195 | elseif l:name != '' |
196 | if a:fullname | 196 | if a:fullname |
197 | return '-'.fnamemodify(l:name, ':p') | 197 | return '-'.fnamemodify(l:name, ':p') |
198 | else | 198 | else |
199 | return '-'.fnamemodify(l:name, ':t') | 199 | return '-'.fnamemodify(l:name, ':t') |