Skip to content

Commit f5b58a0

Browse files
committed
up
1 parent 829ab6a commit f5b58a0

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.viminfo
12
/.netrwhist
23
/.plugged/
34
*.swp

hotkey.vim

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ map <Esc>[1;3D :echo yes
1111
" YCM 函数 preview 窗口,及关闭
1212
nnoremap <silent> <Esc>h :YcmCompleter GetDoc<CR>
1313
nnoremap <silent> <Esc>j :pclose<CR>
14+
nnoremap <silent> <Esc>t :YcmCompleter GetType<CR>
15+
autocmd FileType javascript nnoremap <silent> <C-]> :YcmCompleter GoToDefinitionElseDeclaration<CR>
1416
1517
" 兼容 F3 按错
1618
nnoremap <silent> <Esc>3 :TagbarToggle<CR>

plug.vim

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Plug 'cocopon/svss.vim'
3535
Plug 'easymotion/vim-easymotion'
3636
Plug 'editorconfig/editorconfig-vim'
3737
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
38+
" Plug 'govim/govim'
3839
Plug 'flowtype/vim-flow'
3940
"Plug 'groenewege/vim-less'
4041
"Plug 'guns/xterm-color-table.vim'

style.vim

+10-7
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ let g:lightline.tabline = {
4949
" let g:lightline.separator = { 'left': '', 'right': '' }
5050
let g:lightline.subseparator = { 'left': '', 'right': '' }
5151

52+
let g:lightline.component = {
53+
\ 'fileformat': ' %{&ff}',
54+
\ 'fileencoding': '%{&fenc!=#""?&fenc:&enc} ',
55+
\ }
56+
5257
let g:lightline.active = {
5358
\ 'left': [
5459
\ [ 'mode', 'paste' ],
@@ -65,11 +70,6 @@ let g:lightline.active = {
6570
\ ],
6671
\ }
6772

68-
let g:lightline.component = {
69-
\ 'fileformat': ' %{&ff}',
70-
\ 'fileencoding': '%{&fenc!=#""?&fenc:&enc} ',
71-
\ }
72-
7373
function! FileSize()
7474
let bytes = getfsize(expand("%:p"))
7575
let bytes = substitute(bytes, '\d\zs\ze\%(\d\d\d\)\+$', ',', 'g')
@@ -167,8 +167,8 @@ set laststatus=2
167167
set numberwidth=6
168168
set sidescrolloff=10
169169
"
170-
hi StatusLine ctermfg=16 ctermbg=39 cterm=none
171-
hi StatusLineNC ctermfg=16 ctermbg=24 cterm=none
170+
" hi StatusLine ctermfg=16 ctermbg=39 cterm=none
171+
" hi StatusLineNC ctermfg=16 ctermbg=24 cterm=none
172172
hi VertSplit ctermfg=238 ctermbg=238 cterm=none
173173
"
174174
"hi MarkWord1 ctermbg=61 ctermfg=253
@@ -182,6 +182,9 @@ hi VertSplit ctermfg=238 ctermbg=238 cterm=none
182182
"hi qfFileName cterm=none ctermfg=228
183183
"hi qfLineNr cterm=none ctermfg=120
184184

185+
hi ALEErrorSign guifg=#9B154F guibg=#9B154F
186+
hi ALEWarningSign guifg=#4F000B guibg=#4F000B
187+
185188
"cnoremap ttab call ToggleIndentGuides()
186189
function! ToggleIndentGuides()
187190
if exists('b:indent_guides')

vimrc

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
set nocompatible
22
set backspace=indent,eol,start
33

4+
set viminfo+=n~/.vim/.viminfo
5+
46
" swap 文件保存地址
57
set directory=$HOME/.tmp/vim-swap//
68

@@ -17,15 +19,10 @@ syntax on
1719
so ~/.vim/fzf.vim
1820

1921
" YCM 自动完成时显示函数参数,两种方式,不显示或者自动关
20-
"
2122
set completeopt-=preview
2223
" let g:ycm_autoclose_preview_window_after_completion = 1
2324

24-
let g:keysound_enable = 1
25-
" 设置默认音效主题,可以选择:default, typewriter, mario, bubble, sword
26-
let g:keysound_theme = 'typewriter'
27-
" let g:keysound_py_version = 3
28-
let g:keysound_volume = 500
25+
let g:ycm_show_diagnostics_ui = 0
2926

3027
let g:XtermColorTableDefaultOpen = 'vsplit'
3128

@@ -38,9 +35,10 @@ let g:jsx_ext_required = 0
3835

3936
" let g:ale_completion_enabled = 1
4037
let g:ale_fix_on_save = 1
41-
42-
let g:ale_sign_error = ''
43-
let g:ale_sign_warning = '⚠️'
38+
let g:ale_set_highlights = 0
39+
let g:ale_sign_error = 'X'
40+
let g:ale_sign_warning = '!'
41+
let g:ale_sign_column_always = 1
4442

4543
let g:ale_fixers = {
4644
\ 'javascript': ['eslint'],

0 commit comments

Comments
 (0)