From bc3c4dc00f4f61419217813a889574bfaafe3722 Mon Sep 17 00:00:00 2001 From: TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> Date: Thu, 5 Jun 2025 02:39:54 +0900 Subject: updates --- .../TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua | 23 ++++---- .../TheSiahxyz/lua/thesiahxyz/plugins/vimwiki.lua | 64 -------------------- .../TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua | 69 ++++++++++++++++++++++ ar/.config/shell/bm-dirs | 3 +- ar/.config/shell/bm-files | 2 +- ar/.config/task/taskrc | 3 +- global/.local/share/venvs/default-requirements.txt | 1 + 7 files changed, 85 insertions(+), 80 deletions(-) delete mode 100644 ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/vimwiki.lua create mode 100644 ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua 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 = { { "", 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/vimwiki.lua deleted file mode 100644 index 73ed91c..0000000 --- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/vimwiki.lua +++ /dev/null @@ -1,64 +0,0 @@ -return { - { - "vimwiki/vimwiki", - cmd = { - "VimwikiIndex", - "VimwikiDeleteFile", - "Vimwiki2HTML", - "VimwikiAll2HTML", - "Vimwiki2HTMLBrowse", - "VimwikiGoto", - "VimwikiRenameFile", - "VimwikiSplitLink", - "VimwikiVSplitLink", - "VimwikiColorize", - "VimwikiDiaryGenerateLinks", - }, - init = function() - local wk = require("which-key") - wk.add({ - mode = { "n" }, - { "w", group = "Vimwiki" }, - { "w", group = "Diary" }, - }) - end, - config = function() - -- Ensure files are read with the desired filetype - vim.g.vimwiki_ext2syntax = { - [".Rmd"] = "markdown", - [".rmd"] = "markdown", - [".md"] = "markdown", - [".markdown"] = "markdown", - [".mdown"] = "markdown", - } - -- Set up Vimwiki list - vim.g.vimwiki_list = { - { - path = vim.fn.expand("~/.local/share/vimwiki"), - syntax = "markdown", - ext = ".md", - }, - } - end, - keys = { - { "ww", ":VimwikiIndex", desc = "Vimwiki index" }, - }, - }, - { - "tools-life/taskwiki", - cmd = { "TaskWikiInfo", "TaskWikiSummary", "TaskWikiStart", "TaskWikiMod" }, - dependencies = { - "vimwiki/vimwiki", - "powerman/vim-plugin-AnsiEsc", - "majutsushi/tagbar", - "farseer90718/vim-taskwarrior", - }, - config = function() - require("taskwiki").setup() - vim.keymap.set("n", "tvi", ":TaskWikiInfo", { desc = "Task wiki info" }) - vim.keymap.set("n", "tvS", ":TaskWikiSummary", { desc = "Task wiki summary" }) - vim.keymap.set("n", "tvm", ":TaskWikiMod", { desc = "Task wiki modify" }) - vim.keymap.set("n", "tvs", ":TaskWikiMod", { desc = "Task wiki modify" }) - end, - }, -} diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua new file mode 100644 index 0000000..4d01f59 --- /dev/null +++ b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua @@ -0,0 +1,69 @@ +return { + { + "vimwiki/vimwiki", + cmd = { + "VimwikiIndex", + "VimwikiDeleteFile", + "Vimwiki2HTML", + "VimwikiAll2HTML", + "Vimwiki2HTMLBrowse", + "VimwikiGoto", + "VimwikiRenameFile", + "VimwikiSplitLink", + "VimwikiVSplitLink", + "VimwikiColorize", + "VimwikiDiaryGenerateLinks", + }, + init = function() + local wk = require("which-key") + wk.add({ + mode = { "n" }, + { "w", group = "Vimwiki/Which-key" }, + { "w", group = "Diary" }, + }) + -- Ensure files are read with the desired filetype + vim.g.vimwiki_ext2syntax = { + [".Rmd"] = "markdown", + [".rmd"] = "markdown", + [".md"] = "markdown", + [".markdown"] = "markdown", + [".mdown"] = "markdown", + } + -- Set up Vimwiki list + vim.g.vimwiki_list = { + { + path = vim.fn.expand("~/.local/share/vimwiki"), + syntax = "markdown", + ext = ".md", + }, + } + end, + keys = { + { "ww", ":VimwikiIndex", desc = "Vimwiki index" }, + }, + }, + { + "tools-life/taskwiki", + cmd = { "TaskWikiInfo", "TaskWikiSummary", "TaskWikiStart", "TaskWikiMod" }, + ft = "vimwiki", + dependencies = { + "vimwiki/vimwiki", + "powerman/vim-plugin-AnsiEsc", + "majutsushi/tagbar", + "farseer90718/vim-taskwarrior", + }, + config = function() + vim.g.taskwiki_markup_syntax = "markdown" + vim.g.taskwiki_data_location = "~/.local/share/task" + + local wk = require("which-key") + wk.add({ + mode = { "n" }, + { "tb", group = "Burndown" }, + { "tc", group = "Choose" }, + { "tG", group = "Ghistory" }, + { "th", group = "History" }, + }) + end, + }, +} diff --git a/ar/.config/shell/bm-dirs b/ar/.config/shell/bm-dirs index 2971406..ecb0b0f 100644 --- a/ar/.config/shell/bm-dirs +++ b/ar/.config/shell/bm-dirs @@ -39,6 +39,7 @@ ctm ${XDG_CONFIG_HOME:-${HOME}/.config}/tmux cts ${XDG_CONFIG_HOME:-${HOME}/.config}/TheSiahxyz/lua/thesiahxyz cvc ${XDG_CONFIG_HOME:-${HOME}/.config}/vim cvp ${XDG_CONFIG_HOME:-${HOME}/.config}/openvpn +cvw ${XDG_DATA_HOME:-${HOME}/.local/share}/vimwiki cxc ${XDG_CONFIG_HOME:-${HOME}/.config}/x11 czc ${XDG_CONFIG_HOME:-${HOME}/.config}/zsh dot ${XDG_DOTFILES_DIR:-${HOME}/.dotfiles} @@ -105,8 +106,6 @@ tk ${XDG_DATA_HOME:-${HOME}/.local/share}/thesiah/keys tr ${XDG_DATA_HOME:-${HOME}/.local/share}/Trash/files ts ${XDG_DATA_HOME:-${HOME}/.local/share}/thesiah tt ${XDG_STATE_HOME:-${HOME}/.local/state} -vwk ${XDG_DATA_HOME:-${HOME}/.local/share}/vimwiki -vww $HOME/.wallpapers/video web ${THESIAH_WWW:-${HOME}/Private/repos/THESIAH} wep ${THESIAH_WWW:-${HOME}/Private/repos/THESIAH}/public wes ${THESIAH_WWW:-${HOME}/Private/repos/THESIAH}/static diff --git a/ar/.config/shell/bm-files b/ar/.config/shell/bm-files index 4648ca8..8210d32 100644 --- a/ar/.config/shell/bm-files +++ b/ar/.config/shell/bm-files @@ -41,7 +41,7 @@ vur ${XDG_DATA_HOME:-${HOME}/.local/share}/thesiah/urls vvc ${XDG_CONFIG_HOME:-${HOME}/.config}/vim/vimrc # Vim config vvi ${XDG_CONFIG_HOME:-${HOME}/.config}/vim/init.vim # Vim init vvp ${XDG_CONFIG_HOME:-${HOME}/.config}/vim/plugins.vim # Vim plugins -vvw ${XDG_DATA_HOME:-${HOME}/.local/share}/vimwiki # Vimwiki +vvw ${XDG_DATA_HOME:-${HOME}/.local/share}/vimwiki/index.md # Vimwiki vxc ${XDG_CONFIG_HOME:-${HOME}/.config}/x11/xinitrc # X11 config vxp ${XDG_CONFIG_HOME:-${HOME}/.config}/x11/xprofile # Start up - X11 profile vxr ${XDG_CONFIG_HOME:-${HOME}/.config}/x11/xresources # Colors, themes and variables for X11 diff --git a/ar/.config/task/taskrc b/ar/.config/task/taskrc index 665a077..e5b55f8 100644 --- a/ar/.config/task/taskrc +++ b/ar/.config/task/taskrc @@ -1,5 +1,5 @@ # [Created by task 3.1.0 10/5/2024 17:27:41] -news.version=3.2.0 +news.version=3.4.1 # Taskwarrior program configuration file. # For more documentation, see https://taskwarrior.org or try 'man task', 'man task-color', @@ -188,4 +188,3 @@ uda.taskwarrior-tui.selection.dim=yes uda.taskwarrior-tui.selection.blink=no uda.taskwarrior-tui.selection.reverse=yes uda.taskwarrior-tui.task-report.show-info=false -context=home diff --git a/global/.local/share/venvs/default-requirements.txt b/global/.local/share/venvs/default-requirements.txt index a6a45fb..d650298 100644 --- a/global/.local/share/venvs/default-requirements.txt +++ b/global/.local/share/venvs/default-requirements.txt @@ -20,6 +20,7 @@ pynvim pyperclip requests stig +tasklib torch trash-cli urlscan -- cgit v1.2.3