format and aerial

lua/plugins/aerial.lua

@@ -4,8 +4,7 @@ require("aerial").setup({
 		-- Jump forwards/backwards with '{' and '}'
 		vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
 		vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
+		-- You probably also want to set a keymap to toggle aerial
+		vim.keymap.set("n", "<leader>ol", "<cmd>AerialToggle!<CR>", { buffer = bufnr })
 	end,
 })
-
--- You probably also want to set a keymap to toggle aerial
-vim.keymap.set("n", "<leader>a", "<cmd>AerialToggle!<CR>")

lua/plugins/format.lua

@@ -8,14 +8,14 @@ require("null-ls").setup({
 	-- you can reuse a shared lspconfig on_attach callback here
 	on_attach = function(client, bufnr)
 		if client.supports_method("textDocument/formatting") then
+			vim.api.nvim_buf_create_user_command(bufnr, "LspFormatting", function()
+				vim.lsp.buf.format({ bufnr = bufnr })
+			end, {})
 			vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
 			vim.api.nvim_create_autocmd("BufWritePre", {
 				group = augroup,
 				buffer = bufnr,
-				callback = function()
-					-- on 0.8, you should use vim.lsp.buf.format({ bufnr = bufnr }) instead
-					vim.lsp.buf.format({ bufnr = bufnr })
-				end,
+				command = "undojoin | LspFormatting",
 			})
 		end
 	end,