mirror of
https://github.com/LazyVim/LazyVim.git
synced 2025-08-31 07:09:54 +02:00
Compare commits
32 commits
Author | SHA1 | Date | |
---|---|---|---|
|
25abbf546d | ||
|
1b1c7d0f45 | ||
|
70b4615cb2 | ||
|
c20c402295 | ||
|
ec5981dfb1 | ||
|
b0334fd57c | ||
|
cb223553ff | ||
|
771089f692 | ||
|
541b83276e | ||
|
759a19e785 | ||
|
f3e37a1f83 | ||
|
9c596681f6 | ||
|
606b96466e | ||
|
16a772452a | ||
|
f2f2aea672 | ||
|
0ca49bcfed | ||
|
5b94baa1d2 | ||
|
3f034d0a7f | ||
|
e7f8e4faba | ||
|
b35015ac59 | ||
|
0458e46dcc | ||
|
4aff0063a4 | ||
|
401ef48fcd | ||
|
e9dad45f93 | ||
|
32e575aa75 | ||
|
98fca895e8 | ||
|
5788b9d1e0 | ||
|
45d94b3197 | ||
|
0db6891679 | ||
|
0a5965b787 | ||
|
7529773371 | ||
|
7fe0b47f17 |
39 changed files with 216 additions and 99 deletions
2
.github/.release-please-manifest.json
vendored
2
.github/.release-please-manifest.json
vendored
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
".": "14.12.0"
|
||||
".": "14.15.0"
|
||||
}
|
||||
|
|
44
CHANGELOG.md
44
CHANGELOG.md
|
@ -1,5 +1,49 @@
|
|||
# Changelog
|
||||
|
||||
## [14.15.0](https://github.com/LazyVim/LazyVim/compare/v14.14.0...v14.15.0) (2025-05-12)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **chezmoi:** enhance fzf-lua chezmoi picker and add snacks.dasbhoard entry ([#5275](https://github.com/LazyVim/LazyVim/issues/5275)) ([759a19e](https://github.com/LazyVim/LazyVim/commit/759a19e785735eb8513b4f8d4483ec5ab1b75307))
|
||||
* **keymaps:** show lang when opening treesitter inspect ([9c59668](https://github.com/LazyVim/LazyVim/commit/9c596681f684c549e69652a5c77a68bd5ecc93e3))
|
||||
* **octo:** add support for snacks picker ([#5625](https://github.com/LazyVim/LazyVim/issues/5625)) ([16a7724](https://github.com/LazyVim/LazyVim/commit/16a772452a515790c3304b358dd66a618fda3260))
|
||||
* **snippets:** mini.snippets standalone and blink.resubscribe ([#5507](https://github.com/LazyVim/LazyVim/issues/5507)) ([f2f2aea](https://github.com/LazyVim/LazyVim/commit/f2f2aea6722b530281b476c08ec60f2d320f1c3d))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **blink:** make sure to use `LazyVim.config.icons.kinds` ([#5668](https://github.com/LazyVim/LazyVim/issues/5668)) ([771089f](https://github.com/LazyVim/LazyVim/commit/771089f6928512ab0f431e9db04e7dc802a5e1a5))
|
||||
* **blink:** remove unnecessary `sources` from `cmdline` ([#5620](https://github.com/LazyVim/LazyVim/issues/5620)) ([5b94baa](https://github.com/LazyVim/LazyVim/commit/5b94baa1d2e7d8ec7e9a9cab82fabd8c3655d369))
|
||||
* **copilot-chat:** switch from deprecated picker integrations ([#5707](https://github.com/LazyVim/LazyVim/issues/5707)) ([b0334fd](https://github.com/LazyVim/LazyVim/commit/b0334fd57cdb920e03afab3c1940114ad43e4fbe))
|
||||
* **mason:** rename and pin to v1 ([c20c402](https://github.com/LazyVim/LazyVim/commit/c20c4022958780617424a090eee2360d560eb939))
|
||||
* **snacks.picker:** remove redundant leader-gc keymap. Closes [#5646](https://github.com/LazyVim/LazyVim/issues/5646) ([606b964](https://github.com/LazyVim/LazyVim/commit/606b96466eeb39b1c1bb576c9b99041b64705f43))
|
||||
|
||||
## [14.14.0](https://github.com/LazyVim/LazyVim/compare/v14.13.0...v14.14.0) (2025-02-15)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **extras:** setup neogen and mini.snippets integration ([#5594](https://github.com/LazyVim/LazyVim/issues/5594)) ([5788b9d](https://github.com/LazyVim/LazyVim/commit/5788b9d1e06dfb5f99f92354dc550c9f2c5a6710))
|
||||
* **keymaps:** enable toggling in quickfix list and location list ([#5608](https://github.com/LazyVim/LazyVim/issues/5608)) ([32e575a](https://github.com/LazyVim/LazyVim/commit/32e575aa75792c63f710f0bdc3e2fb5aa8ea75ad))
|
||||
* **snacks.picker:** added support for Project shortcuts in other dashboards ([#5607](https://github.com/LazyVim/LazyVim/issues/5607)) ([401ef48](https://github.com/LazyVim/LazyVim/commit/401ef48fcd617534b017ef471309bb1bd6465131))
|
||||
* **snacks.picker:** move trouble keymap from `ctrl+t` -> `alt+t` ([4aff006](https://github.com/LazyVim/LazyVim/commit/4aff0063a42bbc499cfa03feb6e58d4339c0950d))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **blink:** `blink` released new version, remove previous hack ([#5616](https://github.com/LazyVim/LazyVim/issues/5616)) ([b35015a](https://github.com/LazyVim/LazyVim/commit/b35015ac59f0c630b2efe18ccf10d693397d0ca4))
|
||||
* **blink:** `cmdline` is now top-level on main branch ([#5615](https://github.com/LazyVim/LazyVim/issues/5615)) ([0458e46](https://github.com/LazyVim/LazyVim/commit/0458e46dcca49cc404062e04a9054a8bd058dcd3))
|
||||
* **blink:** enable Neovim native mapping with `<Tab>` ([#5617](https://github.com/LazyVim/LazyVim/issues/5617)) ([e7f8e4f](https://github.com/LazyVim/LazyVim/commit/e7f8e4faba0c6d397526238923f1aeff1740d09c))
|
||||
|
||||
## [14.13.0](https://github.com/LazyVim/LazyVim/compare/v14.12.0...v14.13.0) (2025-02-12)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **editor:** update parameter for fzf-lua ([#5584](https://github.com/LazyVim/LazyVim/issues/5584)) ([0a5965b](https://github.com/LazyVim/LazyVim/commit/0a5965b787e4d513b5a2e1182b35bd11ceafeeb3))
|
||||
* **lsp:** use lsp_config picker instead of `LspInfo` ([7529773](https://github.com/LazyVim/LazyVim/commit/75297733710951e81b505d88b2d728a5b0a9b6ab))
|
||||
|
||||
## [14.12.0](https://github.com/LazyVim/LazyVim/compare/v14.11.0...v14.12.0) (2025-02-10)
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
*LazyVim.txt* For Neovim Last change: 2025 February 10
|
||||
*LazyVim.txt* For Neovim Last change: 2025 May 12
|
||||
|
||||
==============================================================================
|
||||
Table of Contents *LazyVim-table-of-contents*
|
||||
|
|
|
@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
|
|||
---@class LazyVimConfig: LazyVimOptions
|
||||
local M = {}
|
||||
|
||||
M.version = "14.12.0" -- x-release-please-version
|
||||
M.version = "14.15.0" -- x-release-please-version
|
||||
LazyVim.config = M
|
||||
|
||||
---@class LazyVimOptions
|
||||
|
|
|
@ -94,8 +94,21 @@ map("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Lazy" })
|
|||
-- new file
|
||||
map("n", "<leader>fn", "<cmd>enew<cr>", { desc = "New File" })
|
||||
|
||||
map("n", "<leader>xl", "<cmd>lopen<cr>", { desc = "Location List" })
|
||||
map("n", "<leader>xq", "<cmd>copen<cr>", { desc = "Quickfix List" })
|
||||
-- location list
|
||||
map("n", "<leader>xl", function()
|
||||
local success, err = pcall(vim.fn.getloclist(0, { winid = 0 }).winid ~= 0 and vim.cmd.lclose or vim.cmd.lopen)
|
||||
if not success and err then
|
||||
vim.notify(err, vim.log.levels.ERROR)
|
||||
end
|
||||
end, { desc = "Location List" })
|
||||
|
||||
-- quickfix list
|
||||
map("n", "<leader>xq", function()
|
||||
local success, err = pcall(vim.fn.getqflist({ winid = 0 }).winid ~= 0 and vim.cmd.cclose or vim.cmd.copen)
|
||||
if not success and err then
|
||||
vim.notify(err, vim.log.levels.ERROR)
|
||||
end
|
||||
end, { desc = "Quickfix List" })
|
||||
|
||||
map("n", "[q", vim.cmd.cprev, { desc = "Previous Quickfix" })
|
||||
map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" })
|
||||
|
@ -166,7 +179,7 @@ map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit All" })
|
|||
|
||||
-- highlights under cursor
|
||||
map("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" })
|
||||
map("n", "<leader>uI", "<cmd>InspectTree<cr>", { desc = "Inspect Tree" })
|
||||
map("n", "<leader>uI", function() vim.treesitter.inspect_tree() vim.api.nvim_input("I") end, { desc = "Inspect Tree" })
|
||||
|
||||
-- LazyVim Changelog
|
||||
map("n", "<leader>L", function() LazyVim.news.changelog() end, { desc = "LazyVim Changelog" })
|
||||
|
|
|
@ -1,28 +1,3 @@
|
|||
local M = {}
|
||||
|
||||
---@param kind string
|
||||
function M.pick(kind)
|
||||
return function()
|
||||
local actions = require("CopilotChat.actions")
|
||||
local items = actions[kind .. "_actions"]()
|
||||
if not items then
|
||||
LazyVim.warn("No " .. kind .. " found on the current line")
|
||||
return
|
||||
end
|
||||
local map = {
|
||||
telescope = "telescope",
|
||||
fzf = "fzflua",
|
||||
snacks = "snacks",
|
||||
}
|
||||
for _, def in pairs(LazyVim.config.get_defaults()) do
|
||||
if def.enabled and map[def.name] then
|
||||
return require("CopilotChat.integrations." .. map[def.name]).pick(items)
|
||||
end
|
||||
end
|
||||
Snacks.notify.error("No picker found")
|
||||
end
|
||||
end
|
||||
|
||||
return {
|
||||
{
|
||||
"CopilotC-Nvim/CopilotChat.nvim",
|
||||
|
@ -62,16 +37,25 @@ return {
|
|||
{
|
||||
"<leader>aq",
|
||||
function()
|
||||
local input = vim.fn.input("Quick Chat: ")
|
||||
if input ~= "" then
|
||||
require("CopilotChat").ask(input)
|
||||
end
|
||||
vim.ui.input({
|
||||
prompt = "Quick Chat: ",
|
||||
}, function(input)
|
||||
if input ~= "" then
|
||||
require("CopilotChat").ask(input)
|
||||
end
|
||||
end)
|
||||
end,
|
||||
desc = "Quick Chat (CopilotChat)",
|
||||
mode = { "n", "v" },
|
||||
},
|
||||
-- Show prompts actions with telescope
|
||||
{ "<leader>ap", M.pick("prompt"), desc = "Prompt Actions (CopilotChat)", mode = { "n", "v" } },
|
||||
{
|
||||
"<leader>ap",
|
||||
function()
|
||||
require("CopilotChat").select_prompt()
|
||||
end,
|
||||
desc = "Prompt Actions (CopilotChat)",
|
||||
mode = { "n", "v" },
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
local chat = require("CopilotChat")
|
||||
|
|
|
@ -79,7 +79,10 @@ return {
|
|||
-- with blink.compat
|
||||
compat = {},
|
||||
default = { "lsp", "path", "snippets", "buffer" },
|
||||
cmdline = {},
|
||||
},
|
||||
|
||||
cmdline = {
|
||||
enabled = false,
|
||||
},
|
||||
|
||||
keymap = {
|
||||
|
@ -140,6 +143,7 @@ return {
|
|||
items = transform_items and transform_items(ctx, items) or items
|
||||
for _, item in ipairs(items) do
|
||||
item.kind = kind_idx or item.kind
|
||||
item.kind_icon = LazyVim.config.icons.kinds[item.kind_name] or item.kind_icon or nil
|
||||
end
|
||||
return items
|
||||
end
|
||||
|
|
|
@ -140,21 +140,25 @@ return {
|
|||
end
|
||||
|
||||
-- Standalone --
|
||||
local blink = require("blink.cmp")
|
||||
expand_select_override = function(snippets, insert)
|
||||
-- Schedule, otherwise blink's virtual text is not removed on vim.ui.select
|
||||
require("blink.cmp").cancel()
|
||||
blink.cancel()
|
||||
vim.schedule(function()
|
||||
MiniSnippets.default_select(snippets, insert)
|
||||
end)
|
||||
end
|
||||
--
|
||||
-- Blink performs a require on blink.cmp.sources.snippets.default
|
||||
-- By removing the source, the default engine will not be used
|
||||
-- By removing the source, that default engine will not be used
|
||||
opts.sources.default = vim.tbl_filter(function(source)
|
||||
return source ~= "snippets"
|
||||
end, opts.sources.default)
|
||||
opts.snippets = { -- need to repeat blink's preset here
|
||||
expand = expand_from_lsp,
|
||||
expand = function(snippet)
|
||||
expand_from_lsp(snippet)
|
||||
blink.resubscribe()
|
||||
end,
|
||||
active = function()
|
||||
return MiniSnippets.session.get(false) ~= nil
|
||||
end,
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
return {
|
||||
"danymat/neogen",
|
||||
dependencies = LazyVim.has("mini.snippets") and { "mini.snippets" } or {},
|
||||
cmd = "Neogen",
|
||||
keys = {
|
||||
{
|
||||
|
@ -17,6 +18,7 @@ return {
|
|||
|
||||
local map = {
|
||||
["LuaSnip"] = "luasnip",
|
||||
["mini.snippets"] = "mini",
|
||||
["nvim-snippy"] = "snippy",
|
||||
["vim-vsnip"] = "vsnip",
|
||||
}
|
||||
|
|
|
@ -288,10 +288,10 @@ return {
|
|||
local Keys = require("lazyvim.plugins.lsp.keymaps").get()
|
||||
-- stylua: ignore
|
||||
vim.list_extend(Keys, {
|
||||
{ "gd", "<cmd>FzfLua lsp_definitions jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto Definition", has = "definition" },
|
||||
{ "gr", "<cmd>FzfLua lsp_references jump_to_single_result=true ignore_current_line=true<cr>", desc = "References", nowait = true },
|
||||
{ "gI", "<cmd>FzfLua lsp_implementations jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto Implementation" },
|
||||
{ "gy", "<cmd>FzfLua lsp_typedefs jump_to_single_result=true ignore_current_line=true<cr>", desc = "Goto T[y]pe Definition" },
|
||||
{ "gd", "<cmd>FzfLua lsp_definitions jump1=true ignore_current_line=true<cr>", desc = "Goto Definition", has = "definition" },
|
||||
{ "gr", "<cmd>FzfLua lsp_references jump1=true ignore_current_line=true<cr>", desc = "References", nowait = true },
|
||||
{ "gI", "<cmd>FzfLua lsp_implementations jump1=true ignore_current_line=true<cr>", desc = "Goto Implementation" },
|
||||
{ "gy", "<cmd>FzfLua lsp_typedefs jump1=true ignore_current_line=true<cr>", desc = "Goto T[y]pe Definition" },
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
|
|
@ -72,7 +72,6 @@ return {
|
|||
{ "<leader>fR", function() Snacks.picker.recent({ filter = { cwd = true }}) end, desc = "Recent (cwd)" },
|
||||
{ "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
|
||||
-- git
|
||||
{ "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },
|
||||
{ "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
|
||||
{ "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
|
||||
{ "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
|
||||
|
@ -121,7 +120,7 @@ return {
|
|||
win = {
|
||||
input = {
|
||||
keys = {
|
||||
["<c-t>"] = {
|
||||
["<a-t>"] = {
|
||||
"trouble_open",
|
||||
mode = { "n", "i" },
|
||||
},
|
||||
|
@ -168,6 +167,50 @@ return {
|
|||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"goolord/alpha-nvim",
|
||||
optional = true,
|
||||
opts = function(_, dashboard)
|
||||
local button = dashboard.button("p", " " .. " Projects", [[<cmd> lua Snacks.picker.projects() <cr>]])
|
||||
button.opts.hl = "AlphaButtons"
|
||||
button.opts.hl_shortcut = "AlphaShortcut"
|
||||
table.insert(dashboard.section.buttons.val, 4, button)
|
||||
end,
|
||||
},
|
||||
{
|
||||
"echasnovski/mini.starter",
|
||||
optional = true,
|
||||
opts = function(_, opts)
|
||||
local items = {
|
||||
{
|
||||
name = "Projects",
|
||||
action = [[lua Snacks.picker.projects()]],
|
||||
section = string.rep(" ", 22) .. "Telescope",
|
||||
},
|
||||
}
|
||||
vim.list_extend(opts.items, items)
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvimdev/dashboard-nvim",
|
||||
optional = true,
|
||||
opts = function(_, opts)
|
||||
if not vim.tbl_get(opts, "config", "center") then
|
||||
return
|
||||
end
|
||||
local projects = {
|
||||
action = "lua Snacks.picker.projects()",
|
||||
desc = " Projects",
|
||||
icon = " ",
|
||||
key = "p",
|
||||
}
|
||||
|
||||
projects.desc = projects.desc .. string.rep(" ", 43 - #projects.desc)
|
||||
projects.key_format = " %s"
|
||||
|
||||
table.insert(opts.config.center, 3, projects)
|
||||
end,
|
||||
},
|
||||
{
|
||||
"folke/flash.nvim",
|
||||
optional = true,
|
||||
|
|
|
@ -24,7 +24,7 @@ local supported = {
|
|||
|
||||
return {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "biome" } },
|
||||
},
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
return {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = function(_, opts)
|
||||
table.insert(opts.ensure_installed, "black")
|
||||
end,
|
||||
|
|
|
@ -58,7 +58,7 @@ M.has_parser = LazyVim.memoize(M.has_parser)
|
|||
|
||||
return {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "prettier" } },
|
||||
},
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ return {
|
|||
})
|
||||
end,
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "ansible-lint" } },
|
||||
},
|
||||
{
|
||||
|
|
|
@ -117,7 +117,7 @@ return {
|
|||
optional = true,
|
||||
dependencies = {
|
||||
-- Ensure C/C++ debugger is installed
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
optional = true,
|
||||
opts = { ensure_installed = { "codelldb" } },
|
||||
},
|
||||
|
|
|
@ -10,7 +10,7 @@ return {
|
|||
},
|
||||
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "elm-format" } },
|
||||
},
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ return {
|
|||
},
|
||||
-- Ensure Go tools are installed
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "goimports", "gofumpt" } },
|
||||
},
|
||||
{
|
||||
|
@ -83,7 +83,7 @@ return {
|
|||
optional = true,
|
||||
dependencies = {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "gomodifytags", "impl" } },
|
||||
},
|
||||
},
|
||||
|
@ -111,7 +111,7 @@ return {
|
|||
optional = true,
|
||||
dependencies = {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "delve" } },
|
||||
},
|
||||
{
|
||||
|
|
|
@ -28,7 +28,7 @@ return {
|
|||
},
|
||||
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "haskell-language-server" } },
|
||||
},
|
||||
|
||||
|
@ -37,7 +37,7 @@ return {
|
|||
optional = true,
|
||||
dependencies = {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "haskell-debug-adapter" } },
|
||||
},
|
||||
},
|
||||
|
|
|
@ -56,7 +56,7 @@ return {
|
|||
end,
|
||||
dependencies = {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
|
||||
},
|
||||
},
|
||||
|
|
|
@ -14,7 +14,7 @@ return {
|
|||
end,
|
||||
-- Add packages(linting, debug adapter)
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "ktlint" } },
|
||||
},
|
||||
-- Add syntax highlighting
|
||||
|
@ -35,7 +35,7 @@ return {
|
|||
{
|
||||
"mfussenegger/nvim-lint",
|
||||
optional = true,
|
||||
dependencies = "williamboman/mason.nvim",
|
||||
dependencies = "mason-org/mason.nvim",
|
||||
opts = {
|
||||
linters_by_ft = { kotlin = { "ktlint" } },
|
||||
},
|
||||
|
@ -64,7 +64,7 @@ return {
|
|||
{
|
||||
"mfussenegger/nvim-dap",
|
||||
optional = true,
|
||||
dependencies = "williamboman/mason.nvim",
|
||||
dependencies = "mason-org/mason.nvim",
|
||||
opts = function()
|
||||
local dap = require("dap")
|
||||
if not dap.adapters.kotlin then
|
||||
|
|
|
@ -40,7 +40,7 @@ return {
|
|||
},
|
||||
},
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "markdownlint-cli2", "markdown-toc" } },
|
||||
},
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@ return {
|
|||
},
|
||||
},
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "csharpier", "netcoredbg" } },
|
||||
},
|
||||
{
|
||||
|
|
|
@ -35,7 +35,7 @@ return {
|
|||
},
|
||||
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"phpcs",
|
||||
|
|
|
@ -48,7 +48,7 @@ return {
|
|||
},
|
||||
},
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "erb-formatter", "erb-lint" } },
|
||||
},
|
||||
{
|
||||
|
|
|
@ -43,7 +43,7 @@ return {
|
|||
|
||||
-- Ensure Rust debugger is installed
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
optional = true,
|
||||
opts = function(_, opts)
|
||||
opts.ensure_installed = opts.ensure_installed or {}
|
||||
|
|
|
@ -143,7 +143,7 @@ return {
|
|||
|
||||
-- Linters & formatters
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "sqlfluff" } },
|
||||
},
|
||||
{
|
||||
|
|
|
@ -20,7 +20,7 @@ return {
|
|||
},
|
||||
-- ensure terraform tools are installed
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "tflint" } },
|
||||
},
|
||||
{
|
||||
|
|
|
@ -194,7 +194,7 @@ return {
|
|||
optional = true,
|
||||
dependencies = {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = function(_, opts)
|
||||
opts.ensure_installed = opts.ensure_installed or {}
|
||||
table.insert(opts.ensure_installed, "js-debug-adapter")
|
||||
|
|
|
@ -3,22 +3,12 @@ local pick_chezmoi = function()
|
|||
require("telescope").extensions.chezmoi.find_files()
|
||||
elseif LazyVim.pick.picker.name == "fzf" then
|
||||
local fzf_lua = require("fzf-lua")
|
||||
local results = require("chezmoi.commands").list()
|
||||
local chezmoi = require("chezmoi.commands")
|
||||
|
||||
local opts = {
|
||||
fzf_opts = {},
|
||||
fzf_colors = true,
|
||||
actions = {
|
||||
["default"] = function(selected)
|
||||
chezmoi.edit({
|
||||
targets = { "~/" .. selected[1] },
|
||||
args = { "--watch" },
|
||||
})
|
||||
end,
|
||||
},
|
||||
local actions = {
|
||||
["enter"] = function(selected)
|
||||
fzf_lua.actions.vimcmd_entry("ChezmoiEdit", selected, { cwd = os.getenv("HOME") })
|
||||
end,
|
||||
}
|
||||
fzf_lua.fzf_exec(results, opts)
|
||||
fzf_lua.files({ cmd = "chezmoi managed --include=files,symlinks", actions = actions })
|
||||
elseif LazyVim.pick.picker.name == "snacks" then
|
||||
local results = require("chezmoi.commands").list({
|
||||
args = {
|
||||
|
@ -65,6 +55,7 @@ return {
|
|||
},
|
||||
{
|
||||
"xvzc/chezmoi.nvim",
|
||||
cmd = { "ChezmoiEdit" },
|
||||
keys = {
|
||||
{
|
||||
"<leader>sz",
|
||||
|
@ -120,6 +111,27 @@ return {
|
|||
table.insert(opts.config.center, 5, projects)
|
||||
end,
|
||||
},
|
||||
{
|
||||
"folke/snacks.nvim",
|
||||
optional = true,
|
||||
opts = function(_, opts)
|
||||
local chezmoi_entry = {
|
||||
icon = " ",
|
||||
key = "c",
|
||||
desc = "Config",
|
||||
action = pick_chezmoi,
|
||||
}
|
||||
local config_index
|
||||
for i = #opts.dashboard.preset.keys, 1, -1 do
|
||||
if opts.dashboard.preset.keys[i].key == "c" then
|
||||
table.remove(opts.dashboard.preset.keys, i)
|
||||
config_index = i
|
||||
break
|
||||
end
|
||||
end
|
||||
table.insert(opts.dashboard.preset.keys, config_index, chezmoi_entry)
|
||||
end,
|
||||
},
|
||||
|
||||
-- Filetype icons
|
||||
{
|
||||
|
|
|
@ -18,7 +18,7 @@ return {
|
|||
},
|
||||
},
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "shellcheck" } },
|
||||
},
|
||||
-- add some stuff to treesitter
|
||||
|
|
|
@ -2,7 +2,7 @@ return {
|
|||
|
||||
-- Ensure GitUI tool is installed
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
opts = { ensure_installed = { "gitui" } },
|
||||
keys = {
|
||||
{
|
||||
|
|
|
@ -42,12 +42,14 @@ return {
|
|||
"pwntester/octo.nvim",
|
||||
opts = function(_, opts)
|
||||
vim.treesitter.language.register("markdown", "octo")
|
||||
if LazyVim.has("telescope.nvim") then
|
||||
if LazyVim.has_extra("editor.telescope") then
|
||||
opts.picker = "telescope"
|
||||
elseif LazyVim.has("fzf-lua") then
|
||||
elseif LazyVim.has_extra("editor.fzf") then
|
||||
opts.picker = "fzf-lua"
|
||||
elseif LazyVim.has_extra("editor.snacks_picker") then
|
||||
opts.picker = "snacks"
|
||||
else
|
||||
LazyVim.error("`octo.nvim` requires `telescope.nvim` or `fzf-lua`")
|
||||
LazyVim.error("`octo.nvim` requires `telescope.nvim` or `fzf-lua` or `snacks.nvim`")
|
||||
end
|
||||
|
||||
-- Keep some empty windows in sessions
|
||||
|
|
|
@ -5,7 +5,7 @@ return {
|
|||
event = "LazyFile",
|
||||
dependencies = {
|
||||
"mason.nvim",
|
||||
{ "williamboman/mason-lspconfig.nvim", config = function() end },
|
||||
{ "mason-org/mason-lspconfig.nvim", config = function() end },
|
||||
},
|
||||
opts = function()
|
||||
---@class PluginLspOpts
|
||||
|
@ -257,7 +257,7 @@ return {
|
|||
-- cmdline tools and lsp servers
|
||||
{
|
||||
|
||||
"williamboman/mason.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
cmd = "Mason",
|
||||
keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
|
||||
build = ":MasonUpdate",
|
||||
|
@ -292,4 +292,8 @@ return {
|
|||
end)
|
||||
end,
|
||||
},
|
||||
|
||||
-- pin to v1 for now
|
||||
{ "mason-org/mason.nvim", version = "^1.0.0" },
|
||||
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ function M.get()
|
|||
end
|
||||
-- stylua: ignore
|
||||
M._keys = {
|
||||
{ "<leader>cl", "<cmd>LspInfo<cr>", desc = "Lsp Info" },
|
||||
{ "<leader>cl", function() Snacks.picker.lsp_config() end, desc = "Lsp Info" },
|
||||
{ "gd", vim.lsp.buf.definition, desc = "Goto Definition", has = "definition" },
|
||||
{ "gr", vim.lsp.buf.references, desc = "References", nowait = true },
|
||||
{ "gI", vim.lsp.buf.implementation, desc = "Goto Implementation" },
|
||||
|
|
|
@ -11,6 +11,9 @@ local prios = {
|
|||
-- default priority is 50
|
||||
["lazyvim.plugins.extras.editor.aerial"] = 100,
|
||||
["lazyvim.plugins.extras.editor.outline"] = 100,
|
||||
["lazyvim.plugins.extras.ui.alpha"] = 19,
|
||||
["lazyvim.plugins.extras.ui.dashboard-nvim"] = 19,
|
||||
["lazyvim.plugins.extras.ui.mini-starter"] = 19,
|
||||
}
|
||||
|
||||
if vim.g.xtras_prios then
|
||||
|
|
|
@ -35,6 +35,8 @@ M.renames = {
|
|||
["romgrk/nvim-treesitter-context"] = "nvim-treesitter/nvim-treesitter-context",
|
||||
["glepnir/dashboard-nvim"] = "nvimdev/dashboard-nvim",
|
||||
["markdown.nvim"] = "render-markdown.nvim",
|
||||
["williamboman/mason.nvim"] = "mason-org/mason.nvim",
|
||||
["williamboman/mason-lspconfig.nvim"] = "mason-org/mason-lspconfig.nvim",
|
||||
}
|
||||
|
||||
function M.save_core()
|
||||
|
|
|
@ -44,7 +44,7 @@ describe("Extra", function()
|
|||
local mod = require(extra.modname)
|
||||
assert.is_not_nil(mod)
|
||||
local spec = Plugin.Spec.new({
|
||||
{ "williamboman/mason.nvim", opts = { ensure_installed = {} } },
|
||||
{ "mason-org/mason.nvim", opts = { ensure_installed = {} } },
|
||||
{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
|
||||
mod,
|
||||
}, { optional = true })
|
||||
|
@ -60,7 +60,7 @@ describe("Extra", function()
|
|||
|
||||
local mod = require(extra.modname)
|
||||
local spec = Plugin.Spec.new({
|
||||
{ "williamboman/mason.nvim", opts = { ensure_installed = {} } },
|
||||
{ "mason-org/mason.nvim", opts = { ensure_installed = {} } },
|
||||
{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
|
||||
mod,
|
||||
}, { optional = true })
|
||||
|
|
|
@ -7,10 +7,10 @@ load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/ma
|
|||
require("lazy.minit").setup({
|
||||
spec = {
|
||||
{ dir = vim.uv.cwd() },
|
||||
"LazyVim/starter",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"williamboman/mason.nvim",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
{ "LazyVim/starter" },
|
||||
{ "nvim-treesitter/nvim-treesitter" },
|
||||
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
|
||||
{ "mason-org/mason.nvim", version = "^1.0.0" },
|
||||
{ "echasnovski/mini.icons", opts = {} },
|
||||
},
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue