Merge remote-tracking branch 'origin/main' into customize

# Conflicts:
#	lua/plugins/init.lua

README.md

@@ -1,4 +1,4 @@
-**This repo is supposed to used as config by NvChad users!**
+**This repo is supposed to be used as config by NvChad users!**
 
 - The main nvchad repo (NvChad/NvChad) is used as a plugin by this repo.
 - So you just import its modules , like `require "nvchad.options" , require "nvchad.mappings"`

init.lua

@@ -30,7 +30,7 @@ dofile(vim.g.base46_cache .. "defaults")
 dofile(vim.g.base46_cache .. "statusline")
 
 require "options"
-require "nvchad.autocmds"
+require "autocmds"
 
 vim.schedule(function()
   require "mappings"

lua/autocmds.lua

@@ -0,0 +1 @@
+require "nvchad.autocmds"

lua/chadrc.lua

@@ -14,4 +14,11 @@ M.base46 = {
 	-- },
 }
 
+-- M.nvdash = { load_on_startup = true }
+-- M.ui = {
+--       tabufline = {
+--          lazyload = false
+--      }
+-- }
+
 return M

lua/configs/lspconfig.lua

@@ -1,24 +1,6 @@
--- load defaults i.e lua_lsp
 require("nvchad.configs.lspconfig").defaults()
 
-local lspconfig = require "lspconfig"
-
--- EXAMPLE
 local servers = { "html", "cssls" }
-local nvlsp = require "nvchad.configs.lspconfig"
+vim.lsp.enable(servers)
 
--- lsps with default config
+-- read :h vim.lsp.config for changing options of lsp servers 
-for _, lsp in ipairs(servers) do
-  lspconfig[lsp].setup {
-    on_attach = nvlsp.on_attach,
-    on_init = nvlsp.on_init,
-    capabilities = nvlsp.capabilities,
-  }
-end
-
--- configuring single server, example: typescript
--- lspconfig.ts_ls.setup {
---   on_attach = nvlsp.on_attach,
---   on_init = nvlsp.on_init,
---   capabilities = nvlsp.capabilities,
--- }

lua/plugins/init.lua

@@ -68,7 +68,7 @@ return {
     "lewis6991/gitsigns.nvim",
     opts = {
       preview_config = {
-        border = "rounded",  -- Options: "single", "double", "rounded", "solid", "shadow"
+        border = "rounded",
         style = "minimal",
         relative = "cursor",
         row = 0,
@@ -85,13 +85,4 @@ return {
       require("mason").setup()
     end,
   },
-  -- {
-  -- 	"nvim-treesitter/nvim-treesitter",
-  -- 	opts = {
-  -- 		ensure_installed = {
-  -- 			"vim", "lua", "vimdoc",
-  --      "html", "css"
-  -- 		},
-  -- 	},
-  -- },
 }