From 63197e6f8413685b427e9e7501a1e6e60800f8b0 Mon Sep 17 00:00:00 2001 From: thomasabishop Date: Sun, 18 Feb 2024 11:38:10 +0000 Subject: [PATCH] zk: add various zk integrations --- nvim/init.lua | 1 + nvim/lua/thomas/plugins-setup.lua | 1 + nvim/lua/thomas/plugins/treesitter.lua | 1 + nvim/lua/thomas/plugins/zk.lua | 22 ++++++++++++++++++++++ zk/config.toml | 2 ++ zsh/zshrc | 2 ++ 6 files changed, 29 insertions(+) create mode 100644 nvim/lua/thomas/plugins/zk.lua create mode 100644 zk/config.toml diff --git a/nvim/init.lua b/nvim/init.lua index eaeea5d..0cc19db 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -27,3 +27,4 @@ require("thomas.plugins.copilot_plugin") require("thomas.plugins.nvim-tree") require("thomas.plugins.rainbow-delimiters") require("thomas.plugins.gitblame") +require("thomas.plugins.zk") diff --git a/nvim/lua/thomas/plugins-setup.lua b/nvim/lua/thomas/plugins-setup.lua index bcb33ef..842c5b1 100644 --- a/nvim/lua/thomas/plugins-setup.lua +++ b/nvim/lua/thomas/plugins-setup.lua @@ -41,6 +41,7 @@ return packer.startup(function(use) use("ellisonleao/gruvbox.nvim") use("sainnhe/gruvbox-material") use("kdheepak/lazygit.nvim") + use("zk-org/zk-nvim") use("tpope/vim-fugitive") use("rcarriga/nvim-notify") use("tpope/vim-markdown") diff --git a/nvim/lua/thomas/plugins/treesitter.lua b/nvim/lua/thomas/plugins/treesitter.lua index 4dddc38..c6a0668 100644 --- a/nvim/lua/thomas/plugins/treesitter.lua +++ b/nvim/lua/thomas/plugins/treesitter.lua @@ -9,6 +9,7 @@ treesitter.setup({ -- enable syntax highlighting highlight = { enable = true, + additional_vim_regex_highlighting = true, }, -- enable indentation indent = { enable = true }, diff --git a/nvim/lua/thomas/plugins/zk.lua b/nvim/lua/thomas/plugins/zk.lua new file mode 100644 index 0000000..96a2fe2 --- /dev/null +++ b/nvim/lua/thomas/plugins/zk.lua @@ -0,0 +1,22 @@ +local zk_setup, zk = pcall(require, "zk") +if not zk_setup then + return +end + +zk.setup({ + picker = "telescope", + + lsp = { + config = { + cmd = { "zk", "lsp" }, + name = "zk", + -- on_attach = ... + -- etc, see `:h vim.lsp.start_client()` + }, + + auto_attach = { + enabled = true, + filetypes = { "markdown" }, + }, + }, +}) diff --git a/zk/config.toml b/zk/config.toml new file mode 100644 index 0000000..af50e1a --- /dev/null +++ b/zk/config.toml @@ -0,0 +1,2 @@ +[notebook] +dir = "~/repos/eolas/zk" # same as "$HOME/notebook" diff --git a/zsh/zshrc b/zsh/zshrc index 32a493c..a1c710e 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -3,6 +3,8 @@ export ZSH="/home/thomas/.oh-my-zsh" alias vim="nvim" alias cat="bat" alias grep="rg" +alias z="cd /home/thomas/repos/eolas/zk" +alias zn="/home/thomas/dotfiles/scripts/new_zk_note.sh" alias xhd="cd /run/media/thomas" alias cs-update="/home/thomas/repos/eolas/_scripts/auto_save.sh" alias cs-query="/home/thomas/repos/eolas/_scripts/query.sh"