diff --git a/home/editors/nvim/default.nix b/home/editors/nvim/default.nix
index 43aafb5..59b84b9 100644
--- a/home/editors/nvim/default.nix
+++ b/home/editors/nvim/default.nix
@@ -32,9 +32,6 @@
         -- vim.cmd [[ :map <Right> <Nop> ]]
         -- vim.cmd [[ :map <Down> <Nop> ]]
 
-        -- Enable diagnostics virtual text
-        vim.diagnostic.config({ virtual_text = true })
-
         -- Add filetypes
         vim.filetype.add({
           pattern = {
diff --git a/home/editors/nvim/plugins/lsp/default.nix b/home/editors/nvim/plugins/lsp/default.nix
index 8f28858..cf27c9d 100644
--- a/home/editors/nvim/plugins/lsp/default.nix
+++ b/home/editors/nvim/plugins/lsp/default.nix
@@ -6,6 +6,10 @@
       lspkind = import ./lspkind.nix;
       lspconfig.enable = true;
       trouble.enable = true;
+      tiny-inline-diagnostic = {
+        enable = true;
+        settings.options.multilines.enabled = true;
+      };
     };
 
     keymaps = let
diff --git a/home/editors/nvim/plugins/utils/which-key/config.lua b/home/editors/nvim/plugins/utils/which-key/config.lua
index 835c76e..9547240 100644
--- a/home/editors/nvim/plugins/utils/which-key/config.lua
+++ b/home/editors/nvim/plugins/utils/which-key/config.lua
@@ -152,10 +152,7 @@ wk.add {
 	set_key.trouble("t", "todo", "Todo"),
 	set_key.trouble("q", "qflist", "QuickFix List"),
 	set_key.trouble("L", "loclist", "Location List"),
-  set_key.cmd("xv", function()
-    local current_value = vim.diagnostic.config().virtual_text
-    vim.diagnostic.config({ virtual_text = not current_value })
-  end, "Toggle virtual text"),
+  set_key.cmd("xv", "TinyInlineDiag toggle", "Toggle virtual text"),
 
 	--- LSP ---
 	set_key.trouble("l", "lsp", "LSP"),