tmp

lua/config/autocmd.lua

@@ -0,0 +1,6 @@
+vim.api.nvim_create_autocmd("BufWritePre", {
+  pattern = "*",
+  callback = function(args)
+    require("conform").format({ bufnr = args.buf })
+  end,
+})

lua/config/general.lua

@@ -10,6 +10,13 @@ vim.opt.nu = true
 vim.cmd([[set listchars=eol:$,tab:>-,trail:~,extends:>,precedes:<,space:•]])
 vim.keymap.set("n", "<leader>hc", ":set list!<CR>", { silent = true })
 
+<<<<<<< HEAD
+=======
+vim.keymap.set("n", ".", ":", {})
+
+vim.keymap.set("i", "jk", "", {})
+
+>>>>>>> c43d072 (tmp)
 vim.opt.termguicolors = true
 
 vim.opt.hlsearch = false