improve markdown and obsidian configuration
no eager loading anymore, consolidate keymaps in the plugin etc.
This commit is contained in:
parent
0842439e34
commit
6ae7eb42aa
|
|
@ -1,73 +1,46 @@
|
||||||
return {
|
return {
|
||||||
'epwalsh/obsidian.nvim',
|
'obsidian-nvim/obsidian.nvim',
|
||||||
version = '*', -- Use the latest release
|
version = '*', -- use latest release, remove to use latest commit
|
||||||
lazy = true,
|
lazy = true,
|
||||||
event = {
|
event = {
|
||||||
-- Load obsidian.nvim only when opening files in the vault
|
-- If you want to use the home shortcut '~' here, you need to call 'vim.fn.expand'.
|
||||||
'BufReadPre '
|
"BufReadPre " .. vim.fn.expand "~" .. "/AdisObsidianSyncVault/**.md",
|
||||||
.. vim.fn.expand '~/AdisObsidianSyncVault'
|
"BufNewFile " .. vim.fn.expand "~" .. "/AdisObsidianSyncVault/**.md",
|
||||||
.. '/*.md',
|
|
||||||
'BufNewFile ' .. vim.fn.expand '~/AdisObsidianSyncVault' .. '/*.md',
|
|
||||||
},
|
},
|
||||||
|
|
||||||
dependencies = {
|
dependencies = {
|
||||||
'nvim-lua/plenary.nvim', -- Required dependency
|
'nvim-lua/plenary.nvim',
|
||||||
'hrsh7th/nvim-cmp',
|
|
||||||
},
|
},
|
||||||
|
cmd = {
|
||||||
opts = function(_, opts)
|
"ObsidianOpen",
|
||||||
vim.api.nvim_create_autocmd('FileType', {
|
"ObsidianNew",
|
||||||
pattern = { 'markdown', 'md' },
|
"ObsidianQuickSwitch",
|
||||||
callback = function()
|
"ObsidianFollowLink",
|
||||||
vim.wo.conceallevel = 1
|
"ObsidianBacklinks",
|
||||||
end,
|
"ObsidianTags",
|
||||||
})
|
"ObsidianToday",
|
||||||
return {
|
"ObsidianYesterday",
|
||||||
|
"ObsidianTomorrow",
|
||||||
|
"ObsidianDailies",
|
||||||
|
"ObsidianTemplate",
|
||||||
|
"ObsidianSearch",
|
||||||
|
"ObsidianLink",
|
||||||
|
"ObsidianLinkNew",
|
||||||
|
"ObsidianLinks",
|
||||||
|
"ObsidianExtractNote",
|
||||||
|
"ObsidianWorkspace",
|
||||||
|
"ObsidianPasteImg",
|
||||||
|
"ObsidianRename",
|
||||||
|
"ObsidianTOC",
|
||||||
|
},
|
||||||
|
---@module 'obsidian'
|
||||||
|
---@type obsidian.config
|
||||||
|
opts = {
|
||||||
|
legacy_commands = false, -- this will be removed in the next major release
|
||||||
workspaces = {
|
workspaces = {
|
||||||
{
|
{
|
||||||
name = 'work',
|
name = 'MyOnlyVault',
|
||||||
path = '~/AdisObsidianSyncVault', -- Define your vault path
|
path = '~/AdisObsidianSyncVault',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
templates = {
|
|
||||||
folder = '~/AdisObsidianSyncVault/Templates',
|
|
||||||
date_format = '%d.%m.%Y',
|
|
||||||
time_format = '%H:%M',
|
|
||||||
},
|
},
|
||||||
-- Optional, completion of wiki links, local markdown links, and tags using nvim-cmp.
|
|
||||||
completion = {
|
|
||||||
-- Set to false to disable completion.
|
|
||||||
nvim_cmp = true,
|
|
||||||
-- Trigger completion at 2 chars.
|
|
||||||
min_chars = 2,
|
|
||||||
},
|
|
||||||
|
|
||||||
ui = {
|
|
||||||
-- recommended here: https://github.com/MeanderingProgrammer/render-markdown.nvim
|
|
||||||
enabled = false,
|
|
||||||
},
|
|
||||||
|
|
||||||
note_id_func = function(title)
|
|
||||||
-- Create note IDs in a Zettelkasten format with a timestamp and a suffix.
|
|
||||||
-- In this case a note with the title 'My new note' will be given an ID that looks
|
|
||||||
-- like '1657296016-my-new-note', and therefore the file name '1657296016-my-new-note.md'
|
|
||||||
local suffix = ''
|
|
||||||
if title ~= nil then
|
|
||||||
-- If title is given, transform it into valid file name.
|
|
||||||
suffix = title:gsub(' ', '-'):gsub('[^A-Za-z0-9-]', ''):lower()
|
|
||||||
else
|
|
||||||
-- If title is nil, just add 4 random uppercase letters to the suffix.
|
|
||||||
for _ = 1, 4 do
|
|
||||||
suffix = suffix .. string.char(math.random(65, 90))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return tostring(os.time()) .. '-' .. suffix
|
|
||||||
end,
|
|
||||||
|
|
||||||
note_path_func = function(spec)
|
|
||||||
local path = spec.dir / tostring(spec.title)
|
|
||||||
return path:with_suffix '.md'
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
return {
|
return {
|
||||||
"MeanderingProgrammer/render-markdown.nvim",
|
"MeanderingProgrammer/render-markdown.nvim",
|
||||||
dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
|
dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
|
||||||
|
ft = { "markdown" },
|
||||||
-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
|
-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
|
||||||
-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
|
-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
|
||||||
---@module 'render-markdown'
|
---@module 'render-markdown'
|
||||||
|
|
|
||||||
|
|
@ -55,12 +55,9 @@ map('n', '<leader>r', ' Render Markdown')
|
||||||
map('n', '<leader>rt', '<Cmd>RenderMarkdown toggle<CR>', { desc = 'toggle render markdown', silent = true })
|
map('n', '<leader>rt', '<Cmd>RenderMarkdown toggle<CR>', { desc = 'toggle render markdown', silent = true })
|
||||||
map('n', '<leader>re', '<Cmd>RenderMarkdown expand<CR>', { desc = 'Increase anti-conceal margin above and below by 1', silent = true })
|
map('n', '<leader>re', '<Cmd>RenderMarkdown expand<CR>', { desc = 'Increase anti-conceal margin above and below by 1', silent = true })
|
||||||
map('n', '<leader>re', '<Cmd>RenderMarkdown expand<CR>', { desc = 'Decrease anti-conceal margin above and below by 1', silent = true })
|
map('n', '<leader>re', '<Cmd>RenderMarkdown expand<CR>', { desc = 'Decrease anti-conceal margin above and below by 1', silent = true })
|
||||||
map('n', '<leader>os', '<Cmd>ObsidianSearch<CR>', { silent = true })
|
map('n', '<leader>ot', '<Cmd>Obsidian today<CR>', { silent = true })
|
||||||
map('n', '<leader>ob', '<Cmd>ObsidianBacklink<CR>', { silent = true })
|
map('n', '<leader>od', '<Cmd>Obsidian dailies<CR>', { silent = true })
|
||||||
map('n', '<leader>ot', '<Cmd>ObsidianToday<CR>', { silent = true })
|
map('n', '<leader>oq', '<Cmd>Obsidian quick_switch<CR>', { silent = true })
|
||||||
map('n', '<leader>od', '<Cmd>ObsidianDailies<CR>', { silent = true })
|
|
||||||
map('n', '<leader>oq', '<Cmd>ObsidianQuickSwitch<CR>', { silent = true })
|
|
||||||
map('n', '<leader>on', '<Cmd>ObsidianNew<CR>', { silent = true })
|
|
||||||
|
|
||||||
map('n', '<leader>e', '<Cmd>Neotree toggle<CR>')
|
map('n', '<leader>e', '<Cmd>Neotree toggle<CR>')
|
||||||
map('n', '<leader><Tab>', '<Cmd>bn<CR>', { desc = 'next buffer' })
|
map('n', '<leader><Tab>', '<Cmd>bn<CR>', { desc = 'next buffer' })
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue