From 369c5a4658a06611999936f9b343aaa583225b38 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Wed, 15 Jan 2025 10:03:03 -0800 Subject: [PATCH] Big update of pinned versions for lazy --- neovim/lazylock-0.10.json | 22 +++++++------- neovim/lua/lazy/completion.lua | 7 +++-- neovim/lua/lazy/copilot.lua | 4 +-- neovim/lua/lazy/dap.lua | 1 + neovim/lua/lazy/language_servers.lua | 5 +++- neovim/lua/lazy/obsidian.lua | 2 +- neovim/lua/lazy_plugins.lua | 43 ++++++++++++++++------------ 7 files changed, 48 insertions(+), 36 deletions(-) diff --git a/neovim/lazylock-0.10.json b/neovim/lazylock-0.10.json index 2fd29ba..634a58d 100644 --- a/neovim/lazylock-0.10.json +++ b/neovim/lazylock-0.10.json @@ -61,7 +61,7 @@ }, "lazydev.nvim": { "branch": "main", - "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" + "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, "limelight.vim": { "branch": "master", @@ -81,11 +81,11 @@ }, "mason-lspconfig.nvim": { "branch": "main", - "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" + "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, "mason.nvim": { "branch": "main", - "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" + "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "neodev.nvim": { "branch": "main", @@ -97,7 +97,7 @@ }, "none-ls.nvim": { "branch": "main", - "commit": "7bebb35a05871aeb99825f29d869cbd9a46bdbba" + "commit": "3291afdff94e5083c7d6a4e9e661c3682c4b9b2a" }, "nvim-cmp": { "branch": "main", @@ -109,7 +109,7 @@ }, "nvim-dap": { "branch": "master", - "commit": "99807078c5089ed30e0547aa4b52c5867933f426" + "commit": "04ce47fc5a6ef2b717f33c320fc003091cebac40" }, "nvim-dap-python": { "branch": "master", @@ -121,7 +121,7 @@ }, "nvim-lspconfig": { "branch": "master", - "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" + "commit": "343ac34abc7ab53fae33357f915024aaacb76a3e" }, "nvim-navic": { "branch": "master", @@ -141,7 +141,7 @@ }, "nvim-treesitter": { "branch": "master", - "commit": "306dd6e9dc806db1d79568d26e1c9b6c98b95fbc" + "commit": "f0c928dbe93533b7e35894a8f957f40150d1f663" }, "nvim-treesitter-textobjects": { "branch": "master", @@ -153,7 +153,7 @@ }, "plenary.nvim": { "branch": "master", - "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" + "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "rustaceanvim": { "branch": "master", @@ -185,7 +185,7 @@ }, "tokyonight.nvim": { "branch": "main", - "commit": "7bb270adaa7692c2c33befc35f5567fc596a2504" + "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, "trouble.nvim": { "branch": "main", @@ -197,7 +197,7 @@ }, "vim-argwrap": { "branch": "master", - "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" + "commit": "b532cb6805864da4cfcfe0bb6a1ced61e291be02" }, "vim-endwise": { "branch": "master", @@ -213,7 +213,7 @@ }, "vim-fugitive": { "branch": "master", - "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" + "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, "vim-grepper": { "branch": "master", diff --git a/neovim/lua/lazy/completion.lua b/neovim/lua/lazy/completion.lua index 994b3e0..67984a1 100644 --- a/neovim/lua/lazy/completion.lua +++ b/neovim/lua/lazy/completion.lua @@ -3,7 +3,7 @@ local utils = require("utils") return { { "https://github.com/L3MON4D3/LuaSnip", - version = "2.x.x", + version = "^2", event = "InsertEnter *", config = function() require("luasnip.loaders.from_vscode").lazy_load() @@ -49,6 +49,10 @@ return { config = function() require("plugins.completion").config_cmp() end, + version = utils.map_version_rule({ + [">=0.7.0"] = "^0.0.2", + ["<0.7.0"] = utils.nil_val, + }), commit = utils.map_version_rule({ [">=0.7.0"] = utils.nil_val, [">=0.5.0"] = "bba6fb67fdafc0af7c5454058dfbabc2182741f4", @@ -56,6 +60,5 @@ return { event = "InsertEnter *", }, - -- Add snippets event = "InsertEnter *", } diff --git a/neovim/lua/lazy/copilot.lua b/neovim/lua/lazy/copilot.lua index d79ceff..72372bb 100644 --- a/neovim/lua/lazy/copilot.lua +++ b/neovim/lua/lazy/copilot.lua @@ -4,7 +4,7 @@ return { { "https://github.com/github/copilot.vim", enabled = vim.g.install_copilot, - version = "1.x.x", + version = "^1", config = function() require("plugins.copilot") end, @@ -17,7 +17,7 @@ return { { "https://github.com/CopilotC-Nvim/CopilotChat.nvim", enabled = vim.g.install_copilot, - version = "3.x.x", + version = "^3", build = "make tiktoken", dependencies = { { "https://github.com/github/copilot.vim" }, diff --git a/neovim/lua/lazy/dap.lua b/neovim/lua/lazy/dap.lua index 0642819..f4c58c9 100644 --- a/neovim/lua/lazy/dap.lua +++ b/neovim/lua/lazy/dap.lua @@ -3,6 +3,7 @@ local utils = require("utils") return { { "https://github.com/mfussenegger/nvim-dap", + version = "^0.9", config = function() local dap = require("dap") local dap_mapping = utils.curry_keymap("n", "d", { diff --git a/neovim/lua/lazy/language_servers.lua b/neovim/lua/lazy/language_servers.lua index efdf8b6..2391e32 100644 --- a/neovim/lua/lazy/language_servers.lua +++ b/neovim/lua/lazy/language_servers.lua @@ -4,7 +4,7 @@ return { { "https://github.com/neovim/nvim-lspconfig", version = utils.map_version_rule({ - [">=0.8.0"] = "v0.1.*", + [">=0.8.0"] = "^1", [">=0.7.0"] = "v0.1.7", [">=0.6.1"] = "v0.1.2", [">=0.6.0"] = "v0.1.0", @@ -13,6 +13,7 @@ return { { -- Language server installer "https://github.com/williamboman/mason.nvim", + version = "^1", dependencies = { { "https://github.com/neovim/nvim-lspconfig" }, { "https://github.com/williamboman/mason-lspconfig.nvim" }, @@ -30,6 +31,7 @@ return { -- Neovim language server config { "https://github.com/folke/neodev.nvim", + version = "^3", dependencies = { { "https://github.com/neovim/nvim-lspconfig" } }, ft = { "lua" }, -- Disable for nvim 0.10 because there is lazydev @@ -37,6 +39,7 @@ return { }, { "https://github.com/folke/lazydev.nvim", + version = "^1", dependencies = { { "https://github.com/neovim/nvim-lspconfig" } }, ft = "lua", opts = {}, diff --git a/neovim/lua/lazy/obsidian.lua b/neovim/lua/lazy/obsidian.lua index eaed069..f3692e0 100644 --- a/neovim/lua/lazy/obsidian.lua +++ b/neovim/lua/lazy/obsidian.lua @@ -10,7 +10,7 @@ return { dependencies = { { "https://github.com/nvim-lua/plenary.nvim" }, }, - version = "3.x.x", + version = "^3", opts = { workspaces = { { name = "personal", path = require("plugins.obsidian").vault_path }, diff --git a/neovim/lua/lazy_plugins.lua b/neovim/lua/lazy_plugins.lua index 2898c5e..36d2ccb 100644 --- a/neovim/lua/lazy_plugins.lua +++ b/neovim/lua/lazy_plugins.lua @@ -27,8 +27,8 @@ return { -- Auto ctags generation { "https://github.com/ludovicchabant/vim-gutentags" }, - -- Make it easier to discover some of my keymaps { + -- Make it easier to discover some of my keymaps "https://github.com/folke/which-key.nvim", opts = { -- Ignore warnings about config. Turn these on when switching major versions @@ -38,7 +38,7 @@ return { }, }, version = utils.map_version_rule({ - [">=0.9.4"] = "3.x.x", + [">=0.9.4"] = "^3", [">=0.9.0"] = "<3.4.0", ["<0.9.0"] = "1.x.x", }), @@ -53,29 +53,29 @@ return { }, event = "VeryLazy", }, - -- Better commenting { + -- Better commenting "https://github.com/tomtom/tcomment_vim", keys = { { "//", ":TComment", desc = "Toggle comment" }, { "//", ":TCommentBlock", mode = "v", desc = "Toggle comment" }, }, }, - -- Allow wrapping and joining of arguments across multiple lines { - "https://github.com/FooSoft/vim-argwrap", + -- Allow wrapping and joining of arguments across multiple lines + "https://git.foosoft.net/alex/vim-argwrap", keys = { { "a", "ArgWrap", desc = "Wrap or unwrap arguments" }, }, }, - -- Adds git operations to vim { + -- Adds git operations to vim "https://github.com/tpope/vim-fugitive", - tag = utils.map_version_rule({ - [">=0.9.2"] = utils.nil_val, + version = utils.map_version_rule({ + [">=0.9.2"] = "^3", -- Pinning to avoid neovim bug https://github.com/neovim/neovim/issues/10121 -- when used in status line. - ["<0.9.2"] = "v3.6", + ["<0.9.2"] = "3.6", }), keys = { { "gb", "Git blame", desc = "Git blame" }, @@ -86,17 +86,19 @@ return { }, cmd = { "Git" }, }, - -- Quick toggling of Location and Quickfix lists { + -- Quick toggling of Location and Quickfix lists "https://github.com/milkypostman/vim-togglelist", + -- Stable plugin, pinning to avoid any issues stemming from possible takeover + commit = "48f0d30292efdf20edc883e61b121e6123e03df7", keys = { { "", ":call ToggleQuickfixList()", desc = "Toggle quickfix" }, { "", ":call ToggleLocationList()", desc = "Toggle location list" }, }, }, - -- Find text everywhere! { + -- Find text everywhere! "https://github.com/mhinz/vim-grepper", config = function() -- Grepper settings and shortcuts @@ -135,15 +137,15 @@ return { end, }, - -- Highlight inline colors { + -- Highlight inline colors "https://github.com/norcalli/nvim-colorizer.lua", config = true, cmd = { "ColorizerToggle" }, }, - -- Custom status line { + -- Custom status line "https://github.com/nvim-lualine/lualine.nvim", config = function() require("plugins.lualine").config_lualine() @@ -157,9 +159,11 @@ return { event = "VeryLazy", }, - -- On Mac, update colors when dark mode changes { + -- On Mac, update colors when dark mode changes "https://github.com/cormacrelf/dark-notify", + -- Pinned because project has had no commits in 4 years + commit = "891adc07dd7b367b840f1e9875b075fd8af4dc52", enabled = vim.g.is_mac, -- Download latest release on install build = "curl -s https://api.github.com/repos/cormacrelf/dark-notify/releases/latest | jq '.assets[].browser_download_url' | xargs curl -Ls | tar xz -C ~/.local/bin/", -- luacheck: no max line length @@ -170,8 +174,8 @@ return { event = "VeryLazy", }, - -- Custom start screen { + -- Custom start screen "https://github.com/mhinz/vim-startify", config = function() require("utils").require_with_local("plugins.startify") @@ -188,14 +192,14 @@ return { { import = "lazy.dap" }, { import = "lazy.language_servers" }, - -- Better display of lsp diagnostics { + -- Better display of lsp diagnostics "https://github.com/folke/trouble.nvim", config = true, version = utils.map_version_rule({ - [">=0.9.2"] = "3.x.x", - [">=0.7.2"] = "2.x.x", - ["<0.7.2"] = "1.x.x", + [">=0.9.2"] = "^3", + [">=0.7.2"] = "^2", + ["<0.7.2"] = "^1", }), }, @@ -213,6 +217,7 @@ return { -- abolish/pencil { "https://github.com/preservim/vim-pencil", + version = "^1", dependencies = { { "https://github.com/preservim/vim-textobj-sentence",