diff --git a/fnl/plugin.fnl b/fnl/plugin.fnl
index d9dcbde..3d95895 100644
--- a/fnl/plugin.fnl
+++ b/fnl/plugin.fnl
@@ -139,6 +139,15 @@
           (module-call! :telescope :load_extension :ui-select)
           (module-call! :telescope :load_extension :fzf)))
 
+  ;; Trouble
+  (use! :folke/trouble.nvim
+        :cmd [ :Trouble
+               :TroubleToggle
+               :TroubleClose
+               :TroubleRefresh ]
+        :config
+        (setup! :trouble))
+
   ;; Nvim surround
   (use! :kylechui/nvim-surround
         :config
@@ -189,17 +198,18 @@
   ;; illuminate (same symbol highlight)
   (use! :RRethy/vim-illuminate
         :config
-        (module-call! :illuminate :configure)
-        { :providers [
-            "lsp"
-            "treesitter"
-            "ragex" ]
-          :modes_denylist [
-            :markdown
-            :text
-            :gitconfig
-            :gitignore ]
-          :delay 0 }
+        (module-call! :illuminate
+                      :configure { :providers [
+                                     "lsp"
+                                     "treesitter"
+                                     "ragex" ]
+                                   :filetypes_denylist [
+                                     :Trouble
+                                     :markdown
+                                     :text
+                                     :gitconfig
+                                     :gitignore ]
+                                   :delay 0 })
         (hook! :FileType :lua #(vim.api.nvim_set_hl 0
                                                     :IlluminatedWordText
                                                     {})))
diff --git a/fnl/plugin/lsp.fnl b/fnl/plugin/lsp.fnl
index 3addbee..049fe67 100644
--- a/fnl/plugin/lsp.fnl
+++ b/fnl/plugin/lsp.fnl
@@ -35,7 +35,11 @@
   (bind! :n :gr "<cmd>Telescope lsp_references<cr>" buf)
   (bind! :n :gd "<cmd>Telescope lsp_definitions<cr>" buf)
   (bind! :n :gI "<cmd>Telescope lsp_implementations<cr>" buf)
-  (bind! :n :D "<cmd>Telescope lsp_type_definitions<cr>" buf))
+  (bind! :n :D "<cmd>Telescope lsp_type_definitions<cr>" buf)
+
+  ;; Some trouble commands
+  (bind! :n :<leader>e "<cmd>TroubleToggle document_diagnostics<cr>")
+  (bind! :n :<leader>E "<cmd>TroubleToggle workspace_diagnostics<cr>"))
 
 
 (fn get-data-dir [server root]