diff --git a/.gvimrc b/.gvimrc index 17d6972..d24cdb4 100644 --- a/.gvimrc +++ b/.gvimrc @@ -6,3 +6,5 @@ if has("gui_macvim") nnoremap :Files endif +colorscheme one + diff --git a/.vimrc b/.vimrc index 905d170..1a2976a 100644 --- a/.vimrc +++ b/.vimrc @@ -1,36 +1,49 @@ set nocompatible filetype off -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() +" set rtp+=~/.vim/bundle/Vundle.vim +" call vundle#begin() +call plug#begin('~/.vim/plugged') -Plugin 'VundleVim/Vundle.vim' -Plugin 'tpope/vim-sensible' -Plugin 'scrooloose/nerdtree' -Plugin 'danilo-augusto/vim-afterglow' -Plugin 'junegunn/fzf.vim' -Plugin 'ycm-core/YouCompleteMe' -Plugin 'elixir-editors/vim-elixir' -Plugin 'slashmili/alchemist.vim' -Plugin 'mattn/emmet-vim' -Plugin 'scrooloose/nerdcommenter' -Plugin 'tpope/vim-fugitive' -Plugin 'jeffkreeftmeijer/vim-numbertoggle' -Plugin 'mhinz/vim-mix-format' +Plug 'VundleVim/Vundle.vim' +Plug 'tpope/vim-sensible' +Plug 'scrooloose/nerdtree' +Plug 'danilo-augusto/vim-afterglow' +Plug 'rakr/vim-one' +Plug '/usr/local/opt/fzf' +Plug 'junegunn/fzf.vim' +Plug 'elixir-editors/vim-elixir' +Plug 'mattn/emmet-vim' +Plug 'tpope/vim-commentary' +Plug 'tpope/vim-fugitive' +Plug 'jeffkreeftmeijer/vim-numbertoggle' +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() - -set rtp+=/usr/local/opt/fzf +" call vundle#end() +call plug#end() map :NERDTreeToggle nnoremap K :YcmCompleter GoTo nnoremap :YcmCompleter RefactorRename nnoremap :Files +nnoremap :Files filetype plugin indent on syntax on +set background=dark colorscheme afterglow +let g:airline_theme='one' set autoindent set hlsearch set number @@ -48,6 +61,7 @@ let g:NERDDefaultAlign = 'left' let g:NERDCommentEmptyLines = 1 autocmd BufNewFile,BufRead *.md setlocal ft=markdown +autocmd BufNewFile,BufRead *.html.ejs setlocal ft=html autocmd FileType elixir setlocal shiftwidth=2 tabstop=2 " Add optional packages. @@ -59,3 +73,179 @@ autocmd FileType elixir setlocal shiftwidth=2 tabstop=2 if has('syntax') && has('eval') packadd! matchit 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 ' to make sure tab is not mapped by other plugin. +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use to trigger completion. +inoremap coc#refresh() + +" Use to confirm completion, `u` means break undo chain at current position. +" Coc only does snippet and additional edit on confirm. +inoremap pumvisible() ? "\" : "\u\" +" Or use `complete_info` if your vim support it, like: +" inoremap complete_info()["selected"] != "-1" ? "\" : "\u\" + +" Use `[g` and `]g` to navigate diagnostics +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) + +" Remap keys for gotos +nmap (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +" Use K to show documentation in preview window +nnoremap K :call show_documentation() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + else + call CocAction('doHover') + endif +endfunction + +" Highlight symbol under cursor on CursorHold +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Remap for rename current word +nmap rn (coc-rename) + +" Remap for format selected region +xmap f (coc-format-selected) +nmap f (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: `aap` for current paragraph +xmap a (coc-codeaction-selected) +nmap a (coc-codeaction-selected) + +" Remap for do codeAction of current line +nmap ac (coc-codeaction) +" Fix autofix problem of current line +nmap qf (coc-fix-current) + +" Create mappings for function text object, requires document symbols feature of languageserver. +xmap if (coc-funcobj-i) +xmap af (coc-funcobj-a) +omap if (coc-funcobj-i) +omap af (coc-funcobj-a) + +" Use for select selections ranges, needs server support, like: coc-tsserver, coc-python +nmap (coc-range-select) +xmap (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', ) + +" 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 a :CocList diagnostics +" Manage extensions +nnoremap e :CocList extensions +" Show commands +nnoremap c :CocList commands +" Find symbol of current document +nnoremap o :CocList outline +" Search workspace symbols +nnoremap s :CocList -I symbols +" Do default action for next item. +nnoremap j :CocNext +" Do default action for previous item. +nnoremap k :CocPrev +" Resume latest coc list +nnoremap p :CocListResume + +autocmd FileType gitcommit let b:coc_suggest_disable = 1 diff --git a/.zshrc b/.zshrc index 236c3ce..83547d7 100644 --- a/.zshrc +++ b/.zshrc @@ -110,3 +110,4 @@ ca() { # default file openings alias -s ipr=open alias -s xcodeproj=open +alias -s xcworkspace=open diff --git a/Preferences.sublime-settings b/Preferences.sublime-settings index 1aa6936..a44a29d 100644 --- a/Preferences.sublime-settings +++ b/Preferences.sublime-settings @@ -1,12 +1,6 @@ { - "font_face": "SF Mono Regular", - "font_size": 13, - "ignored_packages": + "binary_file_patterns": [ - "Vintage" - ], - "scroll_past_end": true, - "binary_file_patterns": [ "*.jpg", "*.jpeg", "*.png", @@ -22,5 +16,12 @@ "*.zip", "*.app", "*.beam" - ] + ], + "font_face": "SF Mono Regular", + "font_size": 13, + "ignored_packages": + [ + "Vintage" + ], + "scroll_past_end": true }