vasili/dotvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged down, some fixes, prepping for re-org

Browse Source
This commit is contained in:
Vasili Svirydau
2019-10-28 10:40:50 -07:00
parent cb501a1ab7
commit 5a42a0c8e1
4 changed files with 31 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
config/01-plugins.vim
View File

@@ -18,14 +18,12 @@ if(g:have_plug)
Plug 'ctrlpvim/ctrlp.vim' " Fuzzy search
Plug 'editorconfig/editorconfig-vim' " EditorConfig.org support
" Plug 'ivyl/vim-bling' " blink search results
if executable('ag')
Plug 'rking/ag.vim' " Silver Searcher Support
endif
if executable('rg')
Plug 'jremmen/vim-ripgrep' " RipGrep
endif
" Plug 'tacahiroy/ctrlp-funky' " Fuzzy in-buffer search
Plug 'tommcdo/vim-lion' " Align stuff
Plug 'tpope/vim-abolish' " Case Convert and other stuff
Plug 'tpope/vim-commentary' " Commenting
@@ -33,34 +31,22 @@ if(g:have_plug)
Plug 'tpope/vim-surround' " Surround with quotes
Plug 'vim-airline/vim-airline' " Status bar
Plug 'vim-airline/vim-airline-themes' " Status bar themes
" Plug 'vimwiki/vimwiki' " http://vimwiki.github.io/
Plug 'w0ng/vim-hybrid' " Hybrid colorscheme
Plug 'christoomey/vim-sort-motion' " Sort Motions
" Language
if executable('rails')
Plug 'tpope/vim-rails' " Rails integration
endif
Plug 'mattn/emmet-vim' " ZenCoding
Plug 'sheerun/vim-polyglot' " Language Support Bundle
Plug 'ianks/vim-tsx'
Plug 'OrangeT/vim-csharp' " C# Support
" Plug 'quramy/vim-js-pretty-template' " Syntax highlight inside template strings
" Plug 'heavenshell/vim-jsdoc' " Generate JSDoc comments
" Quality of life
" Plug 'edkolev/tmuxline.vim'
" Plug 'jez/vim-superman' " Man page viewer
" Plug 'mhinz/vim-signify' " Gutter signs, git, et al.
" Plug 'sotte/presenting.vim' " Slides
if v:version >= 800
Plug 'w0rp/ale' " Asynchronous Linting
Plug 'sbdchd/neoformat' " Automatic code formatting
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'Shougo/deoplete.nvim' " Autocomplete Support
Plug 'ruanyl/coverage.vim' " Code Coverage Support
@@ -83,8 +69,6 @@ let g:loaded_netrwPlugin = 1 " Disable netrw
let g:airline_powerline_fonts = 1
let g:airline#extensions#tabline#enabled = 1
" let g:airline#extensions#ale#enabled = 0
" let g:airline#extensions#coc#enabled = 1
let g:airline_section_error = '%{airline#util#wrap(airline#extensions#coc#get_error(),0)}'
let g:airline_section_warning = '%{airline#util#wrap(airline#extensions#coc#get_warning(),0)}'
@@ -92,7 +76,6 @@ let g:ale_sign_column_always = 1
let g:ale_sign_error = ''
let g:ale_sign_warning = ''
let g:ale_fix_on_save = 1
" let g:ale_completion_enabled = 1
let g:ale_linters = {
\ 'typescript': ['tsserver'],
@@ -144,17 +127,17 @@ augroup END
function! OSCountCodeActions() abort
if bufname('%') ==# '' || OmniSharp#FugitiveCheck() | return | endif
if !OmniSharp#IsServerRunning() | return | endif
let opts = {
let l:opts = {
\ 'CallbackCount': function('s:CBReturnCount'),
\ 'CallbackCleanup': {-> execute('sign unplace 99')}
\}
call OmniSharp#CountCodeActions(opts)
call OmniSharp#CountCodeActions(l:opts)
endfunction
function! s:CBReturnCount(count) abort
if a:count
let l = getpos('.')[1]
let f = expand('%:p')
execute ':sign place 99 line='.l.' name=OmniSharpCodeActions file='.f
let l:l = getpos('.')[1]
let l:f = expand('%:p')
execute ':sign place 99 line='.l:l.' name=OmniSharpCodeActions file='.l:f
endif
endfunction

22
config/03-mappings.vim
View File

@@ -4,9 +4,6 @@ noremap <silent><leader>w :update<cr>
inoremap <silent><leader>w <Esc>:update<cr>a
cmap w!! w !sudo tee % >/dev/null
" cmap eh e %:h/
" cmap wh w %:h/
" cmap %% %:h<tab>
cnoremap <expr> %% getcmdtype() == ':' ? expand('%:p:h') . '/' : '%%'
cnoremap <expr> %b getcmdtype() == ':' ? expand('%:p:r') : '%b'
@@ -25,25 +22,6 @@ noremap <leader>] :bn<cr>
noremap <leader>[ :bp<cr>
noremap <leader>d :bd<cr>
" if exists('g:loaded_ale')
" nmap <leader>e[ <Plug>(ale_previous_wrap)
" nmap <leader>e] <Plug>(ale_next_wrap)
" nmap <leader>p <Plug>(ale_hover)
" nmap <leader>D <Plug>(ale_go_to_definition)
" nmap <leader>U <Plug>(ale_find_references)
" endif
" if exists('g:loaded_ctrlp_funky')
" let g:ctrlp_funky_syntax_highlight = 1
" nnoremap <leader>f :CtrlPFunky<CR>
" endif
" if exists('g:LanguageClient_loaded')
" nnoremap <F5> :call LanguageClient_contextMenu()<CR>
" nnoremap <F12> :call LanguageClient_textDocument_codeAction()<CR>
" endif
" coc.nvim
function! s:check_back_space() abort
let l:col = col('.') - 1

37
config/04-autocmds.vim
View File

@@ -13,18 +13,6 @@
endfun
augroup END
" augroup CleanWhitespace
" au!
" autocmd BufWritePre * :call <SID>StripTrailingWhitespace()
" function! <SID>StripTrailingWhitespace()
" let l:pos = getpos('.')
" let l:_s=@/
" %s/\s\+$//e
" call setpos('.', l:pos)
" let @/=l:_s
" endfun
" augroup END
augroup InsertTimer
au!
"Autoexit to normal mode after 15 seconds of inactivity
@@ -55,20 +43,10 @@
au!
autocmd FileType javascript set ai sw=2 sts=2 et
" let g:neoformat_javascript_prettier = {
" \ 'exe' : 'prettier',
" \ 'args': ['--stdin', '--trailing-comma=es5', '--single-quote'],
" \ 'stdin': 1
" \ }
augroup END
augroup typescript
au!
" call jspretmpl#register_tag('psql', 'pgsql')
" autocmd FileType typescript JsPreTmpl pgsql
augroup END
augroup Dockerfile
@@ -79,15 +57,18 @@
augroup suffixes
autocmd!
let associations = [
\["typescript", ".ts"],
\["typescript", "/index.ts"],
\["javascript", ".js"]
let g:associations = [
\['typescript', '.ts'],
\['typescript', '/index.ts'],
\['javascript', '.js']
\]
for ft in associations
execute "autocmd FileType " . ft[0] . " setlocal suffixesadd=" . ft[1]
for g:ft in g:associations
execute 'autocmd FileType ' . g:ft[0] . ' setlocal suffixesadd=' . g:ft[1]
endfor
unlet g:associations
unlet g:ft
augroup END
augroup Omnisharp