Viktor Grahn 2 лет назад
Родитель
Сommit
e8062812f0
1 измененных файлов с 19 добавлено и 16 удалено
  1. 19 16
      .vimrc

+ 19 - 16
.vimrc

@@ -26,9 +26,10 @@ Plug 'mxw/vim-jsx'
 Plug 'pangloss/vim-javascript'
 Plug 'pangloss/vim-javascript'
 Plug 'natebosch/vim-lsc'
 Plug 'natebosch/vim-lsc'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-surround'
+Plug 'nordtheme/vim'
 Plug 'ap/vim-css-color', { 'for': [ 'css', 'scss' ] }
 Plug 'ap/vim-css-color', { 'for': [ 'css', 'scss' ] }
 call plug#end()
 call plug#end()
-		
+
 filetype plugin indent on
 filetype plugin indent on
 syntax on
 syntax on
 
 
@@ -59,17 +60,19 @@ set splitright
 set switchbuf+=usetab,newtab
 set switchbuf+=usetab,newtab
 set termguicolors
 set termguicolors
 set tabstop=2
 set tabstop=2
-set whichwrap+=<,>,[,],h,l 
+set whichwrap+=<,>,[,],h,l
 set undofile
 set undofile
 set undodir=~/.vim/undo
 set undodir=~/.vim/undo
 
 
 " Colorscheme
 " Colorscheme
-colorscheme minimalist
+" colorscheme minimalist
+colorscheme nord
 highlight Comment cterm=italic
 highlight Comment cterm=italic
 highlight Pmenu ctermbg=233
 highlight Pmenu ctermbg=233
+set background=dark
 
 
 " Lightline
 " Lightline
-set laststatus=2 
+set laststatus=2
 set noshowmode
 set noshowmode
 
 
 " Source lightline theme
 " Source lightline theme
@@ -79,7 +82,7 @@ endif
 source ~/.vim/source/minimalist.vim
 source ~/.vim/source/minimalist.vim
 
 
 let g:lightline = {
 let g:lightline = {
-  \ 'colorscheme': 'minimalist',
+  \ 'colorscheme': 'nord',
   \ 'tabline_subseparator': { 'left': '', 'right': '' },
   \ 'tabline_subseparator': { 'left': '', 'right': '' },
   \ 'active': {
   \ 'active': {
   \   'left': [
   \   'left': [
@@ -87,9 +90,9 @@ let g:lightline = {
   \     [ 'filestate' ],
   \     [ 'filestate' ],
   \     [ 'gitbranch', 'tagbar' ],
   \     [ 'gitbranch', 'tagbar' ],
   \   ],
   \   ],
-  \   'right': [ 
+  \   'right': [
   \     [ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_infos', 'linter_ok' ],
   \     [ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_infos', 'linter_ok' ],
-  \     [ 'fileformat', 'fileencoding', 'filetype', 'percent', 'lineinfo', 'offset' ], 
+  \     [ 'fileformat', 'fileencoding', 'filetype', 'percent', 'lineinfo', 'offset' ],
   \   ]
   \   ]
   \ },
   \ },
   \ 'tabline': {
   \ 'tabline': {
@@ -159,6 +162,7 @@ let g:ale_completion_enabled = 0
 let g:ale_sign_column_always = 1
 let g:ale_sign_column_always = 1
 let g:ale_set_signs = 1
 let g:ale_set_signs = 1
 let g:ale_set_highlights = 0
 let g:ale_set_highlights = 0
+let g:ale_disable_lsp = 1
 
 
 " QD for intelephense stubs
 " QD for intelephense stubs
 let s:intelephense_config = { 
 let s:intelephense_config = { 
@@ -197,8 +201,6 @@ let g:ale_phpcs_standard = "PSR2"
 let g:ale_php_phpmd_ruleset = 'cleancode'
 let g:ale_php_phpmd_ruleset = 'cleancode'
 let g:ale_php_intelephense_executable  = 'debugIntelephense.sh'
 let g:ale_php_intelephense_executable  = 'debugIntelephense.sh'
 
 
-let g:ale_php_intelephense_config = { 'storagePath': '/tmp/intelephense-ale' }
-
 " ALE fixers
 " ALE fixers
 let g:ale_fixers = { '*': [ 'remove_trailing_lines', 'trim_whitespace' ] }
 let g:ale_fixers = { '*': [ 'remove_trailing_lines', 'trim_whitespace' ] }
 let g:ale_fixers.javascript  = [ 'prettier', 'eslint' ]
 let g:ale_fixers.javascript  = [ 'prettier', 'eslint' ]
@@ -261,7 +263,7 @@ nnoremap <Space>l :call Toggle_location_list()<CR>
 function! Toggle_quick_list()
 function! Toggle_quick_list()
   if get(b:, 'quick_list', 0) == 0
   if get(b:, 'quick_list', 0) == 0
     silent! copen
     silent! copen
-    if get(getqfist(0, { 'winid': 0 }), 'winid')
+    if get(getqflist(0, { 'winid': 0 }), 'winid')
       let b:quick_list = 1
       let b:quick_list = 1
     endif
     endif
   else
   else
@@ -354,16 +356,17 @@ nnoremap <C-l>f :LSClientFindReferences<CR>
 nnoremap <C-l>g :tab LSClientGoToDefinitionSplit<CR>
 nnoremap <C-l>g :tab LSClientGoToDefinitionSplit<CR>
 nnoremap <C-l>G :LSClientGoToDefinition<CR>
 nnoremap <C-l>G :LSClientGoToDefinition<CR>
 nnoremap <C-l>h :LSClientShowHover<CR>
 nnoremap <C-l>h :LSClientShowHover<CR>
-nnoremap <C-l>c :LSClientSignatureHelp<CR>
+nnoremap <C-l>s :LSClientSignatureHelp<CR>
+inoremap <C-l>s <C-o>:LSClientSignatureHelp<CR>
 
 
 " LSP servers
 " LSP servers
 let g:lsc_server_commands = {}
 let g:lsc_server_commands = {}
 let g:lsc_server_commands = {
 let g:lsc_server_commands = {
- \  'javascript':     { 'command': 'typescript-language-server --stdio', 'log_level': -1, 'suppress_stderr': v:true },
- \  'javascript.jsx': { 'command': 'typescript-language-server --stdio', 'log_level': -1, 'suppress_stderr': v:true },
- \  'php':            { 'command': 'intelephense --stdio', 'message_hooks': {'initialize': { 'initializationOptions': {'storagePath': '/tmp/intelephense'} } }, 'workspace_config': { 'intelephense': s:intelephense_config } },
- \  'go':             { 'command': 'gopls serve', 'log_level': -1, 'suppress_stderr': v:true },
- \}
+  \  'javascript':     extend({ 'command': 'typescript-language-server --stdio'}, lsc_server_defaults),
+  \  'javascript.jsx': extend({ 'command': 'typescript-language-server --stdio'}, lsc_server_defaults),
+  \  'go':             extend({ 'command': 'gopls serve' }, lsc_server_defaults),
+  \  'php':            extend({ 'command': 'intelephense --stdio', 'message_hooks': {'initialize': { 'initializationOptions': {'storagePath': '/tmp/intelephense'} } } }, lsc_server_defaults),
+  \}
 
 
 " LSP close preview after selecting completion
 " LSP close preview after selecting completion
 autocmd CompleteDone * silent! pclose
 autocmd CompleteDone * silent! pclose