summaryrefslogtreecommitdiff
path: root/.config/nvim/lua/configs
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua/configs')
-rw-r--r--.config/nvim/lua/configs/conform.lua10
-rw-r--r--.config/nvim/lua/configs/lspconfig.lua13
-rw-r--r--.config/nvim/lua/configs/vimtex.lua5
3 files changed, 10 insertions, 18 deletions
diff --git a/.config/nvim/lua/configs/conform.lua b/.config/nvim/lua/configs/conform.lua
index 80c68991..24342a6e 100644
--- a/.config/nvim/lua/configs/conform.lua
+++ b/.config/nvim/lua/configs/conform.lua
@@ -1,13 +1,11 @@
local options = {
formatters_by_ft = {
+ css = { "prettier" },
+ html = { "prettier" },
python = { "ruff_format" },
- rust = { "rustfmt" },
- lua = { "stylua" },
cpp = { "clang-format" },
c = { "clang-format" },
- css = { "prettier" },
- html = { "prettier" },
- scala = { "scalafmt" },
+ typst = { "typstyle" },
},
format_on_save = {
timeout_ms = 500,
@@ -15,4 +13,4 @@ local options = {
},
}
-require("conform").setup(options)
+return options
diff --git a/.config/nvim/lua/configs/lspconfig.lua b/.config/nvim/lua/configs/lspconfig.lua
index b5379bb6..b685abd9 100644
--- a/.config/nvim/lua/configs/lspconfig.lua
+++ b/.config/nvim/lua/configs/lspconfig.lua
@@ -1,14 +1,13 @@
-local on_attach = require("nvchad.configs.lspconfig").on_attach
-local on_init = require("nvchad.configs.lspconfig").on_init
-local capabilities = require("nvchad.configs.lspconfig").capabilities
+require("nvchad.configs.lspconfig").defaults()
local lspconfig = require("lspconfig")
-local servers = { "pylsp", "clangd", "cssls", "rust_analyzer", "texlab" }
+local servers = { "html", "cssls", "pylsp", "clangd", "tinymist" }
+local nvlsp = require("nvchad.configs.lspconfig")
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup({
- on_attach = on_attach,
- on_init = on_init,
- capabilities = capabilities,
+ on_attach = nvlsp.on_attach,
+ on_init = nvlsp.on_init,
+ capabilities = nvlsp.capabilities,
})
end
diff --git a/.config/nvim/lua/configs/vimtex.lua b/.config/nvim/lua/configs/vimtex.lua
deleted file mode 100644
index c25558d5..00000000
--- a/.config/nvim/lua/configs/vimtex.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.g.tex_flavor='latex'
-vim.g.vimtex_view_method='zathura'
-vim.g.vimtex_quickfix_mode=0
-vim.opt.conceallevel = 1
-vim.g.tex_conceal='abdmg'