diff --git a/nvim/lua/plugins/lsp/ls/c.lua b/nvim/lua/plugins/lsp/ls/c.lua index d35145e..b6bbaaf 100644 --- a/nvim/lua/plugins/lsp/ls/c.lua +++ b/nvim/lua/plugins/lsp/ls/c.lua @@ -3,8 +3,7 @@ -- └ ┘ local lsp = vim.lsp -local capabilities = require("lsp-options").capabilities -local on_attach = require("lsp-options").on_attach +local opts = require("lsp-options") lsp.config("clangd", { cmd = { @@ -13,13 +12,13 @@ lsp.config("clangd", { "--clang-tidy", }, filetypes = { "c", "cpp", "objc", "objcpp", "cuda", "proto", "ino" }, - capabilities = capabilities, - on_attach = on_attach, + capabilities = opts.capabilities, + on_attach = opts.on_attach_no_formatting, }) lsp.config("cmake", { - capabilities = capabilities, - on_attach = on_attach, + capabilities = opts.capabilities, + on_attach = opts.on_attach, }) -- ── Enable configs ─────────────────────────────────────────────── diff --git a/nvim/lua/plugins/lsp/none-ls.lua b/nvim/lua/plugins/lsp/none-ls.lua index eb8e94f..9b6fdc3 100755 --- a/nvim/lua/plugins/lsp/none-ls.lua +++ b/nvim/lua/plugins/lsp/none-ls.lua @@ -53,6 +53,7 @@ return { require("none-ls.code_actions.eslint_d"), require("none-ls.formatting.eslint_d"), null_ls.builtins.formatting.black, + null_ls.builtins.formatting.clang_format }, }) end,