From c53095ce168740f41200ece035910ea4579e7984 Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Thu, 29 Feb 2024 20:48:29 +0545 Subject: [PATCH] . --- config/nvim/lazy-lock.json | 22 +-- .../lua/plugins/extras/editor/docs/neorg.lua | 2 +- .../plugins/extras/editor/docs/obsidian.lua | 166 ++++++++---------- 3 files changed, 88 insertions(+), 102 deletions(-) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 2b759901..3ba6b644 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LazyVim": { "branch": "main", "commit": "fe72424e77cb9c953084bbcaaa0eb7fe8056dc70" }, "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, - "SchemaStore.nvim": { "branch": "main", "commit": "a93078f016d3216f4ab4e4c65306b65212314d8d" }, + "SchemaStore.nvim": { "branch": "main", "commit": "9bc9a3a19dc6047d79d6073082f3b0deb7002c99" }, "actions-preview.nvim": { "branch": "master", "commit": "5c240e6356156b72cfbf7c05feefadae61d7a06f" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, @@ -28,7 +28,7 @@ "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" }, - "headlines.nvim": { "branch": "master", "commit": "d39c4e6ed8963717bc9b2dc39fada8fe1039e9bf" }, + "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "hydra.nvim": { "branch": "master", "commit": "55de54543d673824435930ecf533256eea2e565b" }, "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, @@ -50,7 +50,7 @@ "multicursors.nvim": { "branch": "main", "commit": "8b3e14682eed06a532b155c7eae33e174846b3fd" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "f3941c57ec85d7bdb44fa53fd858fd80f159018f" }, "neoconf.nvim": { "branch": "main", "commit": "98980b5300e7a5e7f93e8dbf81c98cc3daa55df7" }, - "neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, @@ -61,28 +61,28 @@ "nvim-devdocs": { "branch": "master", "commit": "521d24661ffe6d1ba025debea2675c765a9c1ee1" }, "nvim-lint": { "branch": "master", "commit": "4dade85ff26e4bad40f895a6cc6762b7036237f4" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "0ebcaedb2feb946e56658e0c9b6155fb6c8ad62b" }, + "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-puppeteer": { "branch": "main", "commit": "08b20904191e87116e12abde58e3afad9b3234f7" }, + "nvim-puppeteer": { "branch": "main", "commit": "00d526d6d24a1316a6b14cf2df4b738009f70d2e" }, "nvim-recorder": { "branch": "main", "commit": "bf9efe10bff3ae8461568eee7f0d6c8750b01569" }, "nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" }, - "nvim-treesitter": { "branch": "master", "commit": "31d06480554789557d24f1c2b7eacf627e43510c" }, + "nvim-treesitter": { "branch": "master", "commit": "06b5fda797ea4c363e9fe17b160c33818be8d319" }, "nvim-treesitter-context": { "branch": "master", "commit": "b8d1ffe58a88e0356da56b167373e89c4579ce15" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "60e8c288e011403f248b5f6478dde12bed8a6c55" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, - "nvim-various-textobjs": { "branch": "main", "commit": "035243ea3c4bf005b24d8068666c7d571c708503" }, + "nvim-various-textobjs": { "branch": "main", "commit": "3782eb41a964f45788843e34f325a470f0dc6757" }, "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, "nvim_context_vt": { "branch": "master", "commit": "8f7b6b46292e0819290b0d368abc3366b8a163fc" }, - "obsidian.nvim": { "branch": "main", "commit": "ebf4cd26f8c69e6ed025d06dfb4144212817878b" }, + "obsidian.nvim": { "branch": "main", "commit": "a6af03b3c32fac7e888f8996d67a4394ad6c082d" }, "outline.nvim": { "branch": "main", "commit": "a8d40aecb799196303ff3521c0e31c87bba57198" }, "overseer.nvim": { "branch": "master", "commit": "4855aefcf335bbac71eea9c6a888958fb1ed1e1a" }, "package-info.nvim": { "branch": "master", "commit": "45acce5b12ce824332d8000cc2c91805b6710446" }, "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, "persistent-breakpoints.nvim": { "branch": "main", "commit": "01e43512ef8d137f2b9e5c1c74fd35c37e787b59" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "64b7006a36cec099da7eaeb056c4a27dd5d73342" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "4902de74335ba0c4816cb67c5d5052c0c5fc7e56" }, "refactoring.nvim": { "branch": "master", "commit": "94444558fc651b7e36f39d86c518e44b4de15123" }, "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" }, "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, @@ -97,12 +97,12 @@ "telescope.nvim": { "branch": "master", "commit": "d5c4d9856320a07d04607c9b3a0523bd3f373328" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, - "tree-sitter-hyprlang": { "branch": "master", "commit": "739a6f0cbcf40bb121c478e96147396348836b1c" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "fc1d331586e4da2b5f5bcfa89d630ebafe66458b" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "ts-error-translator.nvim": { "branch": "main", "commit": "1d24a38427fd2030c5f4e82156c87ab7d6d44814" }, "ts-node-action": { "branch": "master", "commit": "e37eb458378de5d994df459a53711b2546abef0f" }, "tsc.nvim": { "branch": "main", "commit": "4151f82edcafad61201a779908dbc76edc64f494" }, - "vim-floaterm": { "branch": "master", "commit": "97c085b2f69e931ed78bb1c260512d1e0492a754" }, + "vim-floaterm": { "branch": "master", "commit": "c0535d758004bcce016839e318cbbe802b92c469" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "308b0088a864c4711a96e45b6734cf9294074f65" }, "vim-wakatime": { "branch": "master", "commit": "285c2e4e48fb0c63ced233c00fb10a2edb3b6c94" }, diff --git a/config/nvim/lua/plugins/extras/editor/docs/neorg.lua b/config/nvim/lua/plugins/extras/editor/docs/neorg.lua index 39641639..8956b2f0 100644 --- a/config/nvim/lua/plugins/extras/editor/docs/neorg.lua +++ b/config/nvim/lua/plugins/extras/editor/docs/neorg.lua @@ -2,7 +2,7 @@ return { "nvim-neorg/neorg", build = ":Neorg sync-parsers", dependencies = { "nvim-lua/plenary.nvim" }, - event = "VeryLazy", + ft = "norg", opts = { load = { ["core.defaults"] = {}, -- Loads default behaviour diff --git a/config/nvim/lua/plugins/extras/editor/docs/obsidian.lua b/config/nvim/lua/plugins/extras/editor/docs/obsidian.lua index 5c85fa69..582472bb 100644 --- a/config/nvim/lua/plugins/extras/editor/docs/obsidian.lua +++ b/config/nvim/lua/plugins/extras/editor/docs/obsidian.lua @@ -1,98 +1,84 @@ return { - "epwalsh/obsidian.nvim", - event = { "BufReadPre /docs/Documentos/Obsidian/**.md" }, - keys = { - { - "gf", - function() - if require("obsidian").util.cursor_on_markdown_link() then - return "ObsidianFollowLink" - else - return "gf" - end + { + "epwalsh/obsidian.nvim", + event = { "BufReadPre /docs/Documentos/Obsidian/**.md" }, + keys = { + { "oo", "ObsidianOpen", desc = "Open on App" }, + { "og", "ObsidianSearch", desc = "Grep" }, + { "sO", "ObsidianSearch", desc = "Obsidian Grep" }, + { "on", "ObsidianNew", desc = "New Note" }, + { "o", "ObsidianQuickSwitch", desc = "Find Files" }, + { "fo", "ObsidianQuickSwitch", desc = "Find Obsidian Files" }, + { "ob", "ObsidianBacklinks", desc = "Backlinks" }, + { "ot", "ObsidianTags", desc = "Tags" }, + { "ot", "ObsidianTemplate", desc = "Template" }, + { "ol", "ObsidianLink", desc = "Link" }, + { "oL", "ObsidianLinks", desc = "Links" }, + { "oN", "ObsidianLinkNew", desc = "New Link" }, + { "oe", "ObsidianExtractNote", desc = "Extract Note" }, + { "ow", "ObsidianWorkspace", desc = "Workspace" }, + { "or", "ObsidianRename", desc = "Rename" }, + { "oi", "ObsidianPasteImg", desc = "Paste Image" }, + }, + dependencies = { + "nvim-lua/plenary.nvim", + "hrsh7th/nvim-cmp", + "nvim-telescope/telescope.nvim", + "nvim-treesitter/nvim-treesitter", + }, + opts = { + workspaces = { + { + name = "personal", + path = "~/Documentos/Obsidian/obsidianVault/root", + }, + }, + + notes_subdir = "Notes", + + daily_notes = { + folder = "Journal/Entries/Daily", + date_format = "%Y-%m-%d", + alias_format = "%B %-d, %Y", + template = "_data_/templates/journal/daily_entry.md", + }, + + mappings = { + ["gf"] = { + action = function() + return require("obsidian").util.gf_passthrough() + end, + opts = { noremap = false, expr = true, buffer = true }, + }, + [""] = { + action = function() + return require("obsidian").util.toggle_checkbox() + end, + opts = { buffer = true }, + }, + }, + + templates = { + subdir = "_data_/templates", + date_format = "%Y-%m-%d-%a", + time_format = "%H:%M", + }, + + follow_url_func = function(url) + vim.fn.jobstart({ "xdg-open", url }) end, - noremap = false, - expr = true, + + attachments = { + img_folder = "_data_/media", + }, }, }, - dependencies = { - "nvim-lua/plenary.nvim", - "hrsh7th/nvim-cmp", - "nvim-telescope/telescope.nvim", - "nvim-treesitter/nvim-treesitter", - }, - opts = { - workspaces = { - { - name = "personal", - path = "~/Documentos/Obsidian/obsidianVault/root", + { + "folke/which-key.nvim", + opts = { + defaults = { + ["o"] = { name = " obsidian" }, }, }, - daily_notes = { - folder = "Journal/Entries/Daily", - date_format = "%Y-%m-%d", - alias_format = "%B %-d, %Y", - template = "_data_/templates/journal/daily_entry.md", - }, - - mappings = { - -- Overrides the 'gf' mapping to work on markdown/wiki links within your vault. - ["gf"] = { - action = function() - return require("obsidian").util.gf_passthrough() - end, - opts = { noremap = false, expr = true, buffer = true }, - }, - -- Toggle check-boxes. - [""] = { - action = function() - return require("obsidian").util.toggle_checkbox() - end, - opts = { buffer = true }, - }, - }, - - templates = { - subdir = "_data_/templates", - date_format = "%Y-%m-%d-%a", - time_format = "%H:%M", - }, - - backlinks = { height = 10, wrap = true }, - - -- Optional, by default when you use `:ObsidianFollowLink` on a link to an external - -- URL it will be ignored but you can customize this behavior here. - follow_url_func = function(url) - -- Open the URL in the default web browser. - vim.fn.jobstart({ "xdg-open", url }) -- linux - end, - - -- Optional, set to true if you use the Obsidian Advanced URI plugin. - -- https://github.com/Vinzent03/obsidian-advanced-uri - use_advanced_uri = false, - - -- Optional, set to true to force ':ObsidianOpen' to bring the app to the foreground. - open_app_foreground = false, - - finder = "telescope.nvim", - - open_notes_in = "current", - - attachments = { - img_folder = "_data_/media", - }, - - note_frontmatter_func = function(note) - -- This is equivalent to the default frontmatter function. - local out = { id = note.id, aliases = note.aliases, tags = note.tags } - -- `note.metadata` contains any manually added fields in the frontmatter. - -- So here we just make sure those fields are kept in the frontmatter. - if note.metadata ~= nil and require("obsidian").util.table_length(note.metadata) > 0 then - for k, v in pairs(note.metadata) do - out[k] = v - end - end - return out - end, }, }