|
|
@ -39,6 +39,8 @@ call plug#begin()
|
|
|
|
Plug 'jparise/vim-graphql'
|
|
|
|
Plug 'jparise/vim-graphql'
|
|
|
|
call plug#end()
|
|
|
|
call plug#end()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
packadd lsp
|
|
|
|
|
|
|
|
|
|
|
|
" enable the filetype plugin
|
|
|
|
" enable the filetype plugin
|
|
|
|
filetype plugin indent on
|
|
|
|
filetype plugin indent on
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
@ -215,7 +217,6 @@ if has("autocmd")
|
|
|
|
autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
|
|
|
|
autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
|
|
|
|
autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
|
|
|
|
autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
|
|
|
|
autocmd FileType php set omnifunc=phpcomplete#CompletePHP
|
|
|
|
autocmd FileType php set omnifunc=phpcomplete#CompletePHP
|
|
|
|
autocmd FileType python set omnifunc=ale#completion#OmniFunc
|
|
|
|
|
|
|
|
autocmd FileType css set omnifunc=csscomplete#CompleteCSS
|
|
|
|
autocmd FileType css set omnifunc=csscomplete#CompleteCSS
|
|
|
|
autocmd FileType rust set omnifunc=ale#completion#OmniFunc
|
|
|
|
autocmd FileType rust set omnifunc=ale#completion#OmniFunc
|
|
|
|
endif
|
|
|
|
endif
|
|
|
@ -392,7 +393,6 @@ tnoremap <F1> <C-\><C-n>:bnext!<CR>
|
|
|
|
nnoremap <F2> :term ++curwin<CR>
|
|
|
|
nnoremap <F2> :term ++curwin<CR>
|
|
|
|
nnoremap <F3> :belo term<CR>
|
|
|
|
nnoremap <F3> :belo term<CR>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let g:terminal_ansi_colors = [
|
|
|
|
let g:terminal_ansi_colors = [
|
|
|
|
\ '#929292',
|
|
|
|
\ '#929292',
|
|
|
|
\ '#e27373',
|
|
|
|
\ '#e27373',
|
|
|
@ -473,17 +473,65 @@ let g:SuperTabClosePreviewOnPopupClose = 1
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
|
|
|
|
|
|
|
|
" lsp -----------------------------------------------------------------------{{{
|
|
|
|
" lsp -----------------------------------------------------------------------{{{
|
|
|
|
|
|
|
|
call LspOptionsSet(#{
|
|
|
|
|
|
|
|
\ aleSupport: v:false,
|
|
|
|
|
|
|
|
\ autoComplete: v:false,
|
|
|
|
|
|
|
|
\ autoHighlight: v:false,
|
|
|
|
|
|
|
|
\ autoHighlightDiags: v:true,
|
|
|
|
|
|
|
|
\ autoPopulateDiags: v:false,
|
|
|
|
|
|
|
|
\ completionMatcher: 'case',
|
|
|
|
|
|
|
|
\ completionMatcherValue: 1,
|
|
|
|
|
|
|
|
\ diagSignErrorText: 'E>',
|
|
|
|
|
|
|
|
\ diagSignHintText: 'H>',
|
|
|
|
|
|
|
|
\ diagSignInfoText: 'I>',
|
|
|
|
|
|
|
|
\ diagSignWarningText: 'W>',
|
|
|
|
|
|
|
|
\ echoSignature: v:false,
|
|
|
|
|
|
|
|
\ hideDisabledCodeActions: v:false,
|
|
|
|
|
|
|
|
\ highlightDiagInline: v:true,
|
|
|
|
|
|
|
|
\ hoverInPreview: v:false,
|
|
|
|
|
|
|
|
\ ignoreMissingServer: v:false,
|
|
|
|
|
|
|
|
\ keepFocusInDiags: v:true,
|
|
|
|
|
|
|
|
\ keepFocusInReferences: v:true,
|
|
|
|
|
|
|
|
\ completionTextEdit: v:true,
|
|
|
|
|
|
|
|
\ diagVirtualTextAlign: 'above',
|
|
|
|
|
|
|
|
\ diagVirtualTextWrap: 'default',
|
|
|
|
|
|
|
|
\ noNewlineInCompletion: v:false,
|
|
|
|
|
|
|
|
\ omniComplete: v:null,
|
|
|
|
|
|
|
|
\ outlineOnRight: v:false,
|
|
|
|
|
|
|
|
\ outlineWinSize: 20,
|
|
|
|
|
|
|
|
\ semanticHighlight: v:true,
|
|
|
|
|
|
|
|
\ showDiagInBalloon: v:true,
|
|
|
|
|
|
|
|
\ showDiagInPopup: v:true,
|
|
|
|
|
|
|
|
\ showDiagOnStatusLine: v:false,
|
|
|
|
|
|
|
|
\ showDiagWithSign: v:true,
|
|
|
|
|
|
|
|
\ showDiagWithVirtualText: v:false,
|
|
|
|
|
|
|
|
\ showInlayHints: v:false,
|
|
|
|
|
|
|
|
\ showSignature: v:true,
|
|
|
|
|
|
|
|
\ snippetSupport: v:false,
|
|
|
|
|
|
|
|
\ ultisnipsSupport: v:false,
|
|
|
|
|
|
|
|
\ useBufferCompletion: v:false,
|
|
|
|
|
|
|
|
\ usePopupInCodeAction: v:false,
|
|
|
|
|
|
|
|
\ useQuickfixForLocations: v:false,
|
|
|
|
|
|
|
|
\ vsnipSupport: v:false,
|
|
|
|
|
|
|
|
\ bufferCompletionTimeout: 100,
|
|
|
|
|
|
|
|
\ customCompletionKinds: v:false,
|
|
|
|
|
|
|
|
\ completionKinds: {},
|
|
|
|
|
|
|
|
\ filterCompletionDuplicates: v:false,
|
|
|
|
|
|
|
|
\ })
|
|
|
|
|
|
|
|
|
|
|
|
" this is not portable at all and I hate it and dunno how to fix it yet
|
|
|
|
" this is not portable at all and I hate it and dunno how to fix it yet
|
|
|
|
" call LspAddServer([#{name: 'pyright',
|
|
|
|
call LspAddServer([#{name: 'pyright',
|
|
|
|
" \ filetype: 'python',
|
|
|
|
\ filetype: 'python',
|
|
|
|
" \ path: '/Users/jordan.orelli/.nix-profile/bin/pyright-langserver',
|
|
|
|
\ path: '/Users/jordan.orelli/.nix-profile/bin/pyright-langserver',
|
|
|
|
" \ args: ['--stdio'],
|
|
|
|
\ args: ['--stdio'],
|
|
|
|
" \ workspaceConfig: #{
|
|
|
|
\ workspaceConfig: #{
|
|
|
|
" \ python: #{
|
|
|
|
\ python: #{
|
|
|
|
" \ pythonPath: '/usr/local/bin/python3'
|
|
|
|
\ pythonPath: '/usr/local/bin/python3'
|
|
|
|
" \ }}
|
|
|
|
\ }}
|
|
|
|
" \ }])
|
|
|
|
\ }])
|
|
|
|
|
|
|
|
nmap <C-]> :LspGotoDefinition<CR>
|
|
|
|
|
|
|
|
nmap <S-K> :LspHover<CR>
|
|
|
|
|
|
|
|
nmap <S-M> :LspDiagCurrent<CR>
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
|
|
|
|
|
|
|
|
" ALE -----------------------------------------------------------------------{{{
|
|
|
|
" ALE -----------------------------------------------------------------------{{{
|
|
|
|