diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 1b95050..e8df567 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -39,7 +39,6 @@ "grug-far.nvim": { "branch": "main", "commit": "50d9ee2b5a19634670441948e7e4afaa042f1059" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "harpoon-lualine": { "branch": "master", "commit": "215c0847dfb787b19268f7b42eed83bdcf06b966" }, - "highlight-undo.nvim": { "branch": "main", "commit": "ee2f6355e08719fea902e7c478aa7351934f2bb6" }, "inc-rename.nvim": { "branch": "main", "commit": "8ae25b35ae16ca4bd5de3d3c472eec3b574018d4" }, "kulala.nvim": { "branch": "main", "commit": "ab3effad17d5dbb4d5d34b6289fa4dc97155045c" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, @@ -52,9 +51,9 @@ "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, "mini.ai": { "branch": "main", "commit": "dcd346a3eda9121e917950680e5eb59f59f78aae" }, "mini.animate": { "branch": "main", "commit": "37df15e199da3edc0b36647967cc04bf80175183" }, "mini.hipatterns": { "branch": "main", "commit": "96d07d32a0db0d8d8a10c83a964ec557cca005e7" }, @@ -86,8 +85,8 @@ "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" }, "nvim-transparent": { "branch": "main", "commit": "8ac59883de84e9cd1850ea25cf087031c5ba7d54" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, + "nvim-treesitter": { "branch": "main", "commit": "c41b3b9841588e956663345cf01842a232d5eece" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-ufo": { "branch": "main", "commit": "d31e2a9fd572a25a4d5011776677223a8ccb7e35" }, "nvim-various-textobjs": { "branch": "main", "commit": "237763835b65bdc64f0e19a31c040321813e4333" }, @@ -126,11 +125,11 @@ "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "tokyonight.nvim": { "branch": "main", "commit": "14fd5ff7f84027064724ec3157fe903199e77ded" }, - "trouble.nvim": { "branch": "main", "commit": "3fb3bd737be8866e5f3a170abc70b4da8b5dd45a" }, + "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" }, "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "typr": { "branch": "main", "commit": "bdd9ef7143702851edd1dac85101e0a537056d2f" }, - "venv-selector.nvim": { "branch": "main", "commit": "d6d03d9975630d3232201f227efd3682975742d9" }, + "venv-selector.nvim": { "branch": "main", "commit": "2b49d1f8b8fcf5cfbd0913136f48f118225cca5d" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, "vim-astro": { "branch": "main", "commit": "9b4674ecfe1dd84b5fb9b4de1653975de6e8e2e1" }, "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index bc331e5..9648da9 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -38,7 +38,7 @@ ], "install_version": 7, "news": { - "NEWS.md": "10960" + "NEWS.md": "11866" }, "version": 8 } \ No newline at end of file diff --git a/config/nvim/lua/plugins/codewindow.lua b/config/nvim/lua/plugins/codewindow.lua deleted file mode 100644 index 8892d7e..0000000 --- a/config/nvim/lua/plugins/codewindow.lua +++ /dev/null @@ -1,12 +0,0 @@ --- Minimap --- https://github.com/gorbit99/codewindow.nvim -return { - "gorbit99/codewindow.nvim", - config = function() - local codewindow = require("codewindow") - codewindow.setup({ - window_border = "none", - }) - codewindow.apply_default_keybinds() - end, -} diff --git a/config/nvim/lua/plugins/mason.lua b/config/nvim/lua/plugins/mason.lua index 1699683..6da80c3 100644 --- a/config/nvim/lua/plugins/mason.lua +++ b/config/nvim/lua/plugins/mason.lua @@ -1,7 +1,7 @@ -- Package manager for LSP servers, DAP servers, linters, and formatters --- https://github.com/williamboman/mason.nvim +-- https://github.com/mason-org/mason.nvim return { - "williamboman/mason.nvim", + "mason-org/mason.nvim", opts = { ensure_installed = { "astro-language-server", diff --git a/config/nvim/lua/plugins/render-markdown.lua b/config/nvim/lua/plugins/render-markdown.lua index f1dbf33..c2e837c 100644 --- a/config/nvim/lua/plugins/render-markdown.lua +++ b/config/nvim/lua/plugins/render-markdown.lua @@ -14,5 +14,5 @@ return { icons = {}, }, }, - dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, + dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-mini/mini.nvim" }, } diff --git a/config/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua index b03a548..06d62bd 100644 --- a/config/nvim/lua/plugins/treesitter.lua +++ b/config/nvim/lua/plugins/treesitter.lua @@ -1,55 +1,52 @@ -- Nvim Treesitter configurations -- https://github.com/nvim-treesitter/nvim-treesitter return { - "nvim-treesitter/nvim-treesitter", - depencendies = { - "nvim-treesitter/playground", - }, - opts = { - indent = { enable = false }, - ensure_installed = { - "astro", - "bash", - "css", - "fish", - "gitignore", - "go", - "gomod", - "gosum", - "gowork", - "graphql", - "html", - "http", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "scss", - "sql", - "svelte", - "tsx", - "typescript", - "vim", - "vimdoc", - "yaml", - }, - }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) + "nvim-treesitter/nvim-treesitter", + opts = { + indent = { enable = true }, -- previously "false" + highlight = { enable = true }, + folds = { enable = true }, + ensure_installed = { + "astro", + "bash", + "css", + "fish", + "gitignore", + "go", + "gomod", + "gosum", + "gowork", + "graphql", + "html", + "http", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "scss", + "sql", + "svelte", + "tsx", + "typescript", + "vim", + "vimdoc", + "yaml", + }, + }, + config = function() + -- Add custom filetypes + vim.filetype.add({ + extension = { + mdx = "mdx", + rss = "rss", + }, + }) - -- Add custom filetypes - vim.filetype.add({ - extension = { - mdx = "mdx", - rss = "rss", - }, - }) - - vim.treesitter.language.register("markdown", "mdx") - vim.treesitter.language.register("xml", "rss") - end, + vim.treesitter.language.register("markdown", "mdx") + vim.treesitter.language.register("xml", "rss") + end, }