From 98fb64764fd4bfabc93d5c3b9d1d26d38d8828d6 Mon Sep 17 00:00:00 2001
From: LostNeophyte <lostneophyte@tuta.io>
Date: Tue, 7 Feb 2023 17:30:14 +0100
Subject: fix(lsp): lazy loading (#3824)

---
 lua/lvim/lsp/init.lua |  8 --------
 lua/lvim/plugins.lua  | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'lua/lvim')

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 d2efaf33..a1ed58f1 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",
   },
@@ -122,7 +129,15 @@ local core_plugins = {
       vim.opt.rtp:prepend(path) -- treesitter needs to be before nvim's runtime in rtp
       require("lvim.core.treesitter").setup()
     end,
-    cmd = { "TSInstall", "TSUninstall", "TSUpdate", "TSInstallInfo", "TSInstallSync", "TSInstallFromGrammar" },
+    cmd = {
+      "TSInstall",
+      "TSUninstall",
+      "TSUpdate",
+      "TSUpdateSync",
+      "TSInstallInfo",
+      "TSInstallSync",
+      "TSInstallFromGrammar",
+    },
     event = "User FileOpened",
   },
   {
-- 
cgit v1.2.3


From 4bcf9d75a1133593d98ff87027373544743785dd Mon Sep 17 00:00:00 2001
From: LostNeophyte <lostneophyte@tuta.io>
Date: Wed, 8 Feb 2023 09:40:32 +0100
Subject: feat(which-key): keybind for `:Telescope resume` (#3826)

---
 lua/lvim/core/which-key.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lua/lvim')

diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index ea79f03b..0e671782 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -287,6 +287,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",
-- 
cgit v1.2.3


From c27d6a6c3e3aafc66e32cb3640876197ffab4da5 Mon Sep 17 00:00:00 2001
From: LostNeophyte <lostneophyte@tuta.io>
Date: Fri, 10 Feb 2023 20:39:42 +0100
Subject: chore(lsp): add unocss to skipped_list (#3834)

---
 lua/lvim/lsp/config.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lua/lvim')

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",
-- 
cgit v1.2.3