diff --git a/lua/config/set.lua b/lua/config/set.lua index 34be1da..5f38dfd 100644 --- a/lua/config/set.lua +++ b/lua/config/set.lua @@ -42,3 +42,10 @@ vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, { vim.bo.filetype = "asm" end, }) + +vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, { + pattern = "*.h", + callback = function() + vim.bo.filetype = "c" + end, +}) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index 66d4442..1ee7b15 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -11,6 +11,7 @@ return { "rustfmt", }, scala = {}, + c = { "uncrustify" }, }, format_on_save = { timeout_ms = 500, @@ -20,6 +21,9 @@ return { vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" + conform.formatters.uncrustify = { + prepend_args = { "-c", "/home/albin/coding-projects/uncrustify.cfg" }, + } conform.formatters.rustfmt = { prepend_args = { "--config-path", "/home/albin/coding-projects/rustfmt.toml" }, } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 514ee0b..5df35e3 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -37,6 +37,7 @@ return { -- CLANGD vim.lsp.config("clangd", { capabilities = capabilities }) + vim.lsp.enable("clangd") -- vim.lsp.config("ocamllsp", { capabilities = capabilities }) -- vim.lsp.config("r_language_server", { capabilities = capabilities }) @@ -62,6 +63,11 @@ return { vim.lsp.config("wgsl_analyzer", { capabilities = capabilities }) vim.lsp.enable("wgsl_analyzer") + vim.lsp.config("hls", { + filetypes = { "haskell", "lhaskell", "cabal" }, + }) + vim.lsp.enable("hls") + local hl_groups = { "DiagnosticUnderlineError", "DiagnosticUnderlineWarn",