diff options
| -rw-r--r-- | nvim/.config/nvim/after/syntax/markdown.vim | 6 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins.lua | 7 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/zk.lua | 14 | ||||
| -rw-r--r-- | sh/.profile | 1 |
5 files changed, 29 insertions, 1 deletions
diff --git a/nvim/.config/nvim/after/syntax/markdown.vim b/nvim/.config/nvim/after/syntax/markdown.vim new file mode 100644 index 0000000..7cf39cf --- /dev/null +++ b/nvim/.config/nvim/after/syntax/markdown.vim @@ -0,0 +1,6 @@ +" markdownWikiLink is a new region +syn region markdownWikiLink matchgroup=markdownLinkDelimiter start="\[\[" end="\]\]" contains=markdownUrl keepend oneline concealends +" markdownLinkText is copied from runtime files with 'concealends' appended +syn region markdownLinkText matchgroup=markdownLinkTextDelimiter start="!\=\[\%(\%(\_[^][]\|\[\_[^][]*\]\)*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" nextgroup=markdownLink,markdownId skipwhite contains=@markdownInline,markdownLineStart concealends +" markdownLink is copied from runtime files with 'conceal' appended +syn region markdownLink matchgroup=markdownLinkDelimiter start="(" end=")" contains=markdownUrl keepend contained conceal diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua index 52953b6..e30da5c 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua @@ -117,6 +117,13 @@ M.plugins = function(use) }) use({ + "mickael-menu/zk-nvim", + config = function() + require("tobyvin.plugins.zk").setup() + end, + }) + + use({ "brymer-meneses/grammar-guard.nvim", requires = { "neovim/nvim-lspconfig", diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua b/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua index af45db4..c9bd6cc 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua @@ -14,7 +14,7 @@ M.setup = function() }, highlight = { enable = true, - additional_vim_regex_highlighting = { "latex" }, + additional_vim_regex_highlighting = { "latex", "markdown" }, disable = function(_, bufnr) return vim.api.nvim_buf_line_count(bufnr) > 2500 end, diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/zk.lua b/nvim/.config/nvim/lua/tobyvin/plugins/zk.lua new file mode 100644 index 0000000..5116e3f --- /dev/null +++ b/nvim/.config/nvim/lua/tobyvin/plugins/zk.lua @@ -0,0 +1,14 @@ +local M = {} + +M.setup = function() + local status_ok, zk = pcall(require, "zk") + if not status_ok then + vim.notify("Failed to load module 'zk'", "error") + return + end + + -- vim.keymap.set("n", "<leader>u", zk.toggle, { desc = "Toggle zk" }) + zk.setup() +end + +return M diff --git a/sh/.profile b/sh/.profile index a17221f..524475d 100644 --- a/sh/.profile +++ b/sh/.profile @@ -25,6 +25,7 @@ export LESS="--RAW-CONTROL-CHARS --quit-if-one-screen --mouse" export LESSOPEN="|lesspipe.sh %s" export LESSHISTFILE="$XDG_STATE_HOME/lesshst" export WGETRC="$XDG_CONFIG_HOME/wgetrc" +export ZK_NOTEBOOK_DIR="$HOME/zk" export STARSHIP_LOG="error" export FZF_DEFAULT_COMMAND="fd --type f || git ls-tree -r --name-only HEAD || rg --files || find ." export FZF_DEFAULT_OPTS='--exit-0 --select-1 |