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

7 files changed, 34 insertions, 19 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",
   },
   {
diff --git a/snapshots/default.json b/snapshots/default.json
index 2c6e2803..7052ab33 100644
--- a/snapshots/default.json
+++ b/snapshots/default.json
@@ -21,7 +21,7 @@
     "commit": "23c51b2"
   },
   "cmp-nvim-lsp": {
-    "commit": "5922477"
+    "commit": "0e6b2ed"
   },
   "cmp-path": {
     "commit": "91ff86c"
@@ -54,19 +54,19 @@
     "commit": "53f3a8b"
   },
   "mason.nvim": {
-    "commit": "4952a48"
+    "commit": "357ef66"
   },
   "neodev.nvim": {
-    "commit": "547ef44"
+    "commit": "b3b22cf"
   },
   "nlsp-settings.nvim": {
-    "commit": "b1e2c55"
+    "commit": "d0b7caa"
   },
   "null-ls.nvim": {
-    "commit": "8f5d730"
+    "commit": "60b4a71"
   },
   "nvim-autopairs": {
-    "commit": "0e065d4"
+    "commit": "28f57e6"
   },
   "nvim-cmp": {
     "commit": "cfafe0a"
@@ -75,7 +75,7 @@
     "commit": "0e376f0"
   },
   "nvim-dap-ui": {
-    "commit": "885e958"
+    "commit": "6f18751"
   },
   "nvim-lspconfig": {
     "commit": "d3c82d2"
@@ -87,13 +87,13 @@
     "commit": "02fdc26"
   },
   "nvim-treesitter": {
-    "commit": "d3a6872"
+    "commit": "df6f322"
   },
   "nvim-ts-context-commentstring": {
     "commit": "a0f8956"
   },
   "nvim-web-devicons": {
-    "commit": "2b96193"
+    "commit": "ade34ca"
   },
   "onedarker.nvim": {
     "commit": "b00dd21"
@@ -108,7 +108,7 @@
     "commit": "685bc8e"
   },
   "schemastore.nvim": {
-    "commit": "5c5723b"
+    "commit": "fd5ddd8"
   },
   "structlog.nvim": {
     "commit": "45b26a2"
diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua
index a1b2c9c9..52c99b8b 100644
--- a/utils/installer/config.example.lua
+++ b/utils/installer/config.example.lua
@@ -44,6 +44,9 @@ lvim.builtin.treesitter.auto_install = true
 
 -- lvim.builtin.treesitter.ignore_install = { "haskell" }
 
+-- -- always installed on startup, useful for parsers without a strict filetype
+-- lvim.builtin.treesitter.ensure_installed = { "comment", "markdown_inline", "regex" }
+
 -- -- generic LSP settings <https://www.lunarvim.org/docs/languages#lsp-support>
 
 -- --- disable automatic installation of servers
diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua
index 3467c86e..f8d3e856 100644
--- a/utils/installer/config_win.example.lua
+++ b/utils/installer/config_win.example.lua
@@ -66,6 +66,9 @@ lvim.builtin.treesitter.auto_install = true
 
 -- lvim.builtin.treesitter.ignore_install = { "haskell" }
 
+-- -- ensure these parsers are always installed, useful for those without a strict filetype
+-- lvim.builtin.treesitter.ensure_installed = { "comment", "markdown_inline", "regex" }
+
 -- -- generic LSP settings <https://www.lunarvim.org/docs/languages#lsp-support>
 
 -- --- disable automatic installation of servers