updates

2 files changed, 25 insertions, 19 deletions

diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua
index 4e41a99..3199bec 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua
+++ b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua
@@ -267,19 +267,20 @@ return {
 		end,
 	},
 	{
-		"goerz/jupytext.vim",
+		"goerz/jupytext.nvim",
+		version = "0.2.0",
 		lazy = false,
-		build = "pip install jupytext",
-		dependencies = { "neovim/nvim-lspconfig" },
 		config = function()
-			-- The destination format: 'ipynb', 'markdown' or 'script', or a file extension: 'md', 'Rmd', 'jl', 'py', 'R', ..., 'auto' (script
-			-- extension matching the notebook language), or a combination of an extension and a format name, e.g. md:markdown, md:pandoc,
-			-- md:myst or py:percent, py:light, py:nomarker, py:hydrogen, py:sphinx. The default format for scripts is the 'light' format,
-			-- which uses few cell markers (none when possible). Alternatively, a format compatible with many editors is the 'percent' format,
-			-- which uses '# %%' as cell markers. The main formats (markdown, light, percent) preserve notebooks and text documents in a
-			-- roundtrip. Use the --test and and --test-strict commands to test the roundtrip on your files. Read more about the available
-			-- formats at https://jupytext.readthedocs.io/en/latest/formats.html (default: None)
-			vim.g.jupytext_fmt = "markdown"
+			require("jupytext").setup({
+				jupytext = "jupytext",
+				format = "markdown",
+				update = true,
+				filetype = require("jupytext").get_filetype,
+				new_template = require("jupytext").default_new_template(),
+				sync_patterns = { "*.md", "*.py", "*.jl", "*.R", "*.Rmd", "*.qmd" },
+				autosync = true,
+				handle_url_schemes = true,
+			})
 		end,
 		keys = {
 			{ "<A-i>", insert_code_cell, desc = "Insert Code Cell" },
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/vimwiki.lua b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua
index 73ed91c..4d01f59 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/vimwiki.lua
+++ b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua
@@ -18,11 +18,9 @@ return {
 			local wk = require("which-key")
 			wk.add({
 				mode = { "n" },
-				{ "<leader>w", group = "Vimwiki" },
+				{ "<leader>w", group = "Vimwiki/Which-key" },
 				{ "<leader>w<leader>", group = "Diary" },
 			})
-		end,
-		config = function()
 			-- Ensure files are read with the desired filetype
 			vim.g.vimwiki_ext2syntax = {
 				[".Rmd"] = "markdown",
@@ -47,6 +45,7 @@ return {
 	{
 		"tools-life/taskwiki",
 		cmd = { "TaskWikiInfo", "TaskWikiSummary", "TaskWikiStart", "TaskWikiMod" },
+		ft = "vimwiki",
 		dependencies = {
 			"vimwiki/vimwiki",
 			"powerman/vim-plugin-AnsiEsc",
@@ -54,11 +53,17 @@ return {
 			"farseer90718/vim-taskwarrior",
 		},
 		config = function()
-			require("taskwiki").setup()
-			vim.keymap.set("n", "<leader>tvi", ":TaskWikiInfo<CR>", { desc = "Task wiki info" })
-			vim.keymap.set("n", "<leader>tvS", ":TaskWikiSummary<CR>", { desc = "Task wiki summary" })
-			vim.keymap.set("n", "<leader>tvm", ":TaskWikiMod<CR>", { desc = "Task wiki modify" })
-			vim.keymap.set("n", "<leader>tvs", ":TaskWikiMod<CR>", { desc = "Task wiki modify" })
+			vim.g.taskwiki_markup_syntax = "markdown"
+			vim.g.taskwiki_data_location = "~/.local/share/task"
+
+			local wk = require("which-key")
+			wk.add({
+				mode = { "n" },
+				{ "<leader>tb", group = "Burndown" },
+				{ "<leader>tc", group = "Choose" },
+				{ "<leader>tG", group = "Ghistory" },
+				{ "<leader>th", group = "History" },
+			})
 		end,
 	},
 }