Merge pull request #8 from ntsk/mason

nvim-lsp-installer -> mason.nvim 他

.gitconfig

@@ -17,3 +17,5 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[init]
+	defaultBranch = main

nvim/dein/lazy.toml

@@ -8,7 +8,7 @@ repo = 'Shougo/ddc.vim'
 on_event = 'InsertEnter'
 depends = ['denops.vim']
 hook_source = '''
-  call ddc#custom#patch_global('sources', ['nvim-lsp', 'around'])
+  call ddc#custom#patch_global('sources', ['lsp', 'around'])
   call ddc#custom#patch_global('sourceOptions', {
         \ '_': {
         \   'matchers': ['matcher_head'],
@@ -27,7 +27,7 @@ repo = 'Shougo/ddc-around'
 on_source = 'ddc.vim'
 
 [[plugins]]
-repo = 'Shougo/ddc-nvim-lsp'
+repo = 'Shougo/ddc-source-lsp'
 on_source = 'ddc.vim'
 
 [[plugins]]
@@ -39,22 +39,3 @@ repo = 'Shougo/ddc-sorter_rank'
 on_source = 'ddc.vim'
 
 
-# lsp
-[[plugins]]
-repo = 'neovim/nvim-lspconfig'
-on_event = 'BufEnter'
-hook_source= '''
-lua << EOF
-local lsp_installer = require("nvim-lsp-installer")
-lsp_installer.on_server_ready(function(server)
-  local opts = {}
-  server:setup(opts)
-  vim.cmd [[ do User LspAttachBuffers ]]
-end)
-EOF
-'''
-
-[[plugins]]
-repo = 'williamboman/nvim-lsp-installer'
-on_source = 'nvim-lspconfig'
-

nvim/dein/plugins.toml

@@ -125,3 +125,13 @@ hook_add = '''
 [[plugins]]
 repo = 'vim-denops/denops.vim'
 
+# Lsp
+[[plugins]]
+repo = 'neovim/nvim-lspconfig'
+
+[[plugins]]
+repo = 'williamboman/mason.nvim'
+
+[[plugins]]
+repo = 'williamboman/mason-lspconfig.nvim'
+

nvim/init.vim

@@ -97,3 +97,16 @@ colorscheme molokai
 nnoremap <silent><C-e> :NERDTreeToggle<CR>
 inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
 inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+
+" Lsp
+lua << EOF
+  require("mason").setup()
+  require("mason-lspconfig").setup()
+  require("mason-lspconfig").setup_handlers {
+    function(server_name) -- default handler (optional)
+      require("lspconfig")[server_name].setup {
+        on_attach = on_attach,
+      }
+    end
+  }
+EOF

zsh/rc/path.zsh

@@ -30,9 +30,6 @@ export PATH="$HOME/.poetry/bin:$PATH"
 export PATH="$HOME/.nodenv/bin:$PATH"
 eval "$(nodenv init -)"
 
-# gcloud required python2
-export CLOUDSDK_PYTHON=/Users/$USER/.pyenv/versions/2.7.15/bin/python2
-
 # imagemagick
 export PATH="/usr/local/opt/imagemagick@6/bin:$PATH"