diff --git a/home/programs/neovim/lua/plugins/conform-nvim.lua b/home/programs/neovim/lua/plugins/conform-nvim.lua index 1ee079c..9e9ad45 100644 --- a/home/programs/neovim/lua/plugins/conform-nvim.lua +++ b/home/programs/neovim/lua/plugins/conform-nvim.lua @@ -31,6 +31,8 @@ return { yaml = { "prettierd" }, nix = { "nixfmt" }, tex = { "latexindent" }, + c = { "clang_format" }, + cpp = { "clang_format" }, ["*"] = { "codespell" }, ["_"] = { "trim_whitespace" }, }, @@ -47,9 +49,11 @@ return { inherit = true, prepend_args = { "-y=\"defaultIndent:' '\"" }, }, + clang_format = { + prepend_args = { "--style=~/.config/.clang-format" }, + }, }, }) end, }, } - diff --git a/home/programs/neovim/lua/plugins/nvim-lspconfig.lua b/home/programs/neovim/lua/plugins/nvim-lspconfig.lua index bc01912..f07d6e4 100644 --- a/home/programs/neovim/lua/plugins/nvim-lspconfig.lua +++ b/home/programs/neovim/lua/plugins/nvim-lspconfig.lua @@ -70,7 +70,7 @@ return { on_attach = on_attach, }) lspconfig["hls"].setup({ - filetypes = { 'haskell', 'lhaskell', 'cabal' }, + filetypes = { "haskell", "lhaskell", "cabal" }, capabilities = capabilities, on_attach = on_attach, }) @@ -86,7 +86,7 @@ return { capabilities = capabilities, on_attach = on_attach, }) - lspconfig["ruff_lsp"].setup({ + lspconfig["ruff"].setup({ capabilities = capabilities, on_attach = on_attach, })