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

lua/plugins/conformer.lua

@@ -0,0 +1,12 @@
+return {
+	"stevearc/conform.nvim",
+	opts = {
+		formatters_by_ft = {
+			lua = { "stylua" },
+			js = { "prettierd" },
+			html = { "prettierd" },
+			c = { "clang-format" },
+			cpp = { "clang-format" },
+		},
+	},
+}

lua/plugins/image.lua

@@ -0,0 +1,4 @@
+return {
+	"3rd/image.nvim",
+	opts = {},
+}

lua/plugins/rainbow_parentheses.lua

@@ -0,0 +1,33 @@
+return {
+	"HiPhish/rainbow-delimiters.nvim",
+	lazy = false,
+	init = function()
+		-- This module contains a number of default definitions
+		local rainbow_delimiters = require("rainbow-delimiters")
+
+		---@type rainbow_delimiters.config
+		vim.g.rainbow_delimiters = {
+			strategy = {
+				[""] = rainbow_delimiters.strategy["global"],
+				vim = rainbow_delimiters.strategy["local"],
+			},
+			query = {
+				[""] = "rainbow-delimiters",
+				lua = "rainbow-blocks",
+			},
+			priority = {
+				[""] = 110,
+				lua = 210,
+			},
+			highlight = {
+				"RainbowDelimiterViolet",
+				"RainbowDelimiterBlue",
+				"RainbowDelimiterOrange",
+				"RainbowDelimiterYellow",
+				"RainbowDelimiterRed",
+				"RainbowDelimiterGreen",
+				"RainbowDelimiterCyan",
+			},
+		}
+	end,
+}