2 files changed, 14 insertions, 10 deletions

diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua
index 4d56c9b..74ddb6c 100644
--- a/dotfiles/vim/lua/vim-dev.lua
+++ b/dotfiles/vim/lua/vim-dev.lua
@@ -78,12 +78,9 @@ vim.g.rustaceanvim = {
         },
 }
 
--- TODO: setup nvim-cmp completion score
-require("clangd_extensions").setup {
-        server = {
-                cmd = { vim.g.clangd_path },
-        }
-}
+-- clangd
+require("clangd_extensions.inlay_hints").setup_autocmd()
+require("clangd_extensions.inlay_hints").set_inlay_hints()
 
 require("neodev").setup({})
 
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index a8bdcbb..a49ca3d 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -117,11 +117,18 @@ in {
         rustaceanvim
       ];
 
-      variables = {
-        clangd_path = "${clang-tools}/bin/clangd";
-      };
-
       lsp = {
+        clangd = {
+          cmd = [
+            "${clang-tools}/bin/clangd"
+            "--background-index"
+            "--clang-tidy"
+            "--fallback-style=WebKit"
+            "--header-insertion-decorators"
+            "--header-insertion=iwyu"
+          ];
+          capabilities = luaFormat.lib.mkRaw ''vim.tbl_extend("force", capabilities, { offsetEncoding = "utf-8" })'';
+        };
         elixirls.cmd = ["${elixir_ls}/bin/elixir-ls"];
         hls.cmd = ["${haskell-language-server}/bin/haskell-language-server" "--lsp"];
         lua_ls = {