fix: fixed conflicts + moving to yadm

.config/nvim/lua/config/options.lua

@@ -0,0 +1,24 @@
+vim.opt.clipboard = "unnamedplus"
+vim.g.clipboard = {
+	name = "osc 52",
+	copy = {
+		["+"] = require("vim.ui.clipboard.osc52").copy("+"),
+		["*"] = require("vim.ui.clipboard.osc52").copy("*"),
+	},
+	paste = {
+		["+"] = function()
+			return { vim.fn.split(vim.fn.getreg(""), "\n"), vim.fn.getregtype("") }
+		end,
+		["*"] = function()
+			return { vim.fn.split(vim.fn.getreg(""), "\n"), vim.fn.getregtype("") }
+		end,
+	},
+}
+
+vim.opt.fixeol = true
+
+vim.opt.list = true
+vim.opt.listchars = {
+	trail = "·",
+	tab = "  ",
+}