diff --git a/lua/znvim/plugins/editor.lua b/lua/znvim/plugins/editor.lua
index d45699f..5081837 100644
--- a/lua/znvim/plugins/editor.lua
+++ b/lua/znvim/plugins/editor.lua
@@ -163,8 +163,80 @@ return {
             },
         },
     },
-
-
+    { -- better diagnostics list and others
+        "https://github.com/folke/trouble.nvim",
+        cmd = "Trouble",
+        keys = {
+            {
+                "<leader>xx",
+                "<cmd>Trouble diagnostics toggle<cr>",
+                desc = "Diagnostics (Trouble)",
+            },
+            {
+                "<leader>xX",
+                "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+                desc = "Buffer Diagnostics (Trouble)",
+            },
+            {
+                "<leader>cs",
+                "<cmd>Trouble symbols toggle focus=false<cr>",
+                desc = "Symbols (Trouble)",
+            },
+            {
+                "<leader>cl",
+                "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+                desc = "LSP Definitions / references / ... (Trouble)",
+            },
+            {
+                "<leader>xL",
+                "<cmd>Trouble loclist toggle<cr>",
+                desc = "Location List (Trouble)",
+            },
+            {
+                "<leader>xQ",
+                "<cmd>Trouble qflist toggle<cr>",
+                desc = "Quickfix List (Trouble)",
+            },
+        },
+        opts = {
+            use_diagnostic_signs = true,
+        },
+    },
+    { -- todo comments
+        "https://github.com/folke/todo-comments.nvim",
+        dependencies = {
+            "https://github.com/nvim-lua/plenary.nvim",
+        },
+        cmd = { "TodoTrouble", "TodoTelescope" },
+        event = "BufReadPost",
+        keys = {
+            {
+                "]t",
+                function()
+                    require("todo-comments").jump_next()
+                end,
+                desc = "next todo comment",
+            },
+            {
+                "[t",
+                function()
+                    require("todo-comments").jump_prev()
+                end,
+                desc = "previous todo comment",
+            },
+            {
+                "<leader>xt",
+                "<cmd>TodoTrouble<cr>",
+                desc = "todo (trouble)"
+            },
+            {
+                "<leader>xT",
+                "<cmd>TodoTelescope<cr>",
+                desc = "todo (telescope)"
+            },
+        },
+        config = true,
+    },
     { -- better folding
         "https://github.com/kevinhwang91/nvim-ufo",
         dependencies = {