From d73c69d8fff2f35afe04a718739fd12bd696c0f5 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@alien.gov>
Date: Sat, 9 Dec 2023 18:05:53 +0800
Subject: [PATCH] chore(quickfix): Clean up, use nvim-bqf

Use nvim-bqf instead of trouble

Signed-off-by: Ryan <ryan@alien.gov>
---
 lazy-lock.json                 |  1 +
 lua/lazy-plugins.lua           | 50 +++++++++++++---------------------
 lua/plugins/lsp.lua            |  4 +++
 lua/plugins/nvim-colorizer.lua | 10 -------
 lua/plugins/telescope.lua      | 12 --------
 5 files changed, 24 insertions(+), 53 deletions(-)
 delete mode 100644 lua/plugins/nvim-colorizer.lua
 delete mode 100644 lua/plugins/telescope.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index 07aa27c..d710701 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -22,6 +22,7 @@
   "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
   "neogit": { "branch": "master", "commit": "e0b96878ccf6d58a630ea155f60d97506f2542cc" },
   "none-ls.nvim": { "branch": "main", "commit": "7bf88cd3b37a411fdacfdca1745408a77a420493" },
+  "nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" },
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
   "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" },
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index 4e6da75..227fdbc 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -157,36 +157,16 @@ local plugins = {
 			vim.keymap.set('', '<leader>tb', ':Telescope buffers<cr>'),
 			vim.keymap.set('', '<leader>tf', ':Telescope fd<cr>'),
 		},
-		config = function()
-			require("plugins.telescope")
-		end
+		opts = {
+			defaults = {
+				layout_strategy = 'flex',
+				layout_config = { flex = { flip_columns = 144 } },
+			},
+		},
 	},
 	{
-		"folke/trouble.nvim",
-		lazy = true,
-		keys = {
-			vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end),
-			vim.keymap.set("n", "<leader>xw",
-				function() require("trouble").toggle("workspace_diagnostics") end),
-			vim.keymap.set("n", "<leader>xd",
-				function() require("trouble").toggle("document_diagnostics") end),
-			vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end),
-			vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end),
-			-- lsp
-			vim.keymap.set("n", "<leader>gr", function()
-				require("trouble").toggle("lsp_references")
-			end),
-			vim.keymap.set('n', '<leader>D', function()
-				require("trouble").toggle("lsp_type_definitions")
-			end),
-			vim.keymap.set('n', 'gd', function()
-				require("trouble").toggle("lsp_definitions")
-			end),
-			vim.keymap.set('n', '<leader>gi', function()
-				require("trouble").toggle("lsp_implementations")
-			end),
-		},
-		dependencies = { "nvim-tree/nvim-web-devicons" },
+		'kevinhwang91/nvim-bqf',
+		ft = 'qf'
 	},
 	{
 		"danymat/neogen",
@@ -252,19 +232,27 @@ local plugins = {
 	{
 		"lewis6991/gitsigns.nvim",
 		event = "BufEnter",
+		lazy = true,
 		keys = {
 			-- View changed in git
 			vim.keymap.set('n', ']c', function()
 				if vim.wo.diff then return ']c' end
-				vim.schedule(function() require("gitsigns").next_hunk() end)
+				vim.schedule(function()
+					require("gitsigns").next_hunk()
+				end)
 				return '<Ignore>'
 			end, { expr = true }),
 
 			vim.keymap.set('n', '[c', function()
 				if vim.wo.diff then return '[c' end
-				vim.schedule(function() require("gitsigns").prev_hunk() end)
+				vim.schedule(function()
+					require("gitsigns").prev_hunk()
+				end)
 				return '<Ignore>'
-			end, { expr = true })
+			end, { expr = true }),
+
+			vim.keymap.set("n", "<leader>hp",
+				function() require("gitsigns").preview_hunk() end)
 		},
 		opts = {
 			signcolumn = false,
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 4a9f124..3845183 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -28,6 +28,10 @@ vim.api.nvim_create_autocmd('LspAttach', {
 		vim.keymap.set('n', '<leader>fm', function()
 			vim.lsp.buf.format { async = true }
 		end, opts)
+		vim.keymap.set("n", "<leader>gr", vim.lsp.buf.references, opts)
+		vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
+		vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+		vim.keymap.set('n', '<leader>gi', vim.lsp.buf.implementation, opts)
 	end,
 })
 
diff --git a/lua/plugins/nvim-colorizer.lua b/lua/plugins/nvim-colorizer.lua
deleted file mode 100644
index f5ea9e5..0000000
--- a/lua/plugins/nvim-colorizer.lua
+++ /dev/null
@@ -1,10 +0,0 @@
--- require'colorizer'.setup ({
---     '*',
---     css = {
---         css = true, -- CSS rgb() and rgba() functions
---         css_fn = true -- CSS hsl() and hsla() functions
---     },
---     html = {names = false} -- Disable parsing "names" like Blue or Gray
--- })
-
-require 'colorizer'.setup()
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
deleted file mode 100644
index 5fbeb67..0000000
--- a/lua/plugins/telescope.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local trouble = require("trouble.providers.telescope")
-
-
-require('telescope').setup {
-	defaults = { layout_strategy = 'flex',
-		layout_config = { flex = { flip_columns = 144 } },
-		mappings = {
-			i = { ["<c-t>"] = trouble.open_with_trouble },
-			n = { ["<c-t>"] = trouble.open_with_trouble },
-		},
-	},
-}