nvim/.config/nvim/after/ftplugin/markdown.lua

@@ -1,9 +1,5 @@
 local map = vim.keymap.set
 
-vim.opt.tabstop = 2
-vim.opt.shiftwidth = 2
-vim.opt.softtabstop = 2
-
 if require("core.util").is_available("which-key") then
 	require("which-key").add({
 		{ "<localleader>c", group = "codecells" },

nvim/.config/nvim/after/ftplugin/quarto.lua

@@ -1,11 +1,5 @@
-local map = vim.keymap.set
-
-vim.opt.tabstop = 2
-vim.opt.shiftwidth = 2
-vim.opt.softtabstop = 2
-
 if require("core.util").is_available("quarto") then
-	map("n", "<localleader>po", require("quarto").quartoPreview, { desc = "show quarto preview" })
+	vim.keymap.set("n", "<localleader>po", require("quarto").quartoPreview, { desc = "show quarto preview" })
 end
 
 -- TODO: Puths kernel into local file dir currently,
@@ -71,7 +65,7 @@ end
 vim.api.nvim_create_user_command("JupyterStart", function(opts)
 	startsession(opts)
 end, { nargs = "?" })
-map("n", "<localleader>cS", ":JupyterStart<cr>", { desc = "start code session", silent = true })
+vim.keymap.set("n", "<localleader>cS", ":JupyterStart<cr>", { desc = "start code session", silent = true })
 
 if vim.g.quarto_auto_init_molten_session then
 	vim.api.nvim_create_autocmd({ "BufEnter" }, {

nvim/.config/nvim/lazy-lock.json

@@ -20,7 +20,7 @@
   "flash.nvim": { "branch": "main", "commit": "ec0bf2842189f65f60fd40bf3557cac1029cc932" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" },
-  "fzf-lua": { "branch": "main", "commit": "05eaee319fcf2f5a0d378c2848641858c8b8962e" },
+  "fzf-lua": { "branch": "main", "commit": "c53ba4f40f0514a5038646fb1e9ce05872b18eb1" },
   "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
   "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
   "glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" },
@@ -56,7 +56,7 @@
   "nvim-FeMaco.lua": { "branch": "main", "commit": "96bbf843595dbe865838b3f2484b73557f34700c" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
   "nvim-coverage": { "branch": "main", "commit": "a939e425e363319d952a6c35fb3f38b34041ded2" },
-  "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
+  "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" },
   "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
@@ -74,7 +74,7 @@
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "quarto-nvim": { "branch": "main", "commit": "5325af3731ac9840b308791f08ad660958d76163" },
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "1ab18259472d9fe5756750fec722c31bab1712da" },
-  "render-markdown.nvim": { "branch": "main", "commit": "6d03af10063d5a2fadec3559de5dfa68da7d00ef" },
+  "render-markdown": { "branch": "main", "commit": "6d03af10063d5a2fadec3559de5dfa68da7d00ef" },
   "smartcolumn.nvim": { "branch": "main", "commit": "d01b99355c7fab13233f48d0f28dc097e68a03f7" },
   "stickybuf.nvim": { "branch": "master", "commit": "2160fcd536d81f5fa43f7167dba6634e814e3154" },
   "texpresso.vim": { "branch": "main", "commit": "907838c08bbf99ad6bed3c908f1d0551a92ab4e0" },
@@ -85,6 +85,7 @@
   "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" },
   "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" },
   "vifm.vim": { "branch": "master", "commit": "617e3dc7c9af1f03cc664124aff2fe98fafcf1b2" },
+  "vim-criticmarkup": { "branch": "master", "commit": "d15dc134eb177a170c79f6377f81eb02a9d20b02" },
   "vim-numbertoggle": { "branch": "main", "commit": "df9b1fe616507340718716204ba7f434125bdf7a" },
   "vim-spellsync": { "branch": "master", "commit": "ea9f431483ceb40ede8bd5b126a03eccd49b1bc0" },
   "wezterm.nvim": { "branch": "main", "commit": "f73bba23ab4becd146fa2d0a3a16a84b987eeaca" },

nvim/.config/nvim/lua/plugins/base.lua

@@ -183,11 +183,12 @@ return {
 					require("mini.align").setup({})
 
 					require("mini.bracketed").setup({
+						{
 							buffer = { suffix = "b", options = {} },
 							comment = { suffix = "k", options = {} },
 							conflict = { suffix = "" }, -- disable to use git-conflict instead
-						diagnostic = { suffix = "e", options = {} },
-						file = { suffix = "f", options = {} },
+							diagnostic = { suffix = "d", options = {} },
+							file = { suffix = "", options = {} },
 							indent = { suffix = "" }, -- disable since we use indentscope
 							jump = { suffix = "j", options = {} },
 							location = { suffix = "l", options = {} },
@@ -197,6 +198,7 @@ return {
 							undo = { suffix = "" }, -- disable since I don't need it
 							window = { suffix = "w", options = {} },
 							yank = { suffix = "y", options = {} },
+						},
 					})
 					require("mini.comment").setup({
 						hooks = {
@@ -248,33 +250,7 @@ return {
 					require("mini.map").setup()
 					require("mini.move").setup()
 					require("mini.operators").setup()
-					require("mini.pairs").setup({
-						mappings = {
-							-- these mappings ensure that when trying to _close_ any of the pairs
-							-- it will not double insert:
-							-- " <- you are here. Normal pairs will do """. This config will do "".
-							['"'] = {
-								action = "closeopen",
-								pair = '""',
-								neigh_pattern = '[^\\"].',
-								register = { cr = false },
-							},
-							["'"] = {
-								action = "closeopen",
-								pair = "''",
-								neigh_pattern = "[^%a\\'].",
-								register = { cr = false },
-							},
-							["`"] = {
-								action = "closeopen",
-								pair = "``",
-								neigh_pattern = "[^\\`].",
-								register = { cr = false },
-							},
-							["<"] = { action = "open", pair = "<>", neigh_pattern = "\r." },
-							[">"] = { action = "close", pair = "<>" },
-						},
-					})
+					require("mini.pairs").setup()
 					require("mini.trailspace").setup()
 				end,
 			})

nvim/.config/nvim/lua/plugins/lsp.lua

@@ -134,17 +134,17 @@ vim.api.nvim_create_autocmd("LspAttach", {
 
 		local map = vim.keymap.set
 		map("n", "K", "<cmd>lua vim.lsp.buf.hover()<cr>", o({ desc = "Hover definition" }))
-		map("n", "[e", "<cmd>lua vim.diagnostic.goto_prev()<cr>", o({ desc = "Previous diagnostic" }))
-		map("n", "]e", "<cmd>lua vim.diagnostic.goto_next()<cr>", o({ desc = "Next diagnostic" }))
+		map("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<cr>", o({ desc = "Previous diagnostic" }))
+		map("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<cr>", o({ desc = "Next diagnostic" }))
 		map(
 			"n",
-			"[E",
+			"[D",
 			"<cmd>lua vim.diagnostic.goto_prev({severity = vim.diagnostic.severity.ERROR})<cr>",
 			o({ desc = "Previous error" })
 		)
 		map(
 			"n",
-			"]E",
+			"]D",
 			"<cmd>lua vim.diagnostic.goto_next({severity = vim.diagnostic.severity.ERROR})<cr>",
 			o({ desc = "Next error" })
 		)

nvim/.config/nvim/lua/plugins/prose.lua

@@ -34,24 +34,7 @@ local prose_plugs = {
 		config = true,
 		cmd = { "ZenMode" },
 		dependencies = { "folke/twilight.nvim" },
-		keys = {
-			{
-				"[sz",
-				function()
-					require("zen-mode").close()
-				end,
-				silent = true,
-				desc = "stop zen mode",
-			},
-			{
-				"]sz",
-				function()
-					require("zen-mode").open()
-				end,
-				silent = true,
-				desc = "start zen mode",
-			},
-		},
+		keys = { { "<leader>sz", ":ZenMode<cr>", silent = true, desc = "toggle zen mode" } },
 	},
 	{
 		"andrewferrier/wrapping.nvim",
@@ -85,6 +68,7 @@ local prose_plugs = {
 	-- displays prettier md rendering
 	{
 		"MeanderingProgrammer/render-markdown.nvim",
+		main = "render-markdown",
 		opts = {
 			file_types = { "markdown", "codecompanion" },
 			render_modes = { "n", "c", "i" },
@@ -107,6 +91,7 @@ local prose_plugs = {
 				},
 			},
 		},
+		name = "render-markdown", -- Only needed if you have another plugin named markdown.nvim
 		dependencies = {
 			"nvim-treesitter/nvim-treesitter",
 			"nvim-tree/nvim-web-devicons",
@@ -285,6 +270,9 @@ local prose_plugs = {
 		},
 	},
 
+	-- syntax highlighting for markdown criticmarkup (comments, additions, ...)
+	{ "vim-pandoc/vim-criticmarkup", ft = md_like },
+
 	-- create mindmaps from your markdown
 	{
 		"Zeioth/markmap.nvim",

nvim/.config/nvim/lua/plugins/treesitter.lua

@@ -21,6 +21,7 @@ return {
 			},
 			{ "nushell/tree-sitter-nu", version = false },
 		},
+		version = false, -- TODO: Can be set to versioned if new version after 2024-12-12 is released
 		config = function()
 			local enabled_parsers = {}
 			for _, lang in pairs(Languages) do