Merge with upstream

2025-01-05 18:48:43 +01:00
parent 9bce0ad153
commit 84d2e3c61c
6 changed files with 27 additions and 19 deletions
--- a/lua/configs/conform.lua
+++ b/lua/configs/conform.lua
@@ -12,4 +12,4 @@ local options = {
  -- },
 }

-require("conform").setup(options)
+return options
--- a/lua/configs/lspconfig.lua
+++ b/lua/configs/lspconfig.lua
@@ -1,3 +1,5 @@
+-- load defaults i.e lua_lsp
+require("nvchad.configs.lspconfig").defaults()
 local lspconfig = require("lspconfig")

 lspconfig.pylsp.setup{