Merge remote-tracking branch 'origin/master' into refactor/builtins

4 files changed, 18 insertions, 9 deletions

diff --git a/lua/lvim/core/builtins/which-key.lua b/lua/lvim/core/builtins/which-key.lua
index cdfc91e4..70a24a27 100644
--- a/lua/lvim/core/builtins/which-key.lua
+++ b/lua/lvim/core/builtins/which-key.lua
@@ -286,6 +286,7 @@ M.config = function()
         t = { "<cmd>Telescope live_grep<cr>", "Text" },
         k = { "<cmd>Telescope keymaps<cr>", "Keymaps" },
         C = { "<cmd>Telescope commands<cr>", "Commands" },
+        l = { "<cmd>Telescope resume<cr>", "Resume last search" },
         p = {
           "<cmd>lua require('telescope.builtin').colorscheme({enable_preview = true})<cr>",
           "Colorscheme with Preview",
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 29311cfe..7128a4cc 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -40,6 +40,7 @@ local skipped_servers = {
   "stylelint_lsp",
   "svlangserver",
   "tflint",
+  "unocss",
   "verible",
   "vtsls",
   "vuels",
diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua
index b997b171..0fea876a 100644
--- a/lua/lvim/lsp/init.lua
+++ b/lua/lvim/lsp/init.lua
@@ -110,14 +110,6 @@ function M.setup()
     require("nlspsettings").setup(lvim.lsp.nlsp_settings.setup)
   end)
 
-  pcall(function()
-    require("mason-lspconfig").setup(lvim.lsp.installer.setup)
-
-    -- automatic_installation is handled by lsp-manager
-    local settings = require "mason-lspconfig.settings"
-    settings.current.automatic_installation = false
-  end)
-
   require("lvim.lsp.null-ls").setup()
 
   autocmds.configure_format_on_save()
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index b7976c5a..1278ed01 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -9,6 +9,13 @@ local core_plugins = {
   {
     "williamboman/mason-lspconfig.nvim",
     cmd = { "LspInstall", "LspUninstall" },
+    config = function()
+      require("mason-lspconfig").setup(lvim.lsp.installer.setup)
+
+      -- automatic_installation is handled by lsp-manager
+      local settings = require "mason-lspconfig.settings"
+      settings.current.automatic_installation = false
+    end,
     lazy = true,
     dependencies = "mason.nvim",
   },
@@ -120,7 +127,15 @@ local core_plugins = {
       vim.opt.rtp:prepend(path) -- treesitter needs to be before nvim's runtime in rtp
       require("lvim.core.builtins").setup "treesitter"
     end,
-    cmd = { "TSInstall", "TSUninstall", "TSUpdate", "TSInstallInfo", "TSInstallSync", "TSInstallFromGrammar" },
+    cmd = {
+      "TSInstall",
+      "TSUninstall",
+      "TSUpdate",
+      "TSUpdateSync",
+      "TSInstallInfo",
+      "TSInstallSync",
+      "TSInstallFromGrammar",
+    },
     event = "User FileOpened",
   },
   {