feat(nvim): sync plugins

alexiszamanidis · Nov 19, 2023 · be8f0bb · be8f0bb
1 parent a721a96
commit be8f0bb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/nvim/.config/nvim/after/plugin/lsp.lua b/nvim/.config/nvim/after/plugin/lsp.lua
@@ -23,25 +23,36 @@ local cmp_mappings = lsp.defaults.cmp_mappings({
 -- cmp_mappings["<Tab>"] = nil
 -- cmp_mappings["<S-Tab>"] = nil
 
-lsp.setup_nvim_cmp({
+local cmp = require("cmp")
+local cmp_action = lsp.cmp_action()
+
+cmp.setup({
     mapping = cmp_mappings,
 })
 
-lsp.ensure_installed({
-    "cssls",
-    "cssmodules_ls",
-    "html",
-    "jsonls",
-    "tsserver",
-    "lua_ls",
-    "yamlls",
-    "bashls",
-    "prismals",
-    "jdtls",
+require("mason").setup({})
+require("mason-lspconfig").setup({
+    -- Replace the language servers listed here
+    -- with the ones you want to install
+    ensure_installed = {
+        "cssls",
+        "cssmodules_ls",
+        "html",
+        "jsonls",
+        "tsserver",
+        "lua_ls",
+        "yamlls",
+        "bashls",
+        "prismals",
+        "jdtls",
+    },
+    handlers = {
+        lsp.default_setup,
+    },
 })
 
 -- Fix Undefined global 'vim'
-lsp.nvim_workspace()
+lsp.nvim_lua_ls()
 
 lsp.set_preferences({
     suggest_lsp_servers = false,

diff --git a/nvim/.config/nvim/after/plugin/nvim-tree.lua b/nvim/.config/nvim/after/plugin/nvim-tree.lua
@@ -4,14 +4,6 @@ if not status_ok then
     return
 end
 
-local config_status_ok, nvim_tree_config = pcall(require, "nvim-tree.config")
-if not config_status_ok then
-    vim.notify("nvim-tree.config not found!")
-    return
-end
-
-local tree_cb = nvim_tree_config.nvim_tree_callback
-
 nvim_tree.setup({
     hijack_directories = {
         enable = false,
@@ -119,7 +111,6 @@ nvim_tree.setup({
     },
     view = {
         adaptive_size = true,
-        hide_root_folder = false,
         side = "left",
         -- auto_resize = true,
         number = false,