refactor(nvim): migrate to lazy.nvim and modernize plugin/config setup

Author: Bencodes

config/nvim/init.lua

@@ -1,3 +1,6 @@
+vim.g.mapleader = " "
+vim.g.maplocalleader = " "
+
 -- Set up some high level options
 vim.opt.encoding = "utf-8"
 vim.opt.fileencoding = "utf-8"
@@ -6,6 +9,4 @@ vim.opt.spelllang = "en"
 
 require("settings")
 require("plugins")
-require("lsp")
 require("mappings")
-require("theme")

config/nvim/lazy-lock.json

@@ -0,0 +1,32 @@
+{
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+  "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
+  "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "fd3e882e56956675c620898bf1ffcf4fcbe7ec84" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
+  "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
+  "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
+  "copilot.lua": { "branch": "master", "commit": "0552b44fceedf0c4cba2cd4953d3976633b2509a" },
+  "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
+  "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" },
+  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
+  "nvim-lspconfig": { "branch": "master", "commit": "841c6d4139aedb8a3f2baf30cef5327371385b93" },
+  "nvim-treesitter": { "branch": "main", "commit": "0e0db770f2a3691fae478798342f4ac431accefd" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "93d60a475f0b08a8eceb99255863977d3a25f310" },
+  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
+  "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "render-markdown.nvim": { "branch": "main", "commit": "e3c18ddd27a853f85a6f513a864cf4f2982b9f26" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
+  "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" },
+  "vim-vsnip": { "branch": "master", "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" }
+}

config/nvim/lua/lsp/init.lua

@@ -36,14 +36,14 @@ end
 vim.lsp.enable(servers)
 
 -- Diagnostic keymaps
-vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, { desc = "Open diagnostic float" })
+vim.keymap.set("n", "<leader>de", vim.diagnostic.open_float, { desc = "Open diagnostic float" })
 vim.keymap.set("n", "[d", function()
 	vim.diagnostic.jump({ count = -1 })
 end, { desc = "Previous diagnostic" })
 vim.keymap.set("n", "]d", function()
 	vim.diagnostic.jump({ count = 1 })
 end, { desc = "Next diagnostic" })
-vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, { desc = "Diagnostic quickfix list" })
+vim.keymap.set("n", "<leader>dq", vim.diagnostic.setloclist, { desc = "Diagnostic quickfix list" })
 
 -- LSP keymaps (set when a server attaches to a buffer)
 vim.api.nvim_create_autocmd("LspAttach", {
@@ -54,7 +54,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 		-- Enable completion triggered by <c-x><c-o>
 		vim.bo[ev.buf].omnifunc = "v:lua.vim.lsp.omnifunc"
 
-		-- Disable formatting for lua_ls (use stylua/neoformat instead)
+		-- Disable formatting for lua_ls and let conform/stylua handle it.
 		if client and client.name == "lua_ls" then
 			client.server_capabilities.documentFormattingProvider = false
 			client.server_capabilities.documentRangeFormattingProvider = false
@@ -77,35 +77,32 @@ vim.api.nvim_create_autocmd("LspAttach", {
 		)
 		vim.keymap.set(
 			"n",
-			"<space>wa",
+			"<leader>wa",
 			vim.lsp.buf.add_workspace_folder,
 			vim.tbl_extend("force", opts, { desc = "Add workspace folder" })
 		)
 		vim.keymap.set(
 			"n",
-			"<space>wr",
+			"<leader>wr",
 			vim.lsp.buf.remove_workspace_folder,
 			vim.tbl_extend("force", opts, { desc = "Remove workspace folder" })
 		)
-		vim.keymap.set("n", "<space>wl", function()
+		vim.keymap.set("n", "<leader>wl", function()
 			print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
 		end, vim.tbl_extend("force", opts, { desc = "List workspace folders" }))
 		vim.keymap.set(
 			"n",
-			"<space>D",
+			"<leader>D",
 			vim.lsp.buf.type_definition,
 			vim.tbl_extend("force", opts, { desc = "LSP type definition" })
 		)
-		vim.keymap.set("n", "<space>rn", vim.lsp.buf.rename, vim.tbl_extend("force", opts, { desc = "LSP rename" }))
+		vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, vim.tbl_extend("force", opts, { desc = "LSP rename" }))
 		vim.keymap.set(
 			"n",
-			"<space>ca",
+			"<leader>ca",
 			vim.lsp.buf.code_action,
 			vim.tbl_extend("force", opts, { desc = "LSP code action" })
 		)
 		vim.keymap.set("n", "gr", vim.lsp.buf.references, vim.tbl_extend("force", opts, { desc = "LSP references" }))
-		vim.keymap.set("n", "<space>f", function()
-			vim.lsp.buf.format({ async = true })
-		end, vim.tbl_extend("force", opts, { desc = "Format buffer" }))
 	end,
 })

config/nvim/lua/mappings.lua

@@ -2,4 +2,13 @@ vim.keymap.set("x", "<", "<gv", { desc = "Indent left and keep selection" })
 vim.keymap.set("x", ">", ">gv", { desc = "Indent right and keep selection" })
 
 vim.keymap.set("n", "<C-p>", "<cmd>Telescope find_files<cr>", { desc = "Find files" })
-vim.keymap.set("n", "<C-o>", "<cmd>NERDTreeToggle<cr>", { desc = "Toggle NERDTree" })
+vim.keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "Find files" })
+vim.keymap.set("n", "<leader>fg", "<cmd>Telescope live_grep<cr>", { desc = "Live grep" })
+vim.keymap.set("n", "<leader>e", "<cmd>Oil<cr>", { desc = "Open file explorer" })
+vim.keymap.set("n", "-", "<cmd>Oil<cr>", { desc = "Open parent directory" })
+vim.keymap.set("n", "<leader>f", function()
+	require("conform").format({
+		async = true,
+		lsp_format = "fallback",
+	})
+end, { desc = "Format buffer" })

config/nvim/lua/plugins/configs/cmp.lua

@@ -5,6 +5,7 @@ if not ok then
 end
 
 local icons = {
+	Copilot = "",
 	Text = "",
 	Method = "",
 	Function = "",
@@ -51,7 +52,7 @@ cmp.setup({
 		fields = { "kind", "abbr", "menu" },
 		format = function(_, vim_item)
 			vim_item.menu = vim_item.kind
-			vim_item.kind = icons[vim_item.kind]
+			vim_item.kind = icons[vim_item.kind] or vim_item.kind
 
 			return vim_item
 		end,
@@ -98,16 +99,40 @@ cmp.setup({
 		}),
 	},
 	sources = {
+		{ name = "copilot", group_index = 2 },
 		{ name = "nvim_lsp" },
 		{ name = "nvim_lua" },
 		{ name = "vsnip" },
 		{ name = "path" },
 		{ name = "buffer" },
 		{ name = "nvim_lsp_signature_help" },
 	},
+	sorting = {
+		priority_weight = 2,
+		comparators = {
+			require("copilot_cmp.comparators").prioritize,
+			cmp.config.compare.offset,
+			cmp.config.compare.exact,
+			cmp.config.compare.score,
+			cmp.config.compare.recently_used,
+			cmp.config.compare.locality,
+			cmp.config.compare.kind,
+			cmp.config.compare.sort_text,
+			cmp.config.compare.length,
+			cmp.config.compare.order,
+		},
+	},
 	preselect = cmp.PreselectMode.None,
 })
 
+cmp.event:on("menu_opened", function()
+	vim.b.copilot_suggestion_hidden = true
+end)
+
+cmp.event:on("menu_closed", function()
+	vim.b.copilot_suggestion_hidden = false
+end)
+
 cmp.setup.cmdline("/", {
 	mapping = cmp.mapping.preset.cmdline(),
 	sources = {

config/nvim/lua/plugins/configs/conform.lua

@@ -0,0 +1,19 @@
+local ok, conform = pcall(require, "conform")
+
+if not ok then
+	return
+end
+
+conform.setup({
+	default_format_opts = {
+		lsp_format = "fallback",
+	},
+	formatters_by_ft = {
+		lua = { "stylua" },
+		python = { "isort", "ruff_format" },
+		yaml = { "prettier" },
+		markdown = { "prettier" },
+		bzl = { "buildifier" },
+		starlark = { "buildifier" },
+	},
+})

config/nvim/lua/plugins/configs/copilot.lua

@@ -1,2 +1,26 @@
-vim.g.copilot_assume_mapped = true
-vim.g.copilot_no_tab_map = false
+local ok, copilot = pcall(require, "copilot")
+
+if not ok then
+	return
+end
+
+copilot.setup({
+	panel = {
+		enabled = false,
+	},
+	suggestion = {
+		enabled = false,
+	},
+	filetypes = {
+		help = true,
+		markdown = true,
+	},
+})
+
+local cmp_ok, copilot_cmp = pcall(require, "copilot_cmp")
+
+if not cmp_ok then
+	return
+end
+
+copilot_cmp.setup()

config/nvim/lua/plugins/configs/gitgutter.lua

@@ -0,0 +1,17 @@
+local ok, gitsigns = pcall(require, "gitsigns")
+
+if not ok then
+	return
+end
+
+gitsigns.setup({
+	current_line_blame = false,
+	signs = {
+		add = { text = "|" },
+		change = { text = "|" },
+		delete = { text = "_" },
+		topdelete = { text = "^" },
+		changedelete = { text = "~" },
+		untracked = { text = "|" },
+	},
+})