diff --git a/init.lua b/init.lua
index ec9fdd2..7b5ebbf 100644
--- a/init.lua
+++ b/init.lua
@@ -39,6 +39,7 @@ vim.pack.add({
     { src = "https://github.com/romgrk/barbar.nvim" },
     { src = "https://github.com/nvim-tree/nvim-web-devicons" },
     { src = "https://github.com/lewis6991/gitsigns.nvim" },
+    { src = "https://github.com/folke/trouble.nvim" },
 })
 
 vim.cmd("colorscheme gruvbox")
@@ -62,6 +63,7 @@ require("lualine").setup {
 require("typst-preview").setup()
 require("nvim-lightbulb").setup({ autocmd = { enabled = true } })
 require("autoclose").setup()
+require("trouble").setup()
 
 -- PLUGINS END --
 
@@ -190,54 +192,41 @@ map.set("n", "<leader>gD", vim.lsp.buf.declaration)
 map.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Code Action" })
 map.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "Rename symbol" })
 
+map.set("n", "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>", { desc = "Diagnostics (Trouble)" })
+map.set("n", "<leader>xX", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>", { desc = "Buffer Diagnostics (Trouble)" })
+
 map.set("n", "<C-f>", ":Pick files<CR>")
 map.set("n", "<C-g>", ":Pick grep_live<CR>")
 map.set("n", "<C-h>", ":Pick help<CR>")
 map.set("n", "<C-e>", ":Oil<CR>")
 
-map.set("n", "<leader>dg", function()
-    vim.diagnostic.setqflist()
-    vim.cmd("copen")
-end, { desc = "Show diagnostics in quickfix list" })
-map.set("n", "<leader>qf>", function()
-    local qf_win = vim.fn.getwininfo(vim.fn.getqflist({ winid = 0 }).winid)
-    if not qf_win or #qf_win == 0 then
-        vim.cmd("copen")
-    else
-        vim.cmd("cclose")
-    end
-end, { desc = "Toggle quickfix list" })
-
-local map = vim.api.nvim_set_keymap
-local opts = { noremap = true, silent = true }
-
 -- Move to previous/next
-map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
-map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
+map.set('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
+map.set('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
 
 -- Re-order to previous/next
-map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
-map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
+map.set('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
+map.set('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
 
 -- Goto buffer in position...
-map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
-map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
-map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
-map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
-map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
-map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
-map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
-map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
-map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
-map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
+map.set('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
+map.set('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
+map.set('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
+map.set('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
+map.set('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
+map.set('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
+map.set('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
+map.set('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
+map.set('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
+map.set('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
 -- Pin/unpin buffer
-map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
+map.set('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
 -- Close buffer
-map('n', '<A-w>', '<Cmd>BufferClose<CR>', opts)
+map.set('n', '<A-w>', '<Cmd>BufferClose<CR>', opts)
 
 -- Magic buffer-picking mode
-map('n', '<C-p>',   '<Cmd>BufferPick<CR>', opts)
-map('n', '<C-s-p>', '<Cmd>BufferPickDelete<CR>', opts)
+map.set('n', '<C-p>', '<Cmd>BufferPick<CR>', opts)
+map.set('n', '<C-s-p>', '<Cmd>BufferPickDelete<CR>', opts)
 
 -- KEYMAP END --
 
diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json
index bca61d4..bbdbbff 100644
--- a/nvim-pack-lock.json
+++ b/nvim-pack-lock.json
@@ -29,6 +29,10 @@
       "src": "https://github.com/nvim-tree/nvim-web-devicons"
     },
     "oil.nvim": [],
+    "trouble.nvim": {
+      "rev": "bd67efe",
+      "src": "https://github.com/folke/trouble.nvim"
+    },
     "typst-preview.nvim": []
   }
 }
\ No newline at end of file