From 2f47a53504ae5667b32b4bb8d420bd71a49530b3 Mon Sep 17 00:00:00 2001 From: Warwick Date: Thu, 30 Jan 2025 12:09:14 +0000 Subject: [PATCH] Added org roam --- lua/core/plugin_config/nvim-tree.lua | 2 +- lua/core/plugin_config/org.lua | 16 ++++++++++------ lua/core/plugins.lua | 12 +++++++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lua/core/plugin_config/nvim-tree.lua b/lua/core/plugin_config/nvim-tree.lua index 9653950..9739576 100644 --- a/lua/core/plugin_config/nvim-tree.lua +++ b/lua/core/plugin_config/nvim-tree.lua @@ -9,4 +9,4 @@ vim.opt.termguicolors = true require("nvim-tree").setup() -- keymap -vim.keymap.set("n", "n", ':NvimTreeFindFileToggle') +vim.keymap.set("n", "s", ':NvimTreeFindFileToggle') diff --git a/lua/core/plugin_config/org.lua b/lua/core/plugin_config/org.lua index 94d53e3..f12bac5 100644 --- a/lua/core/plugin_config/org.lua +++ b/lua/core/plugin_config/org.lua @@ -14,7 +14,7 @@ require('nvim-treesitter.configs').setup({ require('orgmode').setup({ org_agenda_files = { "~/.vimwiki/org/**/*.org" }, org_default_notes_file = '~/.vimwiki/org/refile.org', - org_todo_keywords = {'TODO(t)', 'HOLD(h)', '|', 'DONE(d)'} + org_todo_keywords = { 'TODO(t)', 'HOLD(h)', '|', 'DONE(d)' } }) require('cmp').setup({ @@ -23,9 +23,13 @@ require('cmp').setup({ } }) -require("orgWiki").setup({ - wiki_path = { "~/.vimwiki/org/" }, - diary_path = "~/.vimwiki/org/diary/", -}) - require('org-bullets').setup() + +require("org-roam").setup({ + directory = "~/.vimwiki/org/", + --org_files = { + -- "~/another_org_dir", + -- "~/some/folder/*.org", + -- "~/a/single/org_file.org", + --} +}) diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua index 2c152b8..f6fc20c 100644 --- a/lua/core/plugins.lua +++ b/lua/core/plugins.lua @@ -6,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then if vim.v.shell_error ~= 0 then vim.api.nvim_echo({ { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, + { out, "WarningMsg" }, { "\nPress any key to exit..." }, }, true, {}) vim.fn.getchar() @@ -79,8 +79,14 @@ local plugins = { dependencies = { { 'nvim-orgmode/orgmode' } }, }, { - "ranjithshegde/orgWiki.nvim", - dependencies = { { 'nvim-orgmode/orgmode' } }, + "chipsenkbeil/org-roam.nvim", + tag = "0.1.1", + dependencies = { + { + "nvim-orgmode/orgmode", + --tag = "0.3.7", + }, + }, }, -- Obsidian {