mirror of
https://github.com/LazyVim/LazyVim.git
synced 2026-07-25 14:01:06 +00:00
Merge branch 'main' into dev
This commit is contained in:
commit
8901580635
6 changed files with 14 additions and 20 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
*LazyVim.txt* For Neovim Last change: 2025 October 08
|
*LazyVim.txt* For Neovim Last change: 2025 October 09
|
||||||
|
|
||||||
==============================================================================
|
==============================================================================
|
||||||
Table of Contents *LazyVim-table-of-contents*
|
Table of Contents *LazyVim-table-of-contents*
|
||||||
|
|
|
||||||
|
|
@ -182,12 +182,8 @@ map("n", "<leader>l","<cmd>Lazy<cr>", { desc = "Lazy" })
|
||||||
-- floating terminal
|
-- floating terminal
|
||||||
map("n", "<leader>fT", function() Snacks.terminal() end, { desc = "Terminal (cwd)" })
|
map("n", "<leader>fT", function() Snacks.terminal() end, { desc = "Terminal (cwd)" })
|
||||||
map("n", "<leader>ft", function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" })
|
map("n", "<leader>ft", function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" })
|
||||||
map("n", "<c-/>", function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" })
|
map({"n","t"}, "<c-/>",function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "Terminal (Root Dir)" })
|
||||||
map("n", "<c-_>", function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "which_key_ignore" })
|
map({"n","t"}, "<c-_>",function() Snacks.terminal(nil, { cwd = LazyVim.root() }) end, { desc = "which_key_ignore" })
|
||||||
|
|
||||||
-- Terminal Mappings
|
|
||||||
map("t", "<C-/>", "<cmd>close<cr>", { desc = "Hide Terminal" })
|
|
||||||
map("t", "<c-_>", "<cmd>close<cr>", { desc = "which_key_ignore" })
|
|
||||||
|
|
||||||
-- windows
|
-- windows
|
||||||
map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
|
map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,11 @@ return {
|
||||||
|
|
||||||
cmdline = {
|
cmdline = {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
keymap = { preset = "cmdline" },
|
keymap = {
|
||||||
|
preset = "cmdline",
|
||||||
|
["<Right>"] = false,
|
||||||
|
["<Left>"] = false,
|
||||||
|
},
|
||||||
completion = {
|
completion = {
|
||||||
list = { selection = { preselect = false } },
|
list = { selection = { preselect = false } },
|
||||||
menu = {
|
menu = {
|
||||||
|
|
|
||||||
|
|
@ -113,17 +113,8 @@ return {
|
||||||
require("render-markdown").setup(opts)
|
require("render-markdown").setup(opts)
|
||||||
Snacks.toggle({
|
Snacks.toggle({
|
||||||
name = "Render Markdown",
|
name = "Render Markdown",
|
||||||
get = function()
|
get = require("render-markdown").get,
|
||||||
return require("render-markdown.state").enabled
|
set = require("render-markdown").set,
|
||||||
end,
|
|
||||||
set = function(enabled)
|
|
||||||
local m = require("render-markdown")
|
|
||||||
if enabled then
|
|
||||||
m.enable()
|
|
||||||
else
|
|
||||||
m.disable()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
}):map("<leader>um")
|
}):map("<leader>um")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,8 @@ return {
|
||||||
nav_j = { "<C-j>", term_nav("j"), desc = "Go to Lower Window", expr = true, mode = "t" },
|
nav_j = { "<C-j>", term_nav("j"), desc = "Go to Lower Window", expr = true, mode = "t" },
|
||||||
nav_k = { "<C-k>", term_nav("k"), desc = "Go to Upper Window", expr = true, mode = "t" },
|
nav_k = { "<C-k>", term_nav("k"), desc = "Go to Upper Window", expr = true, mode = "t" },
|
||||||
nav_l = { "<C-l>", term_nav("l"), desc = "Go to Right Window", expr = true, mode = "t" },
|
nav_l = { "<C-l>", term_nav("l"), desc = "Go to Right Window", expr = true, mode = "t" },
|
||||||
|
hide_slash = { "<C-/>", "hide", desc = "Hide Terminal", mode = { "t", "n" } },
|
||||||
|
hide_underscore = { "<c-_>", "hide", desc = "which_key_ignore", mode = { "t", "n" } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,9 @@ local prios = {
|
||||||
["lazyvim.plugins.extras.coding.nvim-cmp"] = 2,
|
["lazyvim.plugins.extras.coding.nvim-cmp"] = 2,
|
||||||
["lazyvim.plugins.extras.editor.neo-tree"] = 2,
|
["lazyvim.plugins.extras.editor.neo-tree"] = 2,
|
||||||
["lazyvim.plugins.extras.ui.edgy"] = 3,
|
["lazyvim.plugins.extras.ui.edgy"] = 3,
|
||||||
["lazyvim.plugins.extras.lang.typescript"] = 5,
|
["lazyvim.plugins.extras.ai.copilot-native"] = 4,
|
||||||
["lazyvim.plugins.extras.coding.blink"] = 5,
|
["lazyvim.plugins.extras.coding.blink"] = 5,
|
||||||
|
["lazyvim.plugins.extras.lang.typescript"] = 5,
|
||||||
["lazyvim.plugins.extras.formatting.prettier"] = 10,
|
["lazyvim.plugins.extras.formatting.prettier"] = 10,
|
||||||
-- default core extra priority is 20
|
-- default core extra priority is 20
|
||||||
-- default priority is 50
|
-- default priority is 50
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue