Немного перебрал плагины

5 files changed, 163 insertions, 178 deletions

diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 4a81880..669f925 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -12,7 +12,7 @@
   "goerr-nvim": { "branch": "main", "commit": "d30ba1cab652e78dbf6a644eb4823be57e9af203" },
   "goimpl.nvim": { "branch": "main", "commit": "a0c2d8cd1e37f0ae8c19dc954ced3c6ccdceed53" },
   "guihua.lua": { "branch": "master", "commit": "ef44ba40f12e56c1c9fa45967f2b4d142e4b97a0" },
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lsp_signature.nvim": { "branch": "master", "commit": "0efb088dce050d38a3608ee69f80f2a62cf9849c" },
   "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" },
@@ -26,9 +26,9 @@
   "nvim-lspconfig": { "branch": "master", "commit": "f4e9d367d4e067d7a5fabc9fd3f1349b291eb718" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-tree.lua": { "branch": "master", "commit": "c0b18e4879f7b29a17a240ad49f733af7a7fb348" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
   "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
   "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 723ef8a..6ed6e72 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -16,8 +16,6 @@ require("lazy").setup({
 	require("plugins.tree"),
 	require("plugins.conform"),
 	require("plugins.lazydev"),
-	require("plugins.dapui"),
-	require("plugins.dap_go"),
 	require("plugins.go"),
 	require("plugins.goimpl"),
 	require("plugins.lualine"),
diff --git a/config/nvim/lua/plugins/dap.lua b/config/nvim/lua/plugins/dap.lua
index 315fab8..6e2de11 100644
--- a/config/nvim/lua/plugins/dap.lua
+++ b/config/nvim/lua/plugins/dap.lua
@@ -1,96 +1,168 @@
 return {
-	"mfussenegger/nvim-dap",
-	config = function()
-		local dap = require("dap")
-		dap.adapters.go = {
-			type = "server",
-			port = "${port}",
-			executable = {
-				command = "dlv",
-				args = { "dap", "-l", "127.0.0.1:${port}" },
+	{
+		"mfussenegger/nvim-dap",
+		config = function()
+			local dap = require("dap")
+			dap.adapters.go = {
+				type = "server",
+				port = "${port}",
+				executable = {
+					command = "dlv",
+					args = { "dap", "-l", "127.0.0.1:${port}" },
+				},
+			}
+		end,
+		keys = {
+			{
+				"<F5>",
+				function()
+					require("dap").continue()
+				end,
+				desc = "Debug continue",
+			},
+			{
+				"<F17>",
+				function() -- S-F5
+					require("dap").restart()
+				end,
+				desc = "Debug restart",
+			},
+			{
+				"<F29>",
+				function() -- C-F5
+					require("dap").terminate()
+				end,
+				desc = "Debug terminate",
+			},
+			{
+				"<F8>",
+				function()
+					require("dap").step_over()
+				end,
+				desc = "Debug step over",
+			},
+			{
+				"<F7>",
+				function()
+					require("dap").step_into()
+				end,
+				desc = "Debug step into",
+			},
+			{
+				"<F19>",
+				function() -- S-F7
+					require("dap").step_out()
+				end,
+				desc = "Debug step out",
+			},
+			{
+				"<A-b>",
+				function()
+					require("dap").toggle_breakpoint()
+				end,
+				desc = "Toggle breakpoint",
+			},
+			{
+				"<F9>",
+				function()
+					local widgets = require("dap.ui.widgets")
+					widgets.centered_float(widgets.scopes)
+				end,
+				desc = "Debug scopes",
 			},
-		}
-		-- dap.configurations.go = {
-		-- 	{
-		-- 		type = "go",
-		-- 		name = "Debug",
-		-- 		request = "launch",
-		-- 		program = "${file}",
-		-- 	},
-		-- 	{
-		-- 		type = "go",
-		-- 		name = "Debug test",
-		-- 		request = "launch",
-		-- 		mode = "test",
-		-- 		program = "${file}",
-		-- 	},
-		-- 	{
-		-- 		type = "go",
-		-- 		name = "Debug test (go test)",
-		-- 		request = "launch",
-		-- 		mode = "test",
-		-- 		program = "${workspaceFolder}",
-		-- 	},
-		-- }
-	end,
-	keys = {
-		{
-			"<F5>",
-			function()
-				require("dap").continue()
-			end,
-			desc = "Debug continue",
-		},
-		{
-			"<F17>",
-			function() -- S-F5
-				require("dap").restart()
-			end,
-			desc = "Debug restart",
-		},
-		{
-			"<F29>",
-			function() -- C-F5
-				require("dap").terminate()
-			end,
-			desc = "Debug terminate",
-		},
-		{
-			"<F8>",
-			function()
-				require("dap").step_over()
-			end,
-			desc = "Debug step over",
-		},
-		{
-			"<F7>",
-			function()
-				require("dap").step_into()
-			end,
-			desc = "Debug step into",
 		},
-		{
-			"<F19>",
-			function() -- S-F7
-				require("dap").step_out()
-			end,
-			desc = "Debug step out",
+	},
+	{
+		"rcarriga/nvim-dap-ui",
+		dependencies = {
+			"mfussenegger/nvim-dap",
+			"nvim-neotest/nvim-nio",
 		},
-		{
-			"<A-b>",
-			function()
-				require("dap").toggle_breakpoint()
-			end,
-			desc = "Toggle breakpoint",
+		config = function()
+			local dapui = require("dapui")
+
+			dapui.setup({
+				icons = {
+					expanded = "▼",
+					collapsed = "▶",
+					current_frame = "→",
+				},
+				controls = {
+					enabled = false,
+				},
+				mappings = {
+					open = "o",
+					remove = "d",
+					edit = "e",
+					repl = "r",
+					toggle = "t",
+				},
+				expand_lines = vim.fn.has("nvim-0.7"),
+				layouts = {
+					{
+						elements = {
+							"repl",
+							"scopes",
+						},
+						size = 0.3,
+						position = "bottom",
+					},
+				},
+				floating = {
+					max_height = nil,
+					max_width = nil,
+					border = "single",
+					mappings = {
+						close = { "q", "<Esc>" },
+					},
+				},
+				windows = { indent = 1 },
+				render = {
+					max_type_length = nil,
+				},
+			})
+
+			local dap = require("dap")
+			dap.listeners.after.event_initialized["dapui_config"] = function()
+				dapui.open()
+			end
+		end,
+		keys = {
+			{
+				"<F6>",
+				function()
+					require("dapui").toggle()
+				end,
+				desc = "Toggle debug UI",
+			},
+			{
+				"<Leader>dh",
+				function()
+					require("dap.ui.widgets").hover()
+				end,
+				desc = "Debug hover",
+			},
+			{
+				"<Leader>dp",
+				function()
+					require("dap.ui.widgets").preview()
+				end,
+				desc = "Debug preview",
+			},
 		},
-		{
-			"<F9>",
-			function()
-				local widgets = require("dap.ui.widgets")
-				widgets.centered_float(widgets.scopes)
-			end,
-			desc = "Debug scopes",
+	},
+	{
+		"leoluz/nvim-dap-go",
+		dependencies = { "mfussenegger/nvim-dap" },
+		opts = true,
+		keys = {
+			{
+				"<leader>dt",
+				function()
+					require("dap-go").debug_test()
+				end,
+				desc = "Debug test",
+			},
 		},
 	},
 }
-
diff --git a/config/nvim/lua/plugins/dap_go.lua b/config/nvim/lua/plugins/dap_go.lua
deleted file mode 100644
index aee662b..0000000
--- a/config/nvim/lua/plugins/dap_go.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-return {
-	"leoluz/nvim-dap-go",
-	dependencies = { "mfussenegger/nvim-dap" },
-	opts = true,
-	keys = {
-		{
-			"<leader>dt",
-			function()
-				require("dap-go").debug_test()
-			end,
-			desc = "Debug test",
-		},
-	},
-}
\ No newline at end of file
diff --git a/config/nvim/lua/plugins/dapui.lua b/config/nvim/lua/plugins/dapui.lua
deleted file mode 100644
index f3fcb9c..0000000
--- a/config/nvim/lua/plugins/dapui.lua
+++ /dev/null
@@ -1,71 +0,0 @@
-return {
-	"rcarriga/nvim-dap-ui",
-	dependencies = {
-		"mfussenegger/nvim-dap",
-		"nvim-neotest/nvim-nio",
-		"nvim-dap-go",
-	},
-	opts = {
-		icons = {
-			expanded = "▼",
-			collapsed = "▶",
-			current_frame = "→",
-		},
-		controls = {
-			enabled = false,
-		},
-		mappings = {
-			open = "o",
-			remove = "d",
-			edit = "e",
-			repl = "r",
-			toggle = "t",
-		},
-		expand_lines = vim.fn.has("nvim-0.7"),
-		layouts = {
-			{
-				elements = {
-					"repl",
-					"scopes",
-				},
-				size = 0.3,
-				position = "bottom",
-			},
-		},
-		floating = {
-			max_height = nil,
-			max_width = nil,
-			border = "single",
-			mappings = {
-				close = { "q", "<Esc>" },
-			},
-		},
-		windows = { indent = 1 },
-		render = {
-			max_type_length = nil,
-		},
-	},
-	keys = {
-		{
-			"<F6>",
-			function()
-				require("dapui").toggle()
-			end,
-			desc = "Toggle debug UI",
-		},
-		{
-			"<Leader>dh",
-			function()
-				require("dap.ui.widgets").hover()
-			end,
-			desc = "Debug hover",
-		},
-		{
-			"<Leader>dp",
-			function()
-				require("dap.ui.widgets").preview()
-			end,
-			desc = "Debug preview",
-		},
-	},
-}