From db4867acb939b548cf3c60641e1661783551248d Mon Sep 17 00:00:00 2001
From: Tomas Gareau <tggareau@gmail.com>
Date: Tue, 7 Jan 2025 09:44:29 -0600
Subject: [PATCH 1/4] fix: prevent mason setup from being run twice (#1298)

* fix: prevent mason setup from being run twice

Addresses https://github.com/nvim-lua/kickstart.nvim/issues/1297

Currently, we're calling `require('mason').setup(...)` twice:
* once when setting it as a dependency of `nvim-lspconfig` (since we set
	`config = true`)
* once in the `config` function we define for `nvim-lspconfig`

Calling setup twice can cause issues with, e.g., setting the `PATH`
option: you might append Mason's bin dir in one setup call and prepend
it in the other.

We've kept the setup of `mason` in the `nvim-lspconfig` dependencies
table since leaving it to the `config` function caused some
plugin-loading-order related issues in the past. See:
* https://github.com/nvim-lua/kickstart.nvim/pull/210
* https://github.com/nvim-lua/kickstart.nvim/issues/554
* https://github.com/nvim-lua/kickstart.nvim/pull/555
* https://github.com/nvim-lua/kickstart.nvim/pull/865

* docs: tweak comments per review feedback
---
 init.lua | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/init.lua b/init.lua
index 7758df93..610018e8 100644
--- a/init.lua
+++ b/init.lua
@@ -457,7 +457,9 @@ require('lazy').setup({
     'neovim/nvim-lspconfig',
     dependencies = {
       -- Automatically install LSPs and related tools to stdpath for Neovim
-      { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
+      -- Mason must be loaded before its dependents so we need to set it up here.
+      -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
+      { 'williamboman/mason.nvim', opts = {} },
       'williamboman/mason-lspconfig.nvim',
       'WhoIsSethDaniel/mason-tool-installer.nvim',
 
@@ -646,13 +648,16 @@ require('lazy').setup({
       }
 
       -- Ensure the servers and tools above are installed
-      --  To check the current status of installed tools and/or manually install
-      --  other tools, you can run
+      --
+      -- To check the current status of installed tools and/or manually install
+      -- other tools, you can run
       --    :Mason
       --
-      --  You can press `g?` for help in this menu.
-      require('mason').setup()
-
+      -- You can press `g?` for help in this menu.
+      --
+      -- `mason` had to be setup earlier: to configure its options see the
+      -- `dependencies` table for `nvim-lspconfig` above.
+      --
       -- You can add other tools here that you want Mason to install
       -- for you, so that they are available from within Neovim.
       local ensure_installed = vim.tbl_keys(servers or {})

From f6abf682fffba362ff4c6f8157ef72822adda289 Mon Sep 17 00:00:00 2001
From: Nhan Luu <62146587+nhld@users.noreply.github.com>
Date: Thu, 16 Jan 2025 02:37:03 +0700
Subject: [PATCH 2/4] chore: remove redundant comment (#1307)

---
 init.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.lua b/init.lua
index 610018e8..edbc3783 100644
--- a/init.lua
+++ b/init.lua
@@ -464,7 +464,6 @@ require('lazy').setup({
       'WhoIsSethDaniel/mason-tool-installer.nvim',
 
       -- Useful status updates for LSP.
-      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
       { 'j-hui/fidget.nvim', opts = {} },
 
       -- Allows extra capabilities provided by nvim-cmp

From ff89769e4583b4f2c170df0d8ccacb950d5dd4e6 Mon Sep 17 00:00:00 2001
From: Nhan Luu <62146587+nhld@users.noreply.github.com>
Date: Thu, 16 Jan 2025 02:37:36 +0700
Subject: [PATCH 3/4] chore: fix typo in bug report issue template (#1306)

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 55b45b0d..86598b8d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ assignees: ''
 
 ## Before Reporting an Issue
 - I have read the kickstart.nvim README.md.
-- I have read the appropiate plugin's documentation.
+- I have read the appropriate plugin's documentation.
 - I have searched that this issue has not been reported before.
 
 - [ ] **By checking this, I confirm that the above steps are completed. I understand leaving this unchecked will result in this report being closed immediately.**

From 5bdde24dfb353d365d908c5dd700f412ed2ffb17 Mon Sep 17 00:00:00 2001
From: Diorman Colmenares <229201+diorman@users.noreply.github.com>
Date: Wed, 15 Jan 2025 11:38:26 -0800
Subject: [PATCH 4/4] Use luals 3rd library for luv (#1303)

---
 init.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/init.lua b/init.lua
index edbc3783..4eae8e7d 100644
--- a/init.lua
+++ b/init.lua
@@ -447,11 +447,10 @@ require('lazy').setup({
     opts = {
       library = {
         -- Load luvit types when the `vim.uv` word is found
-        { path = 'luvit-meta/library', words = { 'vim%.uv' } },
+        { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
       },
     },
   },
-  { 'Bilal2453/luvit-meta', lazy = true },
   {
     -- Main LSP Configuration
     'neovim/nvim-lspconfig',