lua/nvchad/autocmds.lua

@@ -21,7 +21,6 @@ autocmd("BufWritePost", {
     local module = string.gsub(fp, "^.*/" .. app_name .. "/lua/", ""):gsub("/", ".")
 
     require("plenary.reload").reload_module "nvconfig"
-    require("plenary.reload").reload_module "chadrc"
     require("plenary.reload").reload_module "base46"
     require("plenary.reload").reload_module(module)
 

lua/nvchad/configs/lspconfig.lua

@@ -37,7 +37,7 @@ end
 
 -- disable semanticTokens
 M.on_init = function(client, _)
-  if client.supports_method "textDocument/semanticTokens" then
+  if not conf.semantic_tokens and client.supports_method "textDocument/semanticTokens" then
     client.server_capabilities.semanticTokensProvider = nil
   end
 end
@@ -80,8 +80,6 @@ M.defaults = function()
           library = {
             [vim.fn.expand "$VIMRUNTIME/lua"] = true,
             [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
-            [vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true,
-            [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true,
           },
           maxPreload = 100000,
           preloadFileSize = 10000,

lua/nvchad/mappings.lua

@@ -21,11 +21,11 @@ map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "Toggle Line number" })
 map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "Toggle Relative number" })
 map("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "Toggle NvCheatsheet" })
 
-map("n", "<leader>fm", function()
-  require("conform").format { lsp_fallback = true }
-end, { desc = "Format Files" })
-
 -- global lsp mappings
+map("n", "<leader>fm", function()
+  vim.lsp.buf.format { async = true }
+end, { desc = "Lsp formatting" })
+
 map("n", "<leader>lf", vim.diagnostic.open_float, { desc = "Lsp floating diagnostics" })
 map("n", "[d", vim.diagnostic.goto_prev, { desc = "Lsp prev diagnostic" })
 map("n", "]d", vim.diagnostic.goto_next, { desc = "Lsp next diagnostic" })

lua/nvchad/plugins/init.lua

@@ -2,19 +2,6 @@ return {
 
   "nvim-lua/plenary.nvim",
 
-  -- formatting!
-  {
-    "stevearc/conform.nvim",
-    opts = {
-      formatters_by_ft = {
-        lua = { "stylua" },
-      },
-    },
-    config = function(_, opts)
-      require("conform").setup(opts)
-    end,
-  },
-
   {
     "nvim-treesitter/nvim-treesitter",
     event = { "BufReadPost", "BufNewFile" },

lua/nvchad/plugins/ui.lua

@@ -20,7 +20,6 @@ return {
   {
     "NvChad/nvim-colorizer.lua",
     event = "User FilePost",
-    opts = { user_default_options = { names = false } },
     config = function(_, opts)
       require("colorizer").setup(opts)
 

lua/nvconfig.lua

@@ -63,10 +63,13 @@ M.ui = {
 
   cheatsheet = { theme = "grid" }, -- simple/grid
 
-  lsp = { signature = true },
+  lsp = {
+    signature = true,
+    semantic_tokens = false,
+  },
 
   term = {
-    hl = "Normal:term,WinSeparator:WinSeparator",
+    -- hl = "Normal:term,WinSeparator:WinSeparator",
     sizes = { sp = 0.3, vsp = 0.2 },
     float = {
       relative = "editor",
@@ -80,7 +83,24 @@ M.ui = {
 }
 
 M.base46 = {
-  integrations = {},
+  integrations = {
+    "blankline",
+    "cmp",
+    "defaults",
+    "devicons",
+    "git",
+    "lsp",
+    "mason",
+    "nvcheatsheet",
+    "nvdash",
+    "nvimtree",
+    "statusline",
+    "syntax",
+    "treesitter",
+    "tbline",
+    "telescope",
+    "whichkey",
+  },
 }
 
 return vim.tbl_deep_extend("force", M, require "chadrc")