diff --git a/config/nvim/.github/README.md b/config/nvim/.github/README.md index 8a99d454..31af6c45 100644 --- a/config/nvim/.github/README.md +++ b/config/nvim/.github/README.md @@ -341,7 +341,6 @@ 📚 Note-Taking - [nvim-neorg/neorg](https://dotfyle.com/plugins/nvim-neorg/neorg) -- [epwalsh/obsidian.nvim](https://dotfyle.com/plugins/epwalsh/obsidian.nvim) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 8c91ca23..9cec02f3 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -28,7 +28,7 @@ "garbage-day.nvim": { "branch": "main", "commit": "029214aff15487822fbbbce6c622d1c380a20fed" }, "gitsigns.nvim": { "branch": "main", "commit": "4e348641b8206c3b8d23080999e3ddbe4ca90efc" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, - "grapple.nvim": { "branch": "main", "commit": "6f4642d61088b78dc97c17a4d638f491617be046" }, + "grapple.nvim": { "branch": "main", "commit": "9cecb0af4493d75239446604f237f46fd6b19f81" }, "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "hydra.nvim": { "branch": "master", "commit": "55de54543d673824435930ecf533256eea2e565b" }, "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" }, @@ -39,7 +39,7 @@ "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1bed24274d911bb3ed730c516ffce27e8fdeeac3" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, "mini.ai": { "branch": "main", "commit": "ee9446a17c160aba6a04ff22097389c41872c878" }, @@ -50,7 +50,7 @@ "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "multicursors.nvim": { "branch": "main", "commit": "8b3e14682eed06a532b155c7eae33e174846b3fd" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "742db4e60c74e5fbcc596aaf9e7575e1342dfd09" }, - "neoconf.nvim": { "branch": "main", "commit": "ffdeab72dc167543f9b3355baceb0918f1e81fc0" }, + "neoconf.nvim": { "branch": "main", "commit": "68753daced3b41d6b5e4a441b10a69c1ec33523c" }, "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neogen": { "branch": "main", "commit": "b95347a588401a755eadd17482edc1662876bd58" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, @@ -62,7 +62,7 @@ "nvim-devdocs": { "branch": "master", "commit": "521d24661ffe6d1ba025debea2675c765a9c1ee1" }, "nvim-lint": { "branch": "master", "commit": "03b1fc593638098a35de26d768d5f43b0fe57041" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "4bdd3800b4148f670c6cf55ef65f490148eeb550" }, + "nvim-lspconfig": { "branch": "master", "commit": "5b364bd4db0fb68a56ffe427a370920854acb834" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-puppeteer": { "branch": "main", "commit": "ea340595967919222f3ba5c6c6def0787a336c82" }, "nvim-recorder": { "branch": "main", "commit": "f37f8e80b32c2a5dca2bd8f6d9dce278b3f5e434" }, @@ -74,16 +74,15 @@ "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-various-textobjs": { "branch": "main", "commit": "6cefba253d69306004a641a11c395381ae428903" }, - "nvim-web-devicons": { "branch": "master", "commit": "a851380fbea4c1312d11f13d5cdc86a7a19808dd" }, + "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, "nvim_context_vt": { "branch": "master", "commit": "8f7b6b46292e0819290b0d368abc3366b8a163fc" }, - "obsidian.nvim": { "branch": "main", "commit": "450c3dabffa395502800d6ac0b1d1dcd5d89f80e" }, - "outline.nvim": { "branch": "main", "commit": "a8d40aecb799196303ff3521c0e31c87bba57198" }, + "outline.nvim": { "branch": "main", "commit": "bdfd2da90e9a7686d00e55afa9f772c4b6809413" }, "overseer.nvim": { "branch": "master", "commit": "b72f6d23ce47ccd427be2341f389c63448278f17" }, "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": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "cfc3f53cfa0fbabd95bd33747288aea24fe45211" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "2200900e3c1aae21dadb65c2ea2e91bcc39ca368" }, "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" }, "rustaceanvim": { "branch": "master", "commit": "69a22c2ec63ab375190006751562b62ebb318250" }, "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index 0907d30f..52403d5a 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -19,7 +19,6 @@ "plugins.extras.editor.color", "plugins.extras.editor.compiler", "plugins.extras.editor.docs.devdocs", - "plugins.extras.editor.docs.obsidian", "plugins.extras.editor.git.diffview", "plugins.extras.editor.live-server", "plugins.extras.editor.marks.grapple", @@ -70,11 +69,10 @@ "plugins.extras.util.icon-picker", "plugins.extras.util.kitty-scrollback", "plugins.extras.util.smart-splits", - "plugins.extras.util.vscode", "plugins.extras.util.wakatime" ], "news": { "NEWS.md": "2123" }, "version": 3 -} \ No newline at end of file +} diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index ce37bfd5..a5a48029 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -27,7 +27,7 @@ end -- Root dir detection go.root_spec = { "lsp", - { ".git", "lua", ".obsidian", "package.json", "Makefile", "go.mod", "cargo.toml", "pyproject.toml", "src" }, + { ".git", "lua", "package.json", "Makefile", "go.mod", "cargo.toml", "pyproject.toml", "src" }, "cwd", } diff --git a/config/nvim/lua/plugins/extras/editor/docs/obsidian.lua b/config/nvim/lua/plugins/extras/editor/docs/obsidian.lua deleted file mode 100644 index 582472bb..00000000 --- a/config/nvim/lua/plugins/extras/editor/docs/obsidian.lua +++ /dev/null @@ -1,84 +0,0 @@ -return { - { - "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, - - attachments = { - img_folder = "_data_/media", - }, - }, - }, - { - "folke/which-key.nvim", - opts = { - defaults = { - ["o"] = { name = " obsidian" }, - }, - }, - }, -} diff --git a/config/nvim/lua/plugins/extras/util/neovide.lua b/config/nvim/lua/plugins/extras/util/neovide.lua deleted file mode 100644 index a8cc77b9..00000000 --- a/config/nvim/lua/plugins/extras/util/neovide.lua +++ /dev/null @@ -1,45 +0,0 @@ -if not vim.g.neovide then - return {} -end - -RefreshGuiFont = function() - vim.opt.guifont = string.format("%s:h%s", vim.g.gui_font_face, vim.g.gui_font_size) -end - -ResizeGuiFont = function(delta) - vim.g.gui_font_size = vim.g.gui_font_size + delta - RefreshGuiFont() -end - --- Keymaps -local opts = { noremap = true, silent = true } - -vim.keymap.set({ "n", "i" }, "", function() - ResizeGuiFont(1) -end, opts) -vim.keymap.set({ "n", "i" }, "", function() - ResizeGuiFont(-1) -end, opts) - --- Options -vim.g.neovide_padding_top = 5 -vim.g.neovide_padding_right = 5 -vim.g.neovide_padding_left = 5 - -vim.g.neovide_window_blurred = true -vim.g.neovide_floating_blur_amount_x = 5.0 -vim.g.neovide_floating_blur_amount_y = 5.0 -vim.g.neovide_floating_shadow = true -vim.g.neovide_floating_z_height = 10 - -vim.g.neovide_cursor_antialiasing = false - -vim.g.neovide_cursor_vfx_mode = "pixiedust" -vim.g.neovide_hide_mouse_when_typing = true - -vim.o.guifont = "JetBrainsMono Nerd Font:h10" - -vim.opt.winblend = 20 -vim.g.neovide_refresh_rate = 75 - -return {} diff --git a/config/nvim/lua/plugins/extras/util/vscode.lua b/config/nvim/lua/plugins/extras/util/vscode.lua deleted file mode 100644 index 2d43eec6..00000000 --- a/config/nvim/lua/plugins/extras/util/vscode.lua +++ /dev/null @@ -1,184 +0,0 @@ -if not vim.g.vscode then - return {} -end - -local config = require("lazy.core.config") -local vscode = require("vscode-neovim") - -local map = vim.keymap.set - --- Add any additional plugins in vscode, you can set vscode=true on a plugin spec. -local enabled = { - "flash.nvim", - "lazy.nvim", - "dial.nvim", - "mini.align", - "nvim-recorder", - "comment-box.nvim", - "text-case.nvim", - "mini.ai", - "mini.comment", - "mini.pairs", - "mini.surround", - "nvim-treesitter", - "wildfire.nvim", - "nvim-treesitter-textobjects", - "nvim-various-textobjs", - "nvim-ts-context-commentstring", - "vim-repeat", - "vim-carbon-now-sh", - "highlight-undo.nvim", - "ts-node-action", - "LazyVim", -} - -config.options.checker.enabled = false -config.options.change_detection.enabled = false -config.options.defaults.cond = function(plugin) - return vim.tbl_contains(enabled, plugin.name) or plugin.vscode -end - --- Options -vim.o.spell = false -vim.opt.timeoutlen = 150 -- To show whichkey without delay -vim.notify = vscode.notify -vim.g.clipboard = vim.g.vscode_clipboard - -local function vscode_action(cmd, opts) - return function() - vscode.action(cmd, opts) - end -end - --- Add some vscode specific keymaps -vim.api.nvim_create_autocmd("User", { - pattern = "LazyVimKeymaps", - callback = function() - -- view problems - map("n", "xx", vscode_action("workbench.actions.view.problems")) - -- open file explorer - map("n", "e", vscode_action("workbench.view.explorer")) - -- terminal - map("n", [[]], vscode_action("workbench.action.terminal.toggleTerminal")) - map("n", "fts", vscode_action("workbench.action.terminal.newWithCwd")) - -- working with editors (buffers) - map("n", "bo", vscode_action("workbench.action.closeOtherEditors")) - map("n", "bb", function() - vscode_action("workbench.action.quickOpenPreviousRecentlyUsedEditorInGroup") - vscode_action("list.select") - end) - map("n", "bn", vscode_action("workbench.action.nextEditor")) - map("n", "bu", vscode_action("workbench.action.reopenClosedEditor")) - map("n", "bh", vscode_action("workbench.action.moveEditorToLeftGroup")) - map("n", "bj", vscode_action("workbench.action.moveEditorToBelowGroup")) - map("n", "bk", vscode_action("workbench.action.moveEditorToAboveGroup")) - map("n", "bl", vscode_action("workbench.action.moveEditorToRightGroup")) - map("n", ",", vscode_action("workbench.action.showAllEditors")) - map("n", "bA", vscode_action("workbench.action.closeAllEditors")) - map("n", "ba", vscode_action("workbench.action.lastEditorInGroup")) - map("n", "bf", vscode_action("workbench.action.firstEditorInGroup")) - map("n", "bL", vscode_action("workbench.action.closeEditorsToTheLeft")) - map("n", "bR", vscode_action("workbench.action.closeEditorsToTheRight")) - map("n", "H", vscode_action("workbench.action.previousEditorInGroup")) - map("n", "L", vscode_action("workbench.action.nextEditorInGroup")) - map("n", "bd", vscode_action("workbench.action.closeActiveEditor")) - map("n", "", vscode_action("workbench.action.showMultipleEditorTabs")) - map("n", "", vscode_action("workbench.action.showEditorTab")) - -- breakpoints - map("n", "", vscode_action("editor.debug.action.toggleBreakpoint")) - -- windows - map("n", "|", vscode_action("workbench.action.splitEditorRight")) - map("n", "-", vscode_action("workbench.action.splitEditorDown")) - -- LSP actions - map("n", "ca", vscode_action("editor.action.codeAction")) - map("n", "gy", vscode_action("editor.action.goToTypeDefinition")) - map("n", "gr", vscode_action("editor.action.goToReferences")) - map("n", "gi", vscode_action("editor.action.goToImplementation")) - map("n", "K", vscode_action("editor.action.showHover")) - map("n", "cr", vscode_action("editor.action.rename")) - map("n", "co", vscode_action("editor.action.organizeImports")) - map("n", "cf", vscode_action("editor.action.formatDocument")) - map("n", "ss", vscode_action("workbench.action.gotoSymbol")) - map("n", "sS", vscode_action("workbench.action.showAllSymbols")) - -- refactor - map("n", "cR", vscode_action("editor.action.refactor")) - -- markdown preview - map("n", "cp", vscode_action("markdown.showPreviewToSide")) - -- project manager - map("n", "fp", vscode_action("projectManager.listProjects")) - -- zen mode - map("n", "z", vscode_action("workbench.action.toggleZenMode")) - -- cspell - map("n", "!", vscode_action("cSpell.addWordToDictionary")) - map("n", "us", vscode_action("cSpell.toggleEnableSpellChecker")) - -- comments - map("n", "xt", vscode_action("workspaceAnchors.focus")) - -- git - map("n", "gg", vscode_action("gitlens.views.home.focus")) - map("n", "ub", vscode_action("gitlens.toggleFileBlame")) - map("n", "]h", function() - vscode_action("workbench.action.editor.nextChange") - vscode_action("workbench.action.compareEditor.nextChange") - end) - map("n", "[h", function() - vscode_action("workbench.action.editor.previousChange") - vscode_action("workbench.action.compareEditor.previousChange") - end) - -- statusline - map("n", "uS", vscode_action("workbench.action.toggleStatusbarVisibility")) - -- codeium - map("n", "cI", vscode_action("codeium.toggleEnable")) - map({ "n", "v" }, "id", vscode_action("codeium.generateFunctionDocstring")) - map("n", "ic", vscode_action("codeium.openChatView")) - map("n", "is", vscode_action("codeium.openSearchView")) - map({ "n", "v" }, "ie", vscode_action("codeium.explainCodeBlock")) - map({ "n", "v" }, "iE", vscode_action("codeium.explainProblem")) - map({ "n", "v" }, "ii", vscode_action("codeium.openCodeiumCommand")) - -- diagnostics - map("n", "]d", vscode_action("editor.action.marker.next")) - map("n", "[d", vscode_action("editor.action.marker.prev")) - -- zoxide - map("n", "fz", vscode_action("autojump.openFolder")) - -- whichkey - map("n", "", vscode_action("whichkey.show")) - -- search - map("n", "", "Find") - map("n", "ff", "Find") - map("n", "/", vscode_action("workbench.action.findInFiles")) - map("n", "sg", vscode_action("workbench.action.findInFiles")) - map("n", "sc", vscode_action("workbench.action.showCommands")) - -- ui - map("n", "uC", vscode_action("workbench.action.selectTheme")) - end, -}) - -return { - { - "LazyVim/LazyVim", - config = function(_, opts) - opts = opts or {} - -- disable the colorscheme - opts.colorscheme = function() end - require("lazyvim").setup(opts) - end, - }, - { - "nvim-treesitter/nvim-treesitter", - opts = { - highlight = { - enable = false, - }, - }, - }, - { - "folke/flash.nvim", - init = function() - local palette = require("catppuccin.palettes").get_palette("macchiato") - local bg = palette.none - vim.api.nvim_set_hl(0, "FlashBackdrop", { fg = bg }) - vim.api.nvim_set_hl(0, "FlashLabel", { fg = palette.green, bg = bg, bold = true }) - vim.api.nvim_set_hl(0, "FlashMatch", { fg = palette.lavender, bg = bg }) - vim.api.nvim_set_hl(0, "FlashCurrent", { fg = palette.peach, bg = bg }) - end, - }, -}