nvim/lua/lazy-conf.lua

@@ -14,10 +14,10 @@ vim.opt.rtp:prepend(lazypath)
 require("lazy").setup({
     spec = {
         { import = "plugins.nav" },
+        { import = "plugins.snacks" },
         { import = "plugins.lsp" },
         { import = "plugins.style" },
         { import = "plugins.util" },
-        { import = "plugins.util.diff" },
         { import = "plugins.testing" },
     },
     change_detection = {

nvim/lua/lsp-options.lua

@@ -8,21 +8,6 @@ M.on_attach = function(client, bufnr)
     opts.buffer = bufnr
 
     -- set keybinds
-    opts.desc = "Show LSP references"
-    keymap.set("n", "gR", "<cmd>Telescope lsp_references<CR>", opts)
-
-    opts.desc = "Go to declaration"
-    keymap.set("n", "gD", ":lua vim.lsp.buf.declaration", opts)
-
-    opts.desc = "Show LSP definitions"
-    keymap.set("n", "gd", "<cmd>Telescope lsp_definitions<CR>", opts)
-
-    opts.desc = "Show LSP implementations"
-    keymap.set("n", "gi", "<cmd>Telescope lsp_implementations<CR>", opts)
-
-    opts.desc = "Show LSP type definitions"
-    keymap.set("n", "gt", "<cmd>Telescope lsp_type_definitions<CR>", opts)
-
     opts.desc = "See available code actions"
     keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts)
 
@@ -32,12 +17,6 @@ M.on_attach = function(client, bufnr)
     opts.desc = "Smart rename"
     keymap.set("n", "<leader>n", vim.lsp.buf.rename, opts)
 
-    opts.desc = "Show buffer diagnostics"
-    keymap.set("n", "ga", "<cmd>Telescope diagnostics bufnr=0<CR>", opts)
-
-    opts.desc = "Show line diagnostics"
-    keymap.set("n", "gA", ":lua vim.diagnostic.open_float()<CR>", opts)
-
     opts.desc = "Go to previous diagnostic"
     keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
 

nvim/lua/plugins/snacks/init.lua

@@ -28,5 +28,5 @@ return {
 		statuscolumn = { enabled = true },
 		scope = { enabled = true },
 	},
-	keys = require("plugins.snacks.keys"),
+	keys = require("plugins.snacks.keys.keys"),
 }

nvim/lua/plugins/snacks/keys/keys.lua

@@ -39,7 +39,7 @@ return {
 			Snacks.picker.icons()
 		end,
 		desc = "Show icons",
-        mode = "n"
+		mode = "n",
 	},
 	-- Terminal
 	{
@@ -56,7 +56,7 @@ return {
 			Snacks.explorer()
 		end,
 		desc = "Open File Tree",
-        mode = "n"
+		mode = "n",
 	},
 	-- Pickers
 	{
@@ -65,7 +65,7 @@ return {
 			Snacks.picker.files()
 		end,
 		desc = "Find file",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fg",
@@ -73,7 +73,7 @@ return {
 			Snacks.picker.grep()
 		end,
 		desc = "Find file content using grep",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fb",
@@ -81,7 +81,7 @@ return {
 			Snacks.picker.buffers()
 		end,
 		desc = "Show all buffers",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fch",
@@ -89,7 +89,7 @@ return {
 			Snacks.picker.command_history()
 		end,
 		desc = "Show command history",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fd",
@@ -97,7 +97,7 @@ return {
 			Snacks.picker.diagnostics()
 		end,
 		desc = "Show diagnostics",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fm",
@@ -105,7 +105,7 @@ return {
 			Snacks.picker.git_diff()
 		end,
 		desc = "Show uncommitted diffs",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fh",
@@ -113,7 +113,7 @@ return {
 			Snacks.picker.help()
 		end,
 		desc = "Show nvim help pages",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fj",
@@ -121,7 +121,7 @@ return {
 			Snacks.picker.jumps()
 		end,
 		desc = "Show available jumps",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fk",
@@ -129,7 +129,7 @@ return {
 			Snacks.picker.keymaps()
 		end,
 		desc = "Show keymaps",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>flc",
@@ -137,47 +137,68 @@ return {
 			Snacks.picker.lsp_config()
 		end,
 		desc = "Show LSP configs",
-        mode = "n"
+		mode = "n",
 	},
 	{
-		"<leader>fld",
+		"gd",
 		function()
 			Snacks.picker.lsp_definitions()
 		end,
-		desc = "Show LSP definitions (alias for gd)",
-        mode = "n"
+		desc = "Goto definitions",
+		mode = "n",
 	},
 	{
-		"<leader>fli",
+		"gi",
 		function()
 			Snacks.picker.lsp_implementations()
 		end,
-		desc = "Show LSP implementations (alias for gi)",
-        mode = "n"
+		desc = "Goto implementations",
+		mode = "n",
 	},
 	{
-		"<leader>flr",
+		"<leader>gR",
 		function()
 			Snacks.picker.lsp_references()
 		end,
-		desc = "Show LSP references (alias for gR)",
-        mode = "n"
+		desc = "Goto references",
+		mode = "n",
 	},
 	{
-		"<leader>fls",
+		"<leader>gD",
+		function()
+			Snacks.picker.lsp_declarations()
+		end,
+		desc = "Goto declaration",
+		mode = "n",
+	},
+	{
+		"gy",
+		function()
+			Snacks.picker.lsp_type_definitions()
+		end,
+		desc = "Goto T[y]pe Definition",
+	},
+	{
+		"gai",
+		function()
+			Snacks.picker.lsp_incoming_calls()
+		end,
+		desc = "C[a]lls Incoming",
+	},
+	{
+		"gao",
+		function()
+			Snacks.picker.lsp_outgoing_calls()
+		end,
+		desc = "C[a]lls Outgoing",
+	},
+	{
+		"gs",
 		function()
 			Snacks.picker.lsp_symbols()
 		end,
 		desc = "Show LSP symbols",
-        mode = "n"
-	},
-	{
-		"<leader>flt",
-		function()
-			Snacks.picker.lsp_type_definitions()
-		end,
-		desc = "Show LSP type definitions",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fn",
@@ -185,7 +206,7 @@ return {
 			Snacks.picker.notifications()
 		end,
 		desc = "Show notifications",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fp",
@@ -193,7 +214,7 @@ return {
 			Snacks.picker.projects()
 		end,
 		desc = "Show recent projects",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fr",
@@ -201,7 +222,7 @@ return {
 			Snacks.picker.recent()
 		end,
 		desc = "Show recent files",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fs",
@@ -209,7 +230,7 @@ return {
 			Snacks.picker.spelling()
 		end,
 		desc = "Show spelling suggestions",
-        mode = "n"
+		mode = "n",
 	},
 	{
 		"<leader>fo",
@@ -217,7 +238,7 @@ return {
 			Snacks.picker.treesitter()
 		end,
 		desc = "Show treesitter details",
-        mode = "n"
+		mode = "n",
 	},
 	-- Close buffer
 	{

nvim/lua/plugins/style/todo-comments.lua

@@ -68,4 +68,20 @@ return {
 			},
 		},
 	},
+	keys = {
+		{
+			"<leader>ft",
+			function()
+				Snacks.picker.todo_comments()
+			end,
+			desc = "Todo",
+		},
+		{
+			"<leader>fT",
+			function()
+				Snacks.picker.todo_comments({ keywords = { "TODO", "FIX", "FIXME" } })
+			end,
+			desc = "Todo/Fix/Fixme",
+		},
+	},
 }