update lsp to use neovim's lsp

4 files changed, 10 insertions, 80 deletions

diff --git a/.config/nvim/lua/plugin/init.lua b/.config/nvim/lua/plugin/init.lua
index 4e60f98..6cd9e35 100644
--- a/.config/nvim/lua/plugin/init.lua
+++ b/.config/nvim/lua/plugin/init.lua
@@ -1,3 +1,3 @@
 require("plugin.packer")
 require("plugin.setup")
-require("plugin.lsp")
+-- require("plugin.lsp")
diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua
deleted file mode 100644
index b590d30..0000000
--- a/.config/nvim/lua/plugin/lsp.lua
+++ /dev/null
@@ -1,55 +0,0 @@
-local lsp = require("lsp-zero")
-local lspconfig = require("lspconfig")
-
-vim.opt.signcolumn = 'yes'
-
-local lspconfig_defaults = require('lspconfig').util.default_config
-lspconfig_defaults.capabilities = vim.tbl_deep_extend(
-  'force',
-  lspconfig_defaults.capabilities,
-  require('cmp_nvim_lsp').default_capabilities()
-)
-
-require('mason').setup {}
-require('mason-lspconfig').setup {
-  ensure_installed = {
-    "lua_ls",
-    "clangd",
-  },
-  handlers = {
-    lsp.default_setup,
-  },
-}
-
-local cmp = require('cmp')
-cmp.setup {
-  mapping = cmp.mapping.preset.insert({
-    -- `Enter` key to confirm completion
-    ['<CR>'] = cmp.mapping.confirm({ select = false }),
-    -- `Tab` key to navigate
-    ['<S-Tab>'] = cmp.mapping.select_prev_item({ behavior = 'select' }),
-    ['<Tab>'] = cmp.mapping.select_next_item({ behavior = 'select' }),
-  })
-}
-
-lsp.on_attach(function(client, buffer)
-  local opts = { buffer = buffer, remap = false }
-
-  vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-  vim.keymap.set("n", "gD", function() vim.lsp.buf.declaration() end, opts)
-  vim.keymap.set("n", "gi", function() vim.lsp.buf.implementation() end, opts)
-  vim.keymap.set("n", "go", function() vim.lsp.buf.type_definition() end, opts)
-  vim.keymap.set("n", "gr", function() vim.lsp.buf.references() end, opts)
-  vim.keymap.set("n", "<leader>h", function() vim.lsp.buf.hover() end, opts)
-  vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts)
-  vim.keymap.set("n", "<leader>lrn", function() vim.lsp.buf.rename() end, opts)
-  vim.keymap.set("n", "<leader>ls", function() vim.lsp.buf.signature_help() end, opts)
-end)
-
-lsp.setup()
-
-vim.diagnostic.config {
-  virtual_text = true
-}
-
-vim.g.zig_fmt_autosave = 0
diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua
index a468c06..0ed86bc 100644
--- a/.config/nvim/lua/plugin/packer.lua
+++ b/.config/nvim/lua/plugin/packer.lua
@@ -4,7 +4,6 @@ return require("packer").startup(function(use)
   use {"andweeb/presence.nvim"}
 
   use {"hobby-engine/hobby-script-vim"}
-  use {"~/den_vim"}
 
   use {
     "nvim-telescope/telescope.nvim",
@@ -13,7 +12,6 @@ return require("packer").startup(function(use)
     },
   }
 
-  use {"tpope/vim-fugitive"}
   use {"windwp/nvim-autopairs"}
 
   use {
@@ -36,28 +34,13 @@ return require("packer").startup(function(use)
   use {"xiyaowong/transparent.nvim"}
   use {"xiyaowong/virtcolumn.nvim"}
 
-  use {
-    "VonHeikemen/lsp-zero.nvim",
-    requires = {
-      {"lukas-reineke/lsp-format.nvim"},
-      -- LSP Support
-      {"neovim/nvim-lspconfig"},
-      {"williamboman/mason.nvim"},
-      {"williamboman/mason-lspconfig.nvim"},
-
-      -- Autocompletion
-      {"hrsh7th/nvim-cmp"},
-      {"hrsh7th/cmp-buffer"},
-      {"hrsh7th/cmp-path"},
-      {"saadparwaiz1/cmp_luasnip"},
-      {"hrsh7th/cmp-nvim-lsp"},
-      {"hrsh7th/cmp-nvim-lua"},
-
-      -- Snippets
-      {"L3MON4D3/LuaSnip"},
-      {"rafamadriz/friendly-snippets"},
-    }
-  }
+  use {"williamboman/mason.nvim"}
+  use {"neovim/nvim-lspconfig"}
+  use {"hrsh7th/nvim-cmp"}
+  use {"hrsh7th/cmp-buffer"}
+  use {"hrsh7th/cmp-path"}
+  use {"hrsh7th/cmp-nvim-lsp"}
+  use {"hrsh7th/cmp-nvim-lua"}
 
   use {"stevearc/oil.nvim"}
 
diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua
index 5b6e400..5a3ae43 100644
--- a/.config/nvim/lua/plugin/setup.lua
+++ b/.config/nvim/lua/plugin/setup.lua
@@ -4,6 +4,8 @@ require('gitsigns').setup {}
 
 require("Comment").setup {}
 
+require("mason").setup {}
+
 require("oil").setup {
   view_options = {
     show_hidden = true,