From 28b860ebdde6976a034adf2429ef082c54cc415e Mon Sep 17 00:00:00 2001
From: Brian Koech <brkoech@microsoft.com>
Date: Sun, 26 Nov 2023 08:11:59 +0300
Subject: [PATCH] Upgrade

---
 lazyvim.json                |  3 ++-
 lua/config/autocmds.lua     | 15 +++++++++++++++
 lua/config/lazy.lua         |  8 ++++++--
 lua/plugins/autocmds.lua    | 14 --------------
 lua/plugins/colorscheme.lua |  7 -------
 lua/plugins/lazy.lua        |  0
 lua/plugins/lsp.lua         | 19 +++++++++++++++++++
 7 files changed, 42 insertions(+), 24 deletions(-)
 delete mode 100644 lua/plugins/autocmds.lua
 delete mode 100644 lua/plugins/lazy.lua
 create mode 100644 lua/plugins/lsp.lua

diff --git a/lazyvim.json b/lazyvim.json
index b46ccb1..bb0c656 100644
--- a/lazyvim.json
+++ b/lazyvim.json
@@ -3,7 +3,8 @@
 
   ],
   "news": {
-    "NEWS.md": "2191"
+    "NEWS.md": "2191",
+    "doc/news.txt": "14314"
   },
   "version": 2
 }
\ No newline at end of file
diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua
index 27e9e06..db9b004 100644
--- a/lua/config/autocmds.lua
+++ b/lua/config/autocmds.lua
@@ -1,3 +1,18 @@
 -- Autocmds are automatically loaded on the VeryLazy event
 -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
 -- Add any additional autocmds here
+
+-- Turn off paste mode when leaving insert
+vim.api.nvim_create_autocmd("InsertLeave", {
+  pattern = "*",
+  command = "set nopaste",
+})
+
+-- Disable the concealing in some file formats
+-- The default conceallevel is 3 in LazyVim
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = { "json", "jsonc", "markdown" },
+  callback = function()
+    vim.opt.conceallevel = 0
+  end,
+})
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index e488a42..b53434e 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -9,7 +9,11 @@ vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
 require("lazy").setup({
   spec = {
     -- add LazyVim and import its plugins
-    { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+    {
+      "LazyVim/LazyVim",
+      import = "lazyvim.plugins",
+      opts = { colorscheme = "gruvbox", news = { lazyvim = true, neovim = true } },
+    },
     -- import any extras modules here
     { import = "lazyvim.plugins.extras.lang.typescript" },
     { import = "lazyvim.plugins.extras.lang.json" },
@@ -28,7 +32,7 @@ require("lazy").setup({
     version = false, -- always use the latest git commit
     -- version = "*", -- try installing the latest stable version for plugins that support semver
   },
-  install = { colorscheme = { "tokyonight", "habamax" } },
+  install = { colorscheme = { "tokyonight", "habamax", "gruvbox" } },
   checker = { enabled = true }, -- automatically check for plugin updates
   performance = {
     rtp = {
diff --git a/lua/plugins/autocmds.lua b/lua/plugins/autocmds.lua
deleted file mode 100644
index f1005ba..0000000
--- a/lua/plugins/autocmds.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- Turn off paste mode when leaving insert
-vim.api.nvim_create_autocmd("InsertLeave", {
-  pattern = "*",
-  command = "set nopaste",
-})
-
--- Disable the concealing in some file formats
--- The default conceallevel is 3 in LazyVim
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = { "json", "jsonc", "markdown" },
-  callback = function()
-    vim.opt.conceallevel = 0
-  end,
-})
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index 656b767..a80d3cc 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -24,13 +24,6 @@ return {
       },
     },
   },
-
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "gruvbox",
-    },
-  },
   {
     "folke/zen-mode.nvim",
     opts = {
diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
new file mode 100644
index 0000000..5602abf
--- /dev/null
+++ b/lua/plugins/lsp.lua
@@ -0,0 +1,19 @@
+return {
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "stylua",
+        "shellcheck",
+        "shfmt",
+        "flake8",
+        "selene",
+        "luacheck",
+        "tailwindcss-language-server",
+        "typescript-language-server",
+        "css-lsp",
+      },
+    },
+  },
+  -- lsp servers
+}