Update
This commit is contained in:
parent
5cfa9f9bea
commit
1ecbdb282e
2
.gvimrc
2
.gvimrc
|
@ -6,3 +6,5 @@ if has("gui_macvim")
|
||||||
nnoremap <D-o> :Files<CR>
|
nnoremap <D-o> :Files<CR>
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
colorscheme one
|
||||||
|
|
||||||
|
|
226
.vimrc
226
.vimrc
|
@ -1,36 +1,49 @@
|
||||||
set nocompatible
|
set nocompatible
|
||||||
filetype off
|
filetype off
|
||||||
|
|
||||||
set rtp+=~/.vim/bundle/Vundle.vim
|
" set rtp+=~/.vim/bundle/Vundle.vim
|
||||||
call vundle#begin()
|
" call vundle#begin()
|
||||||
|
call plug#begin('~/.vim/plugged')
|
||||||
|
|
||||||
Plugin 'VundleVim/Vundle.vim'
|
Plug 'VundleVim/Vundle.vim'
|
||||||
Plugin 'tpope/vim-sensible'
|
Plug 'tpope/vim-sensible'
|
||||||
Plugin 'scrooloose/nerdtree'
|
Plug 'scrooloose/nerdtree'
|
||||||
Plugin 'danilo-augusto/vim-afterglow'
|
Plug 'danilo-augusto/vim-afterglow'
|
||||||
Plugin 'junegunn/fzf.vim'
|
Plug 'rakr/vim-one'
|
||||||
Plugin 'ycm-core/YouCompleteMe'
|
Plug '/usr/local/opt/fzf'
|
||||||
Plugin 'elixir-editors/vim-elixir'
|
Plug 'junegunn/fzf.vim'
|
||||||
Plugin 'slashmili/alchemist.vim'
|
Plug 'elixir-editors/vim-elixir'
|
||||||
Plugin 'mattn/emmet-vim'
|
Plug 'mattn/emmet-vim'
|
||||||
Plugin 'scrooloose/nerdcommenter'
|
Plug 'tpope/vim-commentary'
|
||||||
Plugin 'tpope/vim-fugitive'
|
Plug 'tpope/vim-fugitive'
|
||||||
Plugin 'jeffkreeftmeijer/vim-numbertoggle'
|
Plug 'jeffkreeftmeijer/vim-numbertoggle'
|
||||||
Plugin 'mhinz/vim-mix-format'
|
Plug 'mhinz/vim-mix-format'
|
||||||
|
Plug 'tpope/vim-surround'
|
||||||
|
"Plug 'terryma/vim-multiple-cursors'
|
||||||
|
Plug 'kana/vim-textobj-user'
|
||||||
|
Plug 'kana/vim-textobj-indent'
|
||||||
|
Plug 'kana/vim-textobj-line'
|
||||||
|
Plug 'keith/swift.vim'
|
||||||
|
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||||
|
Plug 'posva/vim-vue'
|
||||||
|
Plug 'airblade/vim-gitgutter'
|
||||||
|
" Plug 'vim-airline/vim-airline'
|
||||||
|
|
||||||
call vundle#end()
|
" call vundle#end()
|
||||||
|
call plug#end()
|
||||||
set rtp+=/usr/local/opt/fzf
|
|
||||||
|
|
||||||
map <C-n> :NERDTreeToggle<CR>
|
map <C-n> :NERDTreeToggle<CR>
|
||||||
nnoremap K :YcmCompleter GoTo<CR>
|
nnoremap K :YcmCompleter GoTo<CR>
|
||||||
nnoremap <D-r> :YcmCompleter RefactorRename
|
nnoremap <D-r> :YcmCompleter RefactorRename
|
||||||
|
|
||||||
nnoremap <D-o> :Files<CR>
|
nnoremap <D-o> :Files<CR>
|
||||||
|
nnoremap <D-O> :Files<CR>
|
||||||
|
|
||||||
filetype plugin indent on
|
filetype plugin indent on
|
||||||
syntax on
|
syntax on
|
||||||
|
set background=dark
|
||||||
colorscheme afterglow
|
colorscheme afterglow
|
||||||
|
let g:airline_theme='one'
|
||||||
set autoindent
|
set autoindent
|
||||||
set hlsearch
|
set hlsearch
|
||||||
set number
|
set number
|
||||||
|
@ -48,6 +61,7 @@ let g:NERDDefaultAlign = 'left'
|
||||||
let g:NERDCommentEmptyLines = 1
|
let g:NERDCommentEmptyLines = 1
|
||||||
|
|
||||||
autocmd BufNewFile,BufRead *.md setlocal ft=markdown
|
autocmd BufNewFile,BufRead *.md setlocal ft=markdown
|
||||||
|
autocmd BufNewFile,BufRead *.html.ejs setlocal ft=html
|
||||||
autocmd FileType elixir setlocal shiftwidth=2 tabstop=2
|
autocmd FileType elixir setlocal shiftwidth=2 tabstop=2
|
||||||
|
|
||||||
" Add optional packages.
|
" Add optional packages.
|
||||||
|
@ -59,3 +73,179 @@ autocmd FileType elixir setlocal shiftwidth=2 tabstop=2
|
||||||
if has('syntax') && has('eval')
|
if has('syntax') && has('eval')
|
||||||
packadd! matchit
|
packadd! matchit
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
" Protect changes between writes. Default values of
|
||||||
|
" updatecount (200 keystrokes) and updatetime
|
||||||
|
" (4 seconds) are fine
|
||||||
|
set swapfile
|
||||||
|
set directory^=~/.vim/swap//
|
||||||
|
|
||||||
|
" protect against crash-during-write
|
||||||
|
set writebackup
|
||||||
|
" but do not persist backup after successful write
|
||||||
|
set nobackup
|
||||||
|
" use rename-and-write-new method whenever safe
|
||||||
|
set backupcopy=auto
|
||||||
|
" patch required to honor double slash at end
|
||||||
|
if has("patch-8.1.0251")
|
||||||
|
" consolidate the writebackups -- not a big
|
||||||
|
" deal either way, since they usually get deleted
|
||||||
|
set backupdir^=~/.vim/backup//
|
||||||
|
end
|
||||||
|
|
||||||
|
" persist the undo tree for each file
|
||||||
|
set undofile
|
||||||
|
set undodir^=~/.vim/undo//
|
||||||
|
|
||||||
|
let g:ft = ''
|
||||||
|
function! NERDCommenter_before()
|
||||||
|
if &ft == 'vue'
|
||||||
|
let g:ft = 'vue'
|
||||||
|
let stack = synstack(line('.'), col('.'))
|
||||||
|
if len(stack) > 0
|
||||||
|
let syn = synIDattr((stack)[0], 'name')
|
||||||
|
if len(syn) > 0
|
||||||
|
exe 'setf ' . substitute(tolower(syn), '^vue_', '', '')
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
function! NERDCommenter_after()
|
||||||
|
if g:ft == 'vue'
|
||||||
|
setf vue
|
||||||
|
let g:ft = ''
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" example configuration for coc.nvim
|
||||||
|
|
||||||
|
" if hidden is not set, TextEdit might fail.
|
||||||
|
set hidden
|
||||||
|
|
||||||
|
" Some servers have issues with backup files, see #649
|
||||||
|
set nobackup
|
||||||
|
set nowritebackup
|
||||||
|
|
||||||
|
" Better display for messages
|
||||||
|
set cmdheight=2
|
||||||
|
|
||||||
|
" You will have bad experience for diagnostic messages when it's default 4000.
|
||||||
|
set updatetime=300
|
||||||
|
|
||||||
|
" don't give |ins-completion-menu| messages.
|
||||||
|
set shortmess+=c
|
||||||
|
|
||||||
|
" always show signcolumns
|
||||||
|
set signcolumn=yes
|
||||||
|
|
||||||
|
" Use tab for trigger completion with characters ahead and navigate.
|
||||||
|
" Use command ':verbose imap <tab>' to make sure tab is not mapped by other plugin.
|
||||||
|
inoremap <silent><expr> <TAB>
|
||||||
|
\ pumvisible() ? "\<C-n>" :
|
||||||
|
\ <SID>check_back_space() ? "\<TAB>" :
|
||||||
|
\ coc#refresh()
|
||||||
|
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
|
||||||
|
|
||||||
|
function! s:check_back_space() abort
|
||||||
|
let col = col('.') - 1
|
||||||
|
return !col || getline('.')[col - 1] =~# '\s'
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" Use <c-space> to trigger completion.
|
||||||
|
inoremap <silent><expr> <c-space> coc#refresh()
|
||||||
|
|
||||||
|
" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position.
|
||||||
|
" Coc only does snippet and additional edit on confirm.
|
||||||
|
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
|
||||||
|
" Or use `complete_info` if your vim support it, like:
|
||||||
|
" inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
|
||||||
|
|
||||||
|
" Use `[g` and `]g` to navigate diagnostics
|
||||||
|
nmap <silent> [g <Plug>(coc-diagnostic-prev)
|
||||||
|
nmap <silent> ]g <Plug>(coc-diagnostic-next)
|
||||||
|
|
||||||
|
" Remap keys for gotos
|
||||||
|
nmap <silent> <C-]> <Plug>(coc-definition)
|
||||||
|
nmap <silent> gy <Plug>(coc-type-definition)
|
||||||
|
nmap <silent> gi <Plug>(coc-implementation)
|
||||||
|
nmap <silent> gr <Plug>(coc-references)
|
||||||
|
|
||||||
|
" Use K to show documentation in preview window
|
||||||
|
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
||||||
|
|
||||||
|
function! s:show_documentation()
|
||||||
|
if (index(['vim','help'], &filetype) >= 0)
|
||||||
|
execute 'h '.expand('<cword>')
|
||||||
|
else
|
||||||
|
call CocAction('doHover')
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" Highlight symbol under cursor on CursorHold
|
||||||
|
autocmd CursorHold * silent call CocActionAsync('highlight')
|
||||||
|
|
||||||
|
" Remap for rename current word
|
||||||
|
nmap <leader>rn <Plug>(coc-rename)
|
||||||
|
|
||||||
|
" Remap for format selected region
|
||||||
|
xmap <leader>f <Plug>(coc-format-selected)
|
||||||
|
nmap <leader>f <Plug>(coc-format-selected)
|
||||||
|
|
||||||
|
augroup mygroup
|
||||||
|
autocmd!
|
||||||
|
" Setup formatexpr specified filetype(s).
|
||||||
|
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
|
||||||
|
" Update signature help on jump placeholder
|
||||||
|
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
|
||||||
|
augroup end
|
||||||
|
|
||||||
|
" Remap for do codeAction of selected region, ex: `<leader>aap` for current paragraph
|
||||||
|
xmap <leader>a <Plug>(coc-codeaction-selected)
|
||||||
|
nmap <leader>a <Plug>(coc-codeaction-selected)
|
||||||
|
|
||||||
|
" Remap for do codeAction of current line
|
||||||
|
nmap <leader>ac <Plug>(coc-codeaction)
|
||||||
|
" Fix autofix problem of current line
|
||||||
|
nmap <leader>qf <Plug>(coc-fix-current)
|
||||||
|
|
||||||
|
" Create mappings for function text object, requires document symbols feature of languageserver.
|
||||||
|
xmap if <Plug>(coc-funcobj-i)
|
||||||
|
xmap af <Plug>(coc-funcobj-a)
|
||||||
|
omap if <Plug>(coc-funcobj-i)
|
||||||
|
omap af <Plug>(coc-funcobj-a)
|
||||||
|
|
||||||
|
" Use <C-d> for select selections ranges, needs server support, like: coc-tsserver, coc-python
|
||||||
|
nmap <silent> <C-d> <Plug>(coc-range-select)
|
||||||
|
xmap <silent> <C-d> <Plug>(coc-range-select)
|
||||||
|
|
||||||
|
" Use `:Format` to format current buffer
|
||||||
|
command! -nargs=0 Format :call CocAction('format')
|
||||||
|
|
||||||
|
" Use `:Fold` to fold current buffer
|
||||||
|
command! -nargs=? Fold :call CocAction('fold', <f-args>)
|
||||||
|
|
||||||
|
" use `:OR` for organize import of current buffer
|
||||||
|
command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport')
|
||||||
|
|
||||||
|
" Add status line support, for integration with other plugin, checkout `:h coc-status`
|
||||||
|
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
|
||||||
|
|
||||||
|
" Using CocList
|
||||||
|
" Show all diagnostics
|
||||||
|
nnoremap <silent> <space>a :<C-u>CocList diagnostics<cr>
|
||||||
|
" Manage extensions
|
||||||
|
nnoremap <silent> <space>e :<C-u>CocList extensions<cr>
|
||||||
|
" Show commands
|
||||||
|
nnoremap <silent> <space>c :<C-u>CocList commands<cr>
|
||||||
|
" Find symbol of current document
|
||||||
|
nnoremap <silent> <space>o :<C-u>CocList outline<cr>
|
||||||
|
" Search workspace symbols
|
||||||
|
nnoremap <silent> <space>s :<C-u>CocList -I symbols<cr>
|
||||||
|
" Do default action for next item.
|
||||||
|
nnoremap <silent> <space>j :<C-u>CocNext<CR>
|
||||||
|
" Do default action for previous item.
|
||||||
|
nnoremap <silent> <space>k :<C-u>CocPrev<CR>
|
||||||
|
" Resume latest coc list
|
||||||
|
nnoremap <silent> <space>p :<C-u>CocListResume<CR>
|
||||||
|
|
||||||
|
autocmd FileType gitcommit let b:coc_suggest_disable = 1
|
||||||
|
|
1
.zshrc
1
.zshrc
|
@ -110,3 +110,4 @@ ca() {
|
||||||
# default file openings
|
# default file openings
|
||||||
alias -s ipr=open
|
alias -s ipr=open
|
||||||
alias -s xcodeproj=open
|
alias -s xcodeproj=open
|
||||||
|
alias -s xcworkspace=open
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
{
|
{
|
||||||
"font_face": "SF Mono Regular",
|
"binary_file_patterns":
|
||||||
"font_size": 13,
|
|
||||||
"ignored_packages":
|
|
||||||
[
|
[
|
||||||
"Vintage"
|
|
||||||
],
|
|
||||||
"scroll_past_end": true,
|
|
||||||
"binary_file_patterns": [
|
|
||||||
"*.jpg",
|
"*.jpg",
|
||||||
"*.jpeg",
|
"*.jpeg",
|
||||||
"*.png",
|
"*.png",
|
||||||
|
@ -22,5 +16,12 @@
|
||||||
"*.zip",
|
"*.zip",
|
||||||
"*.app",
|
"*.app",
|
||||||
"*.beam"
|
"*.beam"
|
||||||
]
|
],
|
||||||
|
"font_face": "SF Mono Regular",
|
||||||
|
"font_size": 13,
|
||||||
|
"ignored_packages":
|
||||||
|
[
|
||||||
|
"Vintage"
|
||||||
|
],
|
||||||
|
"scroll_past_end": true
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue