Merge branch 'main' into bump-brave-version

home/features/neovim/lua/config/keymaps.lua

@@ -1,19 +1,22 @@
-local setkeymap = vim.api.nvim_set_keymap
+local function map(mode, l, r, opts)
+	opts = opts or {}
+	vim.keymap.set(mode, l, r, opts)
+end
 
-setkeymap("i", "jj", "<ESC>", { silent = true })
+map("i", "jj", "<ESC>", { silent = true })
 
 -- windows
-setkeymap("n", "<leader>ww", "<C-W>p", { desc = "Other window" })
-setkeymap("n", "<leader>wd", "<C-W>c", { desc = "Delete window" })
-setkeymap("n", "<leader>w-", "<C-W>s", { desc = "Split window below" })
-setkeymap("n", "<leader>w|", "<C-W>v", { desc = "Split window right" })
-setkeymap("n", "<leader>-", "<C-W>s", { desc = "Split window below" })
-setkeymap("n", "<leader>|", "<C-W>v", { desc = "Split window right" })
-setkeymap("n", "<leader>wn", "<C-W>w", { desc = "Move next window" })
-setkeymap("n", "<leader>wp", "<C-W>W", { desc = "Moce previous window" })
+map("n", "<leader>ww", "<C-W>p", { desc = "Other window" })
+map("n", "<leader>wd", "<C-W>c", { desc = "Delete window" })
+map("n", "<leader>w-", "<C-W>s", { desc = "Split window below" })
+map("n", "<leader>w|", "<C-W>v", { desc = "Split window right" })
+map("n", "<leader>-", "<C-W>s", { desc = "Split window below" })
+map("n", "<leader>|", "<C-W>v", { desc = "Split window right" })
+map("n", "<leader>wn", "<C-W>w", { desc = "Move next window" })
+map("n", "<leader>wp", "<C-W>W", { desc = "Moce previous window" })
 
 -- buffers
-setkeymap("n", "<leader>bn", "<cmd>bnext<cr>", { desc = "Next buffer" })
-setkeymap("n", "<leader>bp", "<cmd>bprev<cr>", { desc = "Previous buffer" })
-setkeymap("n", "<leader>bf", "<cmd>bfirst<cr>", { desc = "First buffer" })
-setkeymap("n", "<leader>bl", "<cmd>blast<cr>", { desc = "Last buffer" })
+map("n", "<leader>bn", "<cmd>bnext<cr>", { desc = "Next buffer" })
+map("n", "<leader>bp", "<cmd>bprev<cr>", { desc = "Previous buffer" })
+map("n", "<leader>bf", "<cmd>bfirst<cr>", { desc = "First buffer" })
+map("n", "<leader>bl", "<cmd>blast<cr>", { desc = "Last buffer" })

home/features/neovim/lua/plugins/coding.lua

@@ -10,6 +10,7 @@ return {
 			"hrsh7th/cmp-path",
 			"hrsh7th/cmp-cmdline",
 			"hrsh7th/cmp-nvim-lsp-signature-help",
+			"hrsh7th/cmp-nvim-lsp-document-symbol",
 			"onsails/lspkind.nvim",
 			"saadparwaiz1/cmp_luasnip",
 			{
@@ -67,6 +68,8 @@ return {
 				sources = cmp.config.sources({
 					{ name = "nvim_lsp" },
 					{ name = "nvim_lsp_signature_help" },
+					{ name = "nvim_lsp_signature_symbols" },
+					{ name = "copilot" },
 					{ name = "luasnip" },
 				}, {
 					{ name = "buffer" },
@@ -220,10 +223,23 @@ return {
 	},
 	{
 		"zbirenbaum/copilot.lua",
+		name = "copilot",
 		event = "VeryLazy",
 		cmd = "Copilot",
-		config = function()
-			require("copilot").setup({})
-		end,
+		opts = {
+			suggestion = {
+				enabled = true,
+				auto_trigger = true,
+				debounce = 50,
+				keymap = {
+					accept = "<C-l>",
+					accept_word = false,
+					accept_line = false,
+					next = "<C-n>",
+					prev = "<C-t>",
+					dismiss = "<C-s>",
+				},
+			},
+		},
 	},
 }

home/features/neovim/lua/plugins/editor.lua

@@ -23,22 +23,14 @@ return {
 				["<leader>w"] = { name = "+window" },
 				["<leader>t"] = { name = "+term/test" },
 				["<leader>s"] = { name = "+select" },
+				["<leader>x"] = { name = "+none" },
 			})
 		end,
 	},
 	{
 		"nvim-neo-tree/neo-tree.nvim",
 		cmd = "Neotree",
-		keys = {
-			{
-				"<leader>fe",
-				function()
-					require("neo-tree.command").execute({ toggle = true, dir = vim.loop.cwd(), reveal = true })
-				end,
-				desc = "Explorer NeoTree (cwd)",
-			},
-			{ "<leader>e", "<leader>fe", desc = "Explorer NeoTree (cwd)", remap = true },
-		},
+		keys = {},
 		opts = {
 			close_if_last_window = false,
 			popup_border_style = "solid",
@@ -86,10 +78,11 @@ return {
 				"nvim-telescope/telescope-fzf-native.nvim",
 				build = 'nix-shell -p gnumake clang --run "make"',
 			},
-			"nvim-telescope/telescope-ghq.nvim",
+			"nvim-telescope/telescope-file-browser.nvim",
 		},
 		opts = function()
 			local actions = require("telescope.actions")
+			local fb_actions = require("telescope").extensions.file_browser.actions
 
 			return {
 				defaults = {
@@ -119,13 +112,23 @@ return {
 						override_file_sorter = true,
 						case_mode = "smart_case",
 					},
+					file_browser = {
+						mappings = {
+							["i"] = {
+								["<C-o>"] = fb_actions.open,
+								["<C-s>"] = fb_actions.toggle_all,
+								["<C-h>"] = fb_actions.toggle_hidden,
+								["<C-g>"] = fb_actions.goto_parent_dir,
+							},
+						},
+					},
 				},
 			}
 		end,
 		config = function(_, opts)
 			require("telescope").setup(opts)
-			require("telescope").load_extension("ghq")
 			require("telescope").load_extension("fzf")
+			require("telescope").load_extension("file_browser")
 		end,
 		keys = {
 			{
@@ -156,6 +159,13 @@ return {
 				end,
 				desc = "Search for a string in current working directory",
 			},
+			{
+				"<leader>fe",
+				function()
+					require("telescope").extensions.file_browser.file_browser()
+				end,
+				desc = "File browser",
+			},
 		},
 	},
 	{
@@ -198,10 +208,6 @@ return {
 		"folke/trouble.nvim",
 		cmd = { "TroubleToggle", "Trouble" },
 		opts = { use_diagnostic_signs = true },
-		keys = {
-			{ "<leader>xx", "<cmd>TroubleToggle document_diagnostics<cr>", desc = "Document Diagnostics (Trouble)" },
-			{ "<leader>xX", "<cmd>TroubleToggle workspace_diagnostics<cr>", desc = "Workspace Diagnostics (Trouble)" },
-		},
 	},
 	{
 		"petertriho/nvim-scrollbar",

home/features/neovim/lua/plugins/lsp.lua

@@ -263,4 +263,13 @@ return {
 		event = "VeryLazy",
 		opts = {},
 	},
+	{
+		"https://git.sr.ht/~whynothugo/lsp_lines.nvim",
+		event = "VeryLazy",
+		opts = {},
+		config = function(_, opts)
+			vim.diagnostic.config({ virtual_text = false })
+			require("lsp_lines").setup(opts)
+		end,
+	},
 }