diff --git a/config/config.nix b/config/config.nix
index 67721ac..c715570 100644
--- a/config/config.nix
+++ b/config/config.nix
@@ -43,5 +43,6 @@
 
   diagnostic.settings = {
     virtual_text = false;
+    virtual_line = true;
   };
 }
diff --git a/config/keys.nix b/config/keys.nix
index 6771318..f8d075a 100644
--- a/config/keys.nix
+++ b/config/keys.nix
@@ -108,6 +108,25 @@
         desc = "Toggle terminal";
       };
     }
+
+    # trouble.nvim
+    {
+      mode = "n";
+      action = "<cmd>Trouble diagnostics toggle<cr>";
+      key = "<Leader>xx";
+      options = {
+        desc = "Diagnostics (Trouble)";
+      };
+    }
+
+    {
+      mode = "n";
+      action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
+      key = "<Leader>xX";
+      options = {
+        desc = "Buffer Diagnostics (Trouble)";
+      };
+    }
   ];
 
   plugins.fzf-lua.keymaps = {
diff --git a/config/plugins.nix b/config/plugins.nix
index 2e7dd79..27287bc 100644
--- a/config/plugins.nix
+++ b/config/plugins.nix
@@ -159,5 +159,15 @@
     toggleterm = {
       enable = true;
     };
+    trouble = {
+      enable = true;
+      settings = {
+        auto_jump = true;
+        auto_refresh = true;
+      };
+    };
+    todo-comments = {
+      enable = true;
+    };
   };
 }