mirror of
https://github.com/LazyVim/LazyVim.git
synced 2025-08-30 06:40:07 +02:00
Compare commits
17 commits
Author | SHA1 | Date | |
---|---|---|---|
|
25abbf546d | ||
|
1b1c7d0f45 | ||
|
70b4615cb2 | ||
|
c20c402295 | ||
|
ec5981dfb1 | ||
|
b0334fd57c | ||
|
cb223553ff | ||
|
771089f692 | ||
|
541b83276e | ||
|
759a19e785 | ||
|
f3e37a1f83 | ||
|
9c596681f6 | ||
|
606b96466e | ||
|
16a772452a | ||
|
f2f2aea672 | ||
|
0ca49bcfed | ||
|
5b94baa1d2 |
35 changed files with 117 additions and 91 deletions
2
.github/.release-please-manifest.json
vendored
2
.github/.release-please-manifest.json
vendored
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
".": "14.14.0"
|
".": "14.15.0"
|
||||||
}
|
}
|
||||||
|
|
19
CHANGELOG.md
19
CHANGELOG.md
|
@ -1,5 +1,24 @@
|
||||||
# Changelog
|
# 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)
|
## [14.14.0](https://github.com/LazyVim/LazyVim/compare/v14.13.0...v14.14.0) (2025-02-15)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
*LazyVim.txt* For Neovim Last change: 2025 February 15
|
*LazyVim.txt* For Neovim Last change: 2025 May 12
|
||||||
|
|
||||||
==============================================================================
|
==============================================================================
|
||||||
Table of Contents *LazyVim-table-of-contents*
|
Table of Contents *LazyVim-table-of-contents*
|
||||||
|
|
|
@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
|
||||||
---@class LazyVimConfig: LazyVimOptions
|
---@class LazyVimConfig: LazyVimOptions
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
M.version = "14.14.0" -- x-release-please-version
|
M.version = "14.15.0" -- x-release-please-version
|
||||||
LazyVim.config = M
|
LazyVim.config = M
|
||||||
|
|
||||||
---@class LazyVimOptions
|
---@class LazyVimOptions
|
||||||
|
|
|
@ -179,7 +179,7 @@ map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit All" })
|
||||||
|
|
||||||
-- highlights under cursor
|
-- highlights under cursor
|
||||||
map("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" })
|
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
|
-- LazyVim Changelog
|
||||||
map("n", "<leader>L", function() LazyVim.news.changelog() end, { desc = "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 {
|
return {
|
||||||
{
|
{
|
||||||
"CopilotC-Nvim/CopilotChat.nvim",
|
"CopilotC-Nvim/CopilotChat.nvim",
|
||||||
|
@ -62,16 +37,25 @@ return {
|
||||||
{
|
{
|
||||||
"<leader>aq",
|
"<leader>aq",
|
||||||
function()
|
function()
|
||||||
local input = vim.fn.input("Quick Chat: ")
|
vim.ui.input({
|
||||||
if input ~= "" then
|
prompt = "Quick Chat: ",
|
||||||
require("CopilotChat").ask(input)
|
}, function(input)
|
||||||
end
|
if input ~= "" then
|
||||||
|
require("CopilotChat").ask(input)
|
||||||
|
end
|
||||||
|
end)
|
||||||
end,
|
end,
|
||||||
desc = "Quick Chat (CopilotChat)",
|
desc = "Quick Chat (CopilotChat)",
|
||||||
mode = { "n", "v" },
|
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)
|
config = function(_, opts)
|
||||||
local chat = require("CopilotChat")
|
local chat = require("CopilotChat")
|
||||||
|
|
|
@ -83,7 +83,6 @@ return {
|
||||||
|
|
||||||
cmdline = {
|
cmdline = {
|
||||||
enabled = false,
|
enabled = false,
|
||||||
sources = {},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
keymap = {
|
keymap = {
|
||||||
|
@ -144,6 +143,7 @@ return {
|
||||||
items = transform_items and transform_items(ctx, items) or items
|
items = transform_items and transform_items(ctx, items) or items
|
||||||
for _, item in ipairs(items) do
|
for _, item in ipairs(items) do
|
||||||
item.kind = kind_idx or item.kind
|
item.kind = kind_idx or item.kind
|
||||||
|
item.kind_icon = LazyVim.config.icons.kinds[item.kind_name] or item.kind_icon or nil
|
||||||
end
|
end
|
||||||
return items
|
return items
|
||||||
end
|
end
|
||||||
|
|
|
@ -140,21 +140,25 @@ return {
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Standalone --
|
-- Standalone --
|
||||||
|
local blink = require("blink.cmp")
|
||||||
expand_select_override = function(snippets, insert)
|
expand_select_override = function(snippets, insert)
|
||||||
-- Schedule, otherwise blink's virtual text is not removed on vim.ui.select
|
-- Schedule, otherwise blink's virtual text is not removed on vim.ui.select
|
||||||
require("blink.cmp").cancel()
|
blink.cancel()
|
||||||
vim.schedule(function()
|
vim.schedule(function()
|
||||||
MiniSnippets.default_select(snippets, insert)
|
MiniSnippets.default_select(snippets, insert)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
--
|
--
|
||||||
-- Blink performs a require on blink.cmp.sources.snippets.default
|
-- 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)
|
opts.sources.default = vim.tbl_filter(function(source)
|
||||||
return source ~= "snippets"
|
return source ~= "snippets"
|
||||||
end, opts.sources.default)
|
end, opts.sources.default)
|
||||||
opts.snippets = { -- need to repeat blink's preset here
|
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()
|
active = function()
|
||||||
return MiniSnippets.session.get(false) ~= nil
|
return MiniSnippets.session.get(false) ~= nil
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -72,7 +72,6 @@ return {
|
||||||
{ "<leader>fR", function() Snacks.picker.recent({ filter = { cwd = true }}) end, desc = "Recent (cwd)" },
|
{ "<leader>fR", function() Snacks.picker.recent({ filter = { cwd = true }}) end, desc = "Recent (cwd)" },
|
||||||
{ "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
|
{ "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
|
||||||
-- git
|
-- 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>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_status() end, desc = "Git Status" },
|
||||||
{ "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
|
{ "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
|
||||||
|
|
|
@ -24,7 +24,7 @@ local supported = {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "biome" } },
|
opts = { ensure_installed = { "biome" } },
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
table.insert(opts.ensure_installed, "black")
|
table.insert(opts.ensure_installed, "black")
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -58,7 +58,7 @@ M.has_parser = LazyVim.memoize(M.has_parser)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "prettier" } },
|
opts = { ensure_installed = { "prettier" } },
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ return {
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "ansible-lint" } },
|
opts = { ensure_installed = { "ansible-lint" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -117,7 +117,7 @@ return {
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
-- Ensure C/C++ debugger is installed
|
-- Ensure C/C++ debugger is installed
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
optional = true,
|
optional = true,
|
||||||
opts = { ensure_installed = { "codelldb" } },
|
opts = { ensure_installed = { "codelldb" } },
|
||||||
},
|
},
|
||||||
|
|
|
@ -10,7 +10,7 @@ return {
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "elm-format" } },
|
opts = { ensure_installed = { "elm-format" } },
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -75,7 +75,7 @@ return {
|
||||||
},
|
},
|
||||||
-- Ensure Go tools are installed
|
-- Ensure Go tools are installed
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "goimports", "gofumpt" } },
|
opts = { ensure_installed = { "goimports", "gofumpt" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -83,7 +83,7 @@ return {
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "gomodifytags", "impl" } },
|
opts = { ensure_installed = { "gomodifytags", "impl" } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -111,7 +111,7 @@ return {
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "delve" } },
|
opts = { ensure_installed = { "delve" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,7 @@ return {
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "haskell-language-server" } },
|
opts = { ensure_installed = { "haskell-language-server" } },
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ return {
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "haskell-debug-adapter" } },
|
opts = { ensure_installed = { "haskell-debug-adapter" } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -56,7 +56,7 @@ return {
|
||||||
end,
|
end,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
|
opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -14,7 +14,7 @@ return {
|
||||||
end,
|
end,
|
||||||
-- Add packages(linting, debug adapter)
|
-- Add packages(linting, debug adapter)
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "ktlint" } },
|
opts = { ensure_installed = { "ktlint" } },
|
||||||
},
|
},
|
||||||
-- Add syntax highlighting
|
-- Add syntax highlighting
|
||||||
|
@ -35,7 +35,7 @@ return {
|
||||||
{
|
{
|
||||||
"mfussenegger/nvim-lint",
|
"mfussenegger/nvim-lint",
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = "williamboman/mason.nvim",
|
dependencies = "mason-org/mason.nvim",
|
||||||
opts = {
|
opts = {
|
||||||
linters_by_ft = { kotlin = { "ktlint" } },
|
linters_by_ft = { kotlin = { "ktlint" } },
|
||||||
},
|
},
|
||||||
|
@ -64,7 +64,7 @@ return {
|
||||||
{
|
{
|
||||||
"mfussenegger/nvim-dap",
|
"mfussenegger/nvim-dap",
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = "williamboman/mason.nvim",
|
dependencies = "mason-org/mason.nvim",
|
||||||
opts = function()
|
opts = function()
|
||||||
local dap = require("dap")
|
local dap = require("dap")
|
||||||
if not dap.adapters.kotlin then
|
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" } },
|
opts = { ensure_installed = { "markdownlint-cli2", "markdown-toc" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,7 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "csharpier", "netcoredbg" } },
|
opts = { ensure_installed = { "csharpier", "netcoredbg" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,7 +35,7 @@ return {
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = {
|
opts = {
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
"phpcs",
|
"phpcs",
|
||||||
|
|
|
@ -48,7 +48,7 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "erb-formatter", "erb-lint" } },
|
opts = { ensure_installed = { "erb-formatter", "erb-lint" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -43,7 +43,7 @@ return {
|
||||||
|
|
||||||
-- Ensure Rust debugger is installed
|
-- Ensure Rust debugger is installed
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
optional = true,
|
optional = true,
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
opts.ensure_installed = opts.ensure_installed or {}
|
opts.ensure_installed = opts.ensure_installed or {}
|
||||||
|
|
|
@ -143,7 +143,7 @@ return {
|
||||||
|
|
||||||
-- Linters & formatters
|
-- Linters & formatters
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "sqlfluff" } },
|
opts = { ensure_installed = { "sqlfluff" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@ return {
|
||||||
},
|
},
|
||||||
-- ensure terraform tools are installed
|
-- ensure terraform tools are installed
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "tflint" } },
|
opts = { ensure_installed = { "tflint" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -194,7 +194,7 @@ return {
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
opts.ensure_installed = opts.ensure_installed or {}
|
opts.ensure_installed = opts.ensure_installed or {}
|
||||||
table.insert(opts.ensure_installed, "js-debug-adapter")
|
table.insert(opts.ensure_installed, "js-debug-adapter")
|
||||||
|
|
|
@ -3,22 +3,12 @@ local pick_chezmoi = function()
|
||||||
require("telescope").extensions.chezmoi.find_files()
|
require("telescope").extensions.chezmoi.find_files()
|
||||||
elseif LazyVim.pick.picker.name == "fzf" then
|
elseif LazyVim.pick.picker.name == "fzf" then
|
||||||
local fzf_lua = require("fzf-lua")
|
local fzf_lua = require("fzf-lua")
|
||||||
local results = require("chezmoi.commands").list()
|
local actions = {
|
||||||
local chezmoi = require("chezmoi.commands")
|
["enter"] = function(selected)
|
||||||
|
fzf_lua.actions.vimcmd_entry("ChezmoiEdit", selected, { cwd = os.getenv("HOME") })
|
||||||
local opts = {
|
end,
|
||||||
fzf_opts = {},
|
|
||||||
fzf_colors = true,
|
|
||||||
actions = {
|
|
||||||
["default"] = function(selected)
|
|
||||||
chezmoi.edit({
|
|
||||||
targets = { "~/" .. selected[1] },
|
|
||||||
args = { "--watch" },
|
|
||||||
})
|
|
||||||
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
|
elseif LazyVim.pick.picker.name == "snacks" then
|
||||||
local results = require("chezmoi.commands").list({
|
local results = require("chezmoi.commands").list({
|
||||||
args = {
|
args = {
|
||||||
|
@ -65,6 +55,7 @@ return {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"xvzc/chezmoi.nvim",
|
"xvzc/chezmoi.nvim",
|
||||||
|
cmd = { "ChezmoiEdit" },
|
||||||
keys = {
|
keys = {
|
||||||
{
|
{
|
||||||
"<leader>sz",
|
"<leader>sz",
|
||||||
|
@ -120,6 +111,27 @@ return {
|
||||||
table.insert(opts.config.center, 5, projects)
|
table.insert(opts.config.center, 5, projects)
|
||||||
end,
|
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
|
-- Filetype icons
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,7 +18,7 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "shellcheck" } },
|
opts = { ensure_installed = { "shellcheck" } },
|
||||||
},
|
},
|
||||||
-- add some stuff to treesitter
|
-- add some stuff to treesitter
|
||||||
|
|
|
@ -2,7 +2,7 @@ return {
|
||||||
|
|
||||||
-- Ensure GitUI tool is installed
|
-- Ensure GitUI tool is installed
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
opts = { ensure_installed = { "gitui" } },
|
opts = { ensure_installed = { "gitui" } },
|
||||||
keys = {
|
keys = {
|
||||||
{
|
{
|
||||||
|
|
|
@ -42,12 +42,14 @@ return {
|
||||||
"pwntester/octo.nvim",
|
"pwntester/octo.nvim",
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
vim.treesitter.language.register("markdown", "octo")
|
vim.treesitter.language.register("markdown", "octo")
|
||||||
if LazyVim.has("telescope.nvim") then
|
if LazyVim.has_extra("editor.telescope") then
|
||||||
opts.picker = "telescope"
|
opts.picker = "telescope"
|
||||||
elseif LazyVim.has("fzf-lua") then
|
elseif LazyVim.has_extra("editor.fzf") then
|
||||||
opts.picker = "fzf-lua"
|
opts.picker = "fzf-lua"
|
||||||
|
elseif LazyVim.has_extra("editor.snacks_picker") then
|
||||||
|
opts.picker = "snacks"
|
||||||
else
|
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
|
end
|
||||||
|
|
||||||
-- Keep some empty windows in sessions
|
-- Keep some empty windows in sessions
|
||||||
|
|
|
@ -5,7 +5,7 @@ return {
|
||||||
event = "LazyFile",
|
event = "LazyFile",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"mason.nvim",
|
"mason.nvim",
|
||||||
{ "williamboman/mason-lspconfig.nvim", config = function() end },
|
{ "mason-org/mason-lspconfig.nvim", config = function() end },
|
||||||
},
|
},
|
||||||
opts = function()
|
opts = function()
|
||||||
---@class PluginLspOpts
|
---@class PluginLspOpts
|
||||||
|
@ -257,7 +257,7 @@ return {
|
||||||
-- cmdline tools and lsp servers
|
-- cmdline tools and lsp servers
|
||||||
{
|
{
|
||||||
|
|
||||||
"williamboman/mason.nvim",
|
"mason-org/mason.nvim",
|
||||||
cmd = "Mason",
|
cmd = "Mason",
|
||||||
keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
|
keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
|
||||||
build = ":MasonUpdate",
|
build = ":MasonUpdate",
|
||||||
|
@ -292,4 +292,8 @@ return {
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- pin to v1 for now
|
||||||
|
{ "mason-org/mason.nvim", version = "^1.0.0" },
|
||||||
|
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,8 @@ M.renames = {
|
||||||
["romgrk/nvim-treesitter-context"] = "nvim-treesitter/nvim-treesitter-context",
|
["romgrk/nvim-treesitter-context"] = "nvim-treesitter/nvim-treesitter-context",
|
||||||
["glepnir/dashboard-nvim"] = "nvimdev/dashboard-nvim",
|
["glepnir/dashboard-nvim"] = "nvimdev/dashboard-nvim",
|
||||||
["markdown.nvim"] = "render-markdown.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()
|
function M.save_core()
|
||||||
|
|
|
@ -44,7 +44,7 @@ describe("Extra", function()
|
||||||
local mod = require(extra.modname)
|
local mod = require(extra.modname)
|
||||||
assert.is_not_nil(mod)
|
assert.is_not_nil(mod)
|
||||||
local spec = Plugin.Spec.new({
|
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 = {} } },
|
{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
|
||||||
mod,
|
mod,
|
||||||
}, { optional = true })
|
}, { optional = true })
|
||||||
|
@ -60,7 +60,7 @@ describe("Extra", function()
|
||||||
|
|
||||||
local mod = require(extra.modname)
|
local mod = require(extra.modname)
|
||||||
local spec = Plugin.Spec.new({
|
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 = {} } },
|
{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
|
||||||
mod,
|
mod,
|
||||||
}, { optional = true })
|
}, { optional = true })
|
||||||
|
|
|
@ -7,10 +7,10 @@ load(vim.fn.system("curl -s https://raw.githubusercontent.com/folke/lazy.nvim/ma
|
||||||
require("lazy.minit").setup({
|
require("lazy.minit").setup({
|
||||||
spec = {
|
spec = {
|
||||||
{ dir = vim.uv.cwd() },
|
{ dir = vim.uv.cwd() },
|
||||||
"LazyVim/starter",
|
{ "LazyVim/starter" },
|
||||||
"williamboman/mason-lspconfig.nvim",
|
{ "nvim-treesitter/nvim-treesitter" },
|
||||||
"williamboman/mason.nvim",
|
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
|
||||||
"nvim-treesitter/nvim-treesitter",
|
{ "mason-org/mason.nvim", version = "^1.0.0" },
|
||||||
{ "echasnovski/mini.icons", opts = {} },
|
{ "echasnovski/mini.icons", opts = {} },
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue