update(nvim)
This commit is contained in:
1 parent
57b9c4b6fb
commit
39b2a974d1
28 files changed
+223
-201
No files matched your search
@@ -126,7 +126,7 @@ ac("BufWritePre", {
|
||||
if args.match:match("^%w%w+://") then
|
||||
return
|
||||
end
|
||||
local file = vim.loop.fs_realpath(args.match) or args.match
|
||||
local file = vim.uv.fs_realpath(args.match) or args.match
|
||||
vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
|
||||
end,
|
||||
})
|
||||
|
||||
@@ -2,7 +2,6 @@ local map = vim.keymap.set
|
||||
local api = vim.api
|
||||
local o = vim.opt
|
||||
|
||||
local Util = require("lazyvim.util")
|
||||
local lazy = require("lazy")
|
||||
|
||||
-- Search current word
|
||||
@@ -11,36 +10,11 @@ local searching_brave = function()
|
||||
end
|
||||
map("n", "<leader>?", searching_brave, { noremap = true, silent = true, desc = "Search current word on brave search" })
|
||||
|
||||
-- Lazy options
|
||||
map("n", "<leader>l", "<Nop>")
|
||||
map("n", "<leader>ll", "<cmd>Lazy<cr>", { desc = "Lazy" })
|
||||
-- stylua: ignore start
|
||||
map("n", "<leader>ld", function() vim.fn.system({ "xdg-open", "https://lazyvim.org" }) end, { desc = "LazyVim Docs" })
|
||||
map("n", "<leader>lr", function() vim.fn.system({ "xdg-open", "https://github.com/LazyVim/LazyVim" }) end, { desc = "LazyVim Repo" })
|
||||
map("n", "<leader>lx", "<cmd>LazyExtras<cr>", { desc = "Extras" })
|
||||
map("n", "<leader>lc", function() Util.news.changelog() end, { desc = "LazyVim Changelog" })
|
||||
-- return to dir
|
||||
map("n", "<leader>pv", vim.cmd.Ex)
|
||||
|
||||
map("n", "<leader>lu", function() lazy.update() end, { desc = "Lazy Update" })
|
||||
map("n", "<leader>lC", function() lazy.check() end, { desc = "Lazy Check" })
|
||||
map("n", "<leader>ls", function() lazy.sync() end, { desc = "Lazy Sync" })
|
||||
-- stylua: ignore end
|
||||
|
||||
-- Disable LazyVim bindings
|
||||
map("n", "<leader>L", "<Nop>")
|
||||
map("n", "<leader>fT", "<Nop>")
|
||||
|
||||
-- Identation
|
||||
map("n", "<", "<<", { desc = "Deindent" })
|
||||
map("n", ">", ">>", { desc = "Indent" })
|
||||
|
||||
-- Save without formatting
|
||||
map("n", "<A-s>", "<cmd>noautocmd w<CR>", { desc = "Save without formatting" })
|
||||
|
||||
-- Cursor navigation on insert mode
|
||||
map("i", "<M-h>", "<left>", { desc = "Move cursor left" })
|
||||
map("i", "<M-l>", "<right>", { desc = "Move cursor left" })
|
||||
map("i", "<M-j>", "<down>", { desc = "Move cursor left" })
|
||||
map("i", "<M-k>", "<up>", { desc = "Move cursor left" })
|
||||
-- Exit insert mode without hitting Esc
|
||||
map("i", "jj", "<Esc>", { desc = "Esc" })
|
||||
|
||||
-- End of the word backwards
|
||||
map("n", "E", "ge")
|
||||
@@ -67,7 +41,7 @@ map("n", "n", "nzzzv")
|
||||
map("n", "N", "Nzzzv")
|
||||
|
||||
-- Toggle statusline
|
||||
map("n", "<leader>uS", function()
|
||||
map("n", "<leader>sl", function()
|
||||
if o.laststatus:get() == 0 then
|
||||
o.laststatus = 3
|
||||
else
|
||||
@@ -84,34 +58,36 @@ map("n", "<leader>u<tab>", function()
|
||||
end
|
||||
end, { desc = "Toggle Tabline" })
|
||||
|
||||
|
||||
-- Shift arrows to select
|
||||
map('i', '<S-Down>', '<ESC>lvj')
|
||||
map('v', '<S-Down>', 'j')
|
||||
map('n', '<S-Down>', 'vj')
|
||||
|
||||
map('i', '<S-Up>', '<ESC>vk')
|
||||
map('v', '<S-Up>', 'k')
|
||||
map('n', '<S-Up>', 'vk')
|
||||
|
||||
map('i', '<S-Right>', '<ESC>vl')
|
||||
map('v', '<S-Right>', 'l')
|
||||
map('n', '<S-Right>', 'vl')
|
||||
|
||||
map('i', '<S-Left>', '<ESC>vh')
|
||||
map('v', '<S-Left>', 'h')
|
||||
map('n', '<S-Left>', 'vh')
|
||||
|
||||
|
||||
-- " Ctrl-C, Ctrl-V option for copy/paste
|
||||
map('v', '<C-c>', '"+yi')
|
||||
map('i', '<C-c>', '"+yi')
|
||||
map('v', '<C-x>', '"+c')
|
||||
map('v', '<C-v>', 'c<ESC>"+p')
|
||||
map('i', '<C-v>', '<ESC>"+pa')
|
||||
|
||||
-- Comment box
|
||||
map("n", "]/", "/\\S\\zs\\s*╭<CR>zt", { desc = "Next block comment" })
|
||||
map("n", "[/", "?\\S\\zs\\s*╭<CR>zt", { desc = "Prev block comment" })
|
||||
|
||||
-- Plugin Info
|
||||
map("n", "<leader>cif", "<cmd>LazyFormatInfo<cr>", { desc = "Formatting" })
|
||||
map("n", "<leader>cic", "<cmd>ConformInfo<cr>", { desc = "Conform" })
|
||||
local linters = function()
|
||||
local linters_attached = require("lint").linters_by_ft[vim.bo.filetype]
|
||||
local buf_linters = {}
|
||||
|
||||
if not linters_attached then
|
||||
vim.notify("No linters attached", vim.log.levels.WARN, { title = "Linter" })
|
||||
return
|
||||
end
|
||||
|
||||
for _, linter in pairs(linters_attached) do
|
||||
table.insert(buf_linters, linter)
|
||||
end
|
||||
|
||||
local unique_client_names = table.concat(buf_linters, ", ")
|
||||
local linters = string.format("%s", unique_client_names)
|
||||
|
||||
vim.notify(linters, vim.log.levels.INFO, { title = "Linter" })
|
||||
end
|
||||
map("n", "<leader>ciL", linters, { desc = "Lint" })
|
||||
map("n", "<leader>cir", "<cmd>LazyRoot<cr>", { desc = "Root" })
|
||||
|
||||
-- U for redo
|
||||
map("n", "U", "<C-r>", { desc = "Redo" })
|
||||
|
||||
@@ -119,11 +95,8 @@ map("n", "U", "<C-r>", { desc = "Redo" })
|
||||
map("n", "<a-h>", "_", { desc = "First character of Line" })
|
||||
map("n", "<a-l>", "$", { desc = "Last character of Line" })
|
||||
|
||||
-- Copy whole text to clipboard
|
||||
map("n", "<C-c>", ":%y+<CR>", { desc = "Copy whole text to clipboard", silent = true })
|
||||
|
||||
-- clipboard
|
||||
map("v", "<leader>y", '"+y', { desc = "Yank to clipboard" })
|
||||
-- Select & copy to clipboard
|
||||
map("v", "<C-c>", '"+y', { desc = "Yank to clipboard" })
|
||||
|
||||
-- Duplicate paragraph
|
||||
map('n', '<Leader>p', 'yap<S-}>p', { desc = 'Duplicate Paragraph' })
|
||||
@@ -137,7 +110,6 @@ map("i", "<C-e>", "<End>", { desc = "End Of Line" })
|
||||
map("n", "<C-a>", "gg<S-V>G", { desc = "Select all text", silent = true, noremap = true })
|
||||
|
||||
-- Paste options
|
||||
map("i", "<C-v>", '<C-r>"', { desc = "Paste on insert mode" })
|
||||
map("v", "p", '"_dP', { desc = "Paste without overwriting" })
|
||||
|
||||
-- Delete and change without yanking
|
||||
@@ -154,13 +126,30 @@ map("n", "dd", function()
|
||||
end
|
||||
end, { noremap = true, expr = true, desc = "Don't yank empty line to clipboard" })
|
||||
|
||||
-- Search inside visually highlighted text. Use `silent = false` for it to
|
||||
-- make effect immediately.
|
||||
map("x", "g/", "<esc>/\\%V", { silent = false, desc = "Search inside visual selection" })
|
||||
-- Search for highlighted text in buffer
|
||||
map("v", "//", 'y/<C-R>"<CR>', { desc = "Search for highlighted text" })
|
||||
|
||||
-- Search visually selected text (slightly better than builtins in Neovim>=0.8)
|
||||
map("x", "*", [[y/\V<C-R>=escape(@", '/\')<CR><CR>]])
|
||||
map("x", "#", [[y?\V<C-R>=escape(@", '?\')<CR><CR>]])
|
||||
-- Visual --
|
||||
-- Stay in indent mode
|
||||
map("v", "<", "<gv")
|
||||
map("v", ">", ">gv")
|
||||
|
||||
map({"n", "o", "x"}, "<s-h>", "^", { desc = "Jump to beginning of line" })
|
||||
map({"n", "o", "x"}, "<s-l>", "g_", { desc = "Jump to end of line" })
|
||||
|
||||
-- Copy file paths
|
||||
map("n", "<leader>cf", "<cmd>let @+ = expand(\"%\")<CR>", { desc = "Copy File Name" })
|
||||
map("n", "<leader>cp", "<cmd>let @+ = expand(\"%:p\")<CR>", { desc = "Copy File Path" })
|
||||
|
||||
-- Dismiss Noice Message
|
||||
map("n", "<leader>nd", "<cmd>NoiceDismiss<CR>", {desc = "Dismiss Noice Message"})
|
||||
|
||||
-- Replace word under cursor across entire buffer
|
||||
map("n", "<leader>r", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
|
||||
{ desc = "Replace word under cursor" })
|
||||
|
||||
-- Replace all instances of highlighted words
|
||||
map("v", "<leader>rr", '"hy:%s/<C-r>h//g<left><left>')
|
||||
|
||||
-- Dashboard
|
||||
map("n", "<leader>fd", function()
|
||||
@@ -170,5 +159,3 @@ map("n", "<leader>fd", function()
|
||||
vim.cmd("Dashboard")
|
||||
end
|
||||
end, { desc = "Dashboard" })
|
||||
|
||||
|
||||
@@ -50,3 +50,7 @@ if vim.fn.has("nvim-0.10") == 1 then
|
||||
end
|
||||
|
||||
o.conceallevel = 2
|
||||
|
||||
-- LSP Server to use for Python.
|
||||
-- Set to "basedpyright" to use basedpyright instead of pyright.
|
||||
vim.g.lazyvim_python_lsp = "basedpyright"
|
||||
@@ -1,7 +1,7 @@
|
||||
return {
|
||||
{
|
||||
"Weissle/persistent-breakpoints.nvim",
|
||||
cond = require("lazyvim.util").has("nvim-dap"),
|
||||
cond = LazyVim.has("nvim-dap"),
|
||||
event = "LazyFile",
|
||||
keys = {
|
||||
{ "<leader>dbd", "<cmd>PBClearAllBreakpoints<cr>", desc = "Delete All Breakpoints" },
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
return {
|
||||
"nvim-telescope/telescope-dap.nvim",
|
||||
cond = require("lazyvim.util").has("nvim-dap"),
|
||||
cond = LazyVim.has("nvim-dap"),
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("dap")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -3,7 +3,7 @@ return {
|
||||
"ThePrimeagen/git-worktree.nvim",
|
||||
opts = {},
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("git_worktree")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
return {
|
||||
"tomasky/bookmarks.nvim",
|
||||
config = function()
|
||||
require("bookmarks").setup({
|
||||
save_file = vim.fn.stdpath("state") .. "/bookmarks",
|
||||
keywords = {
|
||||
["@t"] = " ",
|
||||
["@w"] = " ",
|
||||
["@f"] = " ",
|
||||
["@n"] = " ",
|
||||
},
|
||||
})
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").setup({
|
||||
extensions = {
|
||||
repo = {
|
||||
list = {
|
||||
fd_opts = {
|
||||
"--no-ignore-vcs",
|
||||
},
|
||||
search_dirs = {
|
||||
"~/Repos/",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
require("telescope").load_extension("bookmarks")
|
||||
end)
|
||||
end,
|
||||
-- stylua: ignore
|
||||
keys = {
|
||||
{ "<leader>fB", "<cmd>Telescope bookmarks list<cr>", desc = "Bookmarks" },
|
||||
{ "mm", function() require("bookmarks").bookmark_toggle() end, desc = "Toggle Bookmark" },
|
||||
{ "ml", function() require("bookmarks").bookmark_ann() end, desc = "Add/Edit Current Line" },
|
||||
{ "mc", function() require("bookmarks").bookmark_clean() end, desc = "Clear All Bookmarks" },
|
||||
{ "mn", function() require("bookmarks").bookmark_next() end, desc = "Next Bookmark" },
|
||||
{ "mp", function() require("bookmarks").bookmark_prev() end, desc = "Previous Bookmark" },
|
||||
{ "]k", function() require("bookmarks").bookmark_next() end, desc = "Next Bookmark" },
|
||||
{ "[k", function() require("bookmarks").bookmark_prev() end, desc = "Previous Bookmark" },
|
||||
{ "mL", function() require("bookmarks").bookmark_list() end, desc = "List Bookmarks" },
|
||||
},
|
||||
}
|
||||
@@ -28,7 +28,7 @@ return {
|
||||
keys = keys,
|
||||
config = function()
|
||||
require("grapple").setup()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("grapple")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -46,7 +46,7 @@ return {
|
||||
end,
|
||||
})
|
||||
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("harpoon")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -52,7 +52,7 @@ return {
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("rest-nvim").setup(opts)
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("rest")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
return {
|
||||
"nvim-telescope/telescope-file-browser.nvim",
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").setup({
|
||||
extensions = {
|
||||
file_browser = {
|
||||
|
||||
@@ -2,7 +2,7 @@ return {
|
||||
"piersolenski/telescope-import.nvim",
|
||||
opts = {},
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").setup({
|
||||
extensions = {
|
||||
import = {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
return {
|
||||
"tsakirist/telescope-lazy.nvim",
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("lazy")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
return {
|
||||
"nvim-telescope/telescope-live-grep-args.nvim",
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("lazy")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
return {
|
||||
"benfowler/telescope-luasnip.nvim",
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("luasnip")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
return {
|
||||
"dharmx/telescope-media.nvim",
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").setup({
|
||||
extensions = {
|
||||
media = {
|
||||
|
||||
@@ -15,7 +15,7 @@ return {
|
||||
},
|
||||
opts = {},
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").setup({
|
||||
extensions = {
|
||||
repo = {
|
||||
|
||||
@@ -3,7 +3,7 @@ return {
|
||||
"debugloop/telescope-undo.nvim",
|
||||
opts = {},
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").setup({
|
||||
extensions = {
|
||||
undo = {
|
||||
|
||||
@@ -18,7 +18,7 @@ return {
|
||||
open = { "Telescope find_files" },
|
||||
},
|
||||
})
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("workspaces")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -2,7 +2,7 @@ return {
|
||||
{
|
||||
"jvgrootveld/telescope-zoxide",
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").setup({
|
||||
extensions = {
|
||||
zoxide = {
|
||||
|
||||
@@ -9,7 +9,7 @@ return {
|
||||
{ "<leader>gG", "<cmd>FloatermNew --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> lazygit<CR>", desc = "Lazygit (cwd)" },
|
||||
{ "<leader>cen", "<cmd>FloatermNew --name=node --opener=edit --titleposition=center --wintype=split --height=0.35 node<CR>", desc = "Node" },
|
||||
{ "<leader>cep", "<cmd>FloatermNew --name=python --opener=edit --titleposition=center --wintype=split --height=0.35 python<CR>", desc = "Python" },
|
||||
{ "<leader>gf", function()
|
||||
{ "<leader>gF", function()
|
||||
local git_path = vim.api.nvim_buf_get_name(0)
|
||||
vim.api.nvim_command("FloatermNew --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 lazygit -f " .. vim.trim(git_path))
|
||||
end, desc = "File History (LazyGit)" },
|
||||
@@ -27,7 +27,7 @@ return {
|
||||
{
|
||||
"dawsers/telescope-floaterm.nvim",
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
LazyVim.on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("floaterm")
|
||||
end)
|
||||
end,
|
||||
|
||||
@@ -1,90 +1,58 @@
|
||||
return {
|
||||
{
|
||||
"voldikss/vim-floaterm",
|
||||
cmd = { "FloatermNew", "FloatermToggle", "FloatermNext", "FloatermPrev", "FloatermLast", "FloatermFirst" },
|
||||
--stylua: ignore
|
||||
keys = {
|
||||
{ "<A-e>", "<cmd>FloatermNew --disposable --name=yaziroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> yazi<CR>", desc = "Yazi" },
|
||||
{ "<leader>gg", "<cmd>FloatermNew --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> lazygit<CR>", desc = "Lazygit (root dir)" },
|
||||
{ "<leader>gG", "<cmd>FloatermNew --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> lazygit<CR>", desc = "Lazygit (cwd)" },
|
||||
{ "<leader>cen", "<cmd>FloatermNew --name=node --opener=edit --titleposition=center --wintype=split --height=0.35 node<CR>", desc = "Node" },
|
||||
{ "<leader>cep", "<cmd>FloatermNew --name=python --opener=edit --titleposition=center --wintype=split --height=0.35 python<CR>", desc = "Python" },
|
||||
{ "<leader>gF", function()
|
||||
local git_path = vim.api.nvim_buf_get_name(0)
|
||||
vim.api.nvim_command("FloatermNew --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 lazygit -f " .. vim.trim(git_path))
|
||||
end, desc = "File History (LazyGit)" },
|
||||
{ "<S-Right>", "<Esc><Esc><cmd>FloatermNext<CR>", mode = { "t" }, desc = "Next Terminal" },
|
||||
{ "<S-Left>", "<Esc><Esc><cmd>FloatermPrev<CR>", mode = { "t" }, desc = "Prev Terminal" },
|
||||
{ "<A-Right>", "<Esc><Esc><cmd>FloatermLast<CR>", mode = { "t" }, desc = "Last Terminal" },
|
||||
{ "<A-Left>", "<Esc><Esc><cmd>FloatermFirst<CR>", mode = { "t" }, desc = "First Terminal" },
|
||||
{ [[<c-\>]], "<cmd>FloatermToggle<cr>", mode = { "n", "t" }, desc = "Toggle Terminal" },
|
||||
{ "<leader>ftf", "<cmd>FloatermNew --name=floatroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root><cr>", desc = "Floating (root dir)" },
|
||||
{ "<leader>ftF", "<cmd>FloatermNew --name=floatbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer><cr>", desc = "Floating (cwd)" },
|
||||
{ "<leader>fts", "<cmd>FloatermNew --name=splitroot --opener=edit --titleposition=center --height=0.35 --wintype=split --cwd=<root><cr>", desc = "Split (root dir)" },
|
||||
{ "<leader>ftS", "<cmd>FloatermNew --name=splitbuffer --opener=edit --titleposition=center --height=0.35 --wintype=split --cwd=<buffer><cr>", desc = "Split (cwd)" },
|
||||
"akinsho/toggleterm.nvim",
|
||||
cmd = {
|
||||
"ToggleTerm",
|
||||
"ToggleTermSetName",
|
||||
"ToggleTermToggleAll",
|
||||
"ToggleTermSendVisualLines",
|
||||
"ToggleTermSendCurrentLine",
|
||||
"ToggleTermSendVisualSelection",
|
||||
},
|
||||
},
|
||||
{
|
||||
"dawsers/telescope-floaterm.nvim",
|
||||
config = function()
|
||||
require("lazyvim.util").on_load("telescope.nvim", function()
|
||||
require("telescope").load_extension("floaterm")
|
||||
end)
|
||||
end,
|
||||
keys = {
|
||||
{ [[<A-\>]], "<cmd>Telescope floaterm<cr>", desc = "Terminals" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
opts = {
|
||||
defaults = {
|
||||
["<leader>ce"] = { name = "r[e]pl" },
|
||||
["<leader>ft"] = { name = "terminals" },
|
||||
size = function(term)
|
||||
if term.direction == "horizontal" then
|
||||
return 30
|
||||
elseif term.direction == "vertical" then
|
||||
return vim.o.columns * 0.4
|
||||
end
|
||||
end,
|
||||
open_mapping = [[<c-\>]],
|
||||
hide_numbers = true, -- hide the number column in toggleterm buffers
|
||||
shade_filetypes = {},
|
||||
shade_terminals = true, -- NOTE: this option takes priority over highlights specified so if you specify Normal highlights you should set this to false
|
||||
shading_factor = "-10", -- the percentage by which to lighten terminal background, default: -30 (gets multiplied by -3 if background is light)
|
||||
start_in_insert = true,
|
||||
insert_mappings = true, -- whether or not the open mapping applies in insert mode
|
||||
terminal_mappings = true, -- whether or not the open mapping applies in the opened terminals
|
||||
persist_size = true,
|
||||
persist_mode = true, -- if set to true (default) the previous terminal mode will be remembered
|
||||
direction = "float",
|
||||
close_on_exit = true, -- close the terminal window when the process exits
|
||||
-- Change the default shell. Can be a string or a function returning a string
|
||||
shell = vim.o.shell,
|
||||
-- This field is only relevant if direction is set to 'float'
|
||||
float_opts = {
|
||||
-- The border key is *almost* the same as 'nvim_open_win'
|
||||
-- see :h nvim_open_win for details on borders however
|
||||
-- the 'curved' border is a custom border type
|
||||
-- not natively supported but implemented in this plugin.
|
||||
border = "curved",
|
||||
-- like `size`, width and height can be a number or function which is passed the current terminal
|
||||
highlights = { border = "Normal", background = "Normal" },
|
||||
winblend = 3,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/edgy.nvim",
|
||||
optional = true,
|
||||
opts = function(_, opts)
|
||||
table.insert(opts.bottom, {
|
||||
ft = "floaterm",
|
||||
title = "Floaterm",
|
||||
size = { height = 0.4 },
|
||||
filter = function(buf, win)
|
||||
return vim.api.nvim_win_get_config(win).relative == ""
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"goolord/alpha-nvim",
|
||||
optional = true,
|
||||
opts = function(_, dashboard)
|
||||
-- stylua: ignore
|
||||
local button = dashboard.button("G", " " .. " Git", "<cmd>FloatermNew --disposable --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> lazygit<CR>")
|
||||
button.opts.hl = "AlphaButtons"
|
||||
button.opts.hl_shortcut = "AlphaShortcut"
|
||||
table.insert(dashboard.section.buttons.val, 7, button)
|
||||
return dashboard
|
||||
end,
|
||||
keys = {
|
||||
{ [[<c-\>]], "<cmd>ToggleTerm<cr>", mode = "n", desc = "Toggle Terminal" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"nvimdev/dashboard-nvim",
|
||||
optional = true,
|
||||
opts = function(_, opts)
|
||||
local git = {
|
||||
action = "FloatermNew --disposable --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> lazygit",
|
||||
desc = " Git",
|
||||
icon = " ",
|
||||
key = "G",
|
||||
}
|
||||
|
||||
git.desc = git.desc .. string.rep(" ", 43 - #git.desc)
|
||||
git.key_format = " %s"
|
||||
|
||||
table.insert(opts.config.center, 7, git)
|
||||
end,
|
||||
"ryanmsnyder/toggleterm-manager.nvim",
|
||||
opts = {},
|
||||
keys = {
|
||||
{ "<c-/>", "<cmd>Telescope toggleterm_manager<cr>", desc = "Terminals" },
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -139,6 +139,7 @@ return {
|
||||
"dmmulroy/tsc.nvim",
|
||||
opts = {
|
||||
auto_start_watch_mode = false,
|
||||
use_trouble_qflist = true,
|
||||
flags = {
|
||||
watch = false,
|
||||
},
|
||||
@@ -150,6 +151,11 @@ return {
|
||||
"typescript",
|
||||
"typescriptreact",
|
||||
},
|
||||
cmd = {
|
||||
"TSC",
|
||||
"TSCOpen",
|
||||
"TSCClose",
|
||||
},
|
||||
},
|
||||
{
|
||||
"dmmulroy/ts-error-translator.nvim",
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
return {
|
||||
"folke/flash.nvim",
|
||||
opts = {
|
||||
modes = {
|
||||
search = {
|
||||
enabled = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"s",
|
||||
|
||||
@@ -33,7 +33,7 @@ return {
|
||||
|
||||
opts.sections.lualine_a = { { "mode", icon = "" } }
|
||||
opts.sections.lualine_c[4] = {
|
||||
require("lazyvim.util.lualine").pretty_path({
|
||||
LazyVim.lualine.pretty_path({
|
||||
filename_hl = "Bold",
|
||||
modified_hl = "MatchParen",
|
||||
directory_hl = "Conceal",
|
||||
|
||||
@@ -2,7 +2,16 @@ return {
|
||||
{
|
||||
"nvim-pack/nvim-spectre",
|
||||
cmd = "Spectre",
|
||||
opts = {},
|
||||
opts = {
|
||||
default = {
|
||||
find = {
|
||||
cmd = "rg",
|
||||
},
|
||||
replace = {
|
||||
cmd = "sd",
|
||||
},
|
||||
},
|
||||
},
|
||||
-- stylua: ignore
|
||||
keys = {
|
||||
{ "<leader>srg", function() require("spectre").toggle() end, desc = "Globally" },
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
local Util = require("lazyvim.util")
|
||||
local actions = require("telescope.actions")
|
||||
|
||||
return {
|
||||
@@ -8,39 +7,39 @@ return {
|
||||
keys = {
|
||||
{
|
||||
"<leader>ssa",
|
||||
Util.telescope("lsp_document_symbols", { symbols = { "Class", "Function", "Method", "Constructor", "Interface", "Module", "Struct", "Trait", "Field", "Property", "Enum", "Constant" } }),
|
||||
LazyVim.telescope("lsp_document_symbols", { symbols = { "Class", "Function", "Method", "Constructor", "Interface", "Module", "Struct", "Trait", "Field", "Property", "Enum", "Constant" } }),
|
||||
desc = "All",
|
||||
},
|
||||
{ "<leader>ssc", Util.telescope("lsp_document_symbols", { symbols = { "Class" } }), desc = "Class" },
|
||||
{ "<leader>ssf", Util.telescope("lsp_document_symbols", { symbols = { "Function" } }), desc = "Function" },
|
||||
{ "<leader>ssm", Util.telescope("lsp_document_symbols", { symbols = { "Method" } }), desc = "Method" },
|
||||
{ "<leader>ssC", Util.telescope("lsp_document_symbols", { symbols = { "Constructor" } }), desc = "Constructor" },
|
||||
{ "<leader>sse", Util.telescope("lsp_document_symbols", { symbols = { "Enum" } }), desc = "Enum" },
|
||||
{ "<leader>ssi", Util.telescope("lsp_document_symbols", { symbols = { "Interface" } }), desc = "Interface" },
|
||||
{ "<leader>ssM", Util.telescope("lsp_document_symbols", { symbols = { "Module" } }), desc = "Module" },
|
||||
{ "<leader>sss", Util.telescope("lsp_document_symbols", { symbols = { "Struct" } }), desc = "Struct" },
|
||||
{ "<leader>sst", Util.telescope("lsp_document_symbols", { symbols = { "Trait" } }), desc = "Trait" },
|
||||
{ "<leader>ssF", Util.telescope("lsp_document_symbols", { symbols = { "Field" } }), desc = "Field" },
|
||||
{ "<leader>ssp", Util.telescope("lsp_document_symbols", { symbols = { "Property" } }), desc = "Property" },
|
||||
{ "<leader>ssv", Util.telescope("lsp_document_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" },
|
||||
{ "<leader>ssc", LazyVim.telescope("lsp_document_symbols", { symbols = { "Class" } }), desc = "Class" },
|
||||
{ "<leader>ssf", LazyVim.telescope("lsp_document_symbols", { symbols = { "Function" } }), desc = "Function" },
|
||||
{ "<leader>ssm", LazyVim.telescope("lsp_document_symbols", { symbols = { "Method" } }), desc = "Method" },
|
||||
{ "<leader>ssC", LazyVim.telescope("lsp_document_symbols", { symbols = { "Constructor" } }), desc = "Constructor" },
|
||||
{ "<leader>sse", LazyVim.telescope("lsp_document_symbols", { symbols = { "Enum" } }), desc = "Enum" },
|
||||
{ "<leader>ssi", LazyVim.telescope("lsp_document_symbols", { symbols = { "Interface" } }), desc = "Interface" },
|
||||
{ "<leader>ssM", LazyVim.telescope("lsp_document_symbols", { symbols = { "Module" } }), desc = "Module" },
|
||||
{ "<leader>sss", LazyVim.telescope("lsp_document_symbols", { symbols = { "Struct" } }), desc = "Struct" },
|
||||
{ "<leader>sst", LazyVim.telescope("lsp_document_symbols", { symbols = { "Trait" } }), desc = "Trait" },
|
||||
{ "<leader>ssF", LazyVim.telescope("lsp_document_symbols", { symbols = { "Field" } }), desc = "Field" },
|
||||
{ "<leader>ssp", LazyVim.telescope("lsp_document_symbols", { symbols = { "Property" } }), desc = "Property" },
|
||||
{ "<leader>ssv", LazyVim.telescope("lsp_document_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" },
|
||||
{
|
||||
"<leader>sSa",
|
||||
Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class", "Function", "Method", "Constructor", "Interface", "Module", "Struct", "Trait", "Field", "Property", "Enum", "Constant" } }),
|
||||
LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class", "Function", "Method", "Constructor", "Interface", "Module", "Struct", "Trait", "Field", "Property", "Enum", "Constant" } }),
|
||||
desc = "All",
|
||||
},
|
||||
{ "<leader>sSc", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class" } }), desc = "Class" },
|
||||
{ "<leader>sSf", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Function" } }), desc = "Function" },
|
||||
{ "<leader>sSm", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Method" } }), desc = "Method" },
|
||||
{ "<leader>sSC", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Constructor" } }), desc = "Constructor" },
|
||||
{ "<leader>sSe", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Enum" } }), desc = "Enum" },
|
||||
{ "<leader>sSi", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Interface" } }), desc = "Interface" },
|
||||
{ "<leader>sSM", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Module" } }), desc = "Module" },
|
||||
{ "<leader>sSs", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Struct" } }), desc = "Struct" },
|
||||
{ "<leader>sSt", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Trait" } }), desc = "Trait" },
|
||||
{ "<leader>sSF", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Field" } }), desc = "Field" },
|
||||
{ "<leader>sSp", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Property" } }), desc = "Property" },
|
||||
{ "<leader>sSv", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" },
|
||||
{ "<leader>sA", Util.telescope("treesitter"), desc = "Treesitter Symbols" },
|
||||
{ "<leader>sSc", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class" } }), desc = "Class" },
|
||||
{ "<leader>sSf", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Function" } }), desc = "Function" },
|
||||
{ "<leader>sSm", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Method" } }), desc = "Method" },
|
||||
{ "<leader>sSC", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Constructor" } }), desc = "Constructor" },
|
||||
{ "<leader>sSe", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Enum" } }), desc = "Enum" },
|
||||
{ "<leader>sSi", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Interface" } }), desc = "Interface" },
|
||||
{ "<leader>sSM", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Module" } }), desc = "Module" },
|
||||
{ "<leader>sSs", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Struct" } }), desc = "Struct" },
|
||||
{ "<leader>sSt", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Trait" } }), desc = "Trait" },
|
||||
{ "<leader>sSF", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Field" } }), desc = "Field" },
|
||||
{ "<leader>sSp", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Property" } }), desc = "Property" },
|
||||
{ "<leader>sSv", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" },
|
||||
{ "<leader>sA", LazyVim.telescope("treesitter"), desc = "Treesitter Symbols" },
|
||||
{ "<leader>gf", "<cmd>Telescope git_bcommits<cr>", desc = "File History" },
|
||||
{ "<leader>gS", "<cmd>Telescope git_stash<cr>", desc = "stash" },
|
||||
{ "<leader>gb", "<cmd>Telescope git_branches<cr>", desc = "branches" },
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
local Util = require("lazyvim.util")
|
||||
local executeCommandIfExists = function(command)
|
||||
if vim.fn.exists(command) ~= 0 then
|
||||
vim.cmd(command)
|
||||
@@ -18,7 +17,7 @@ return {
|
||||
executeCommandIfExists(":LspLensOff")
|
||||
executeCommandIfExists(":NvimContextVtDisable")
|
||||
executeCommandIfExists(":IBLDisable")
|
||||
Util.toggle.inlay_hints()
|
||||
LazyVim.toggle.inlay_hints()
|
||||
executeCommandIfExists(":Gitsigns toggle_current_line_blame")
|
||||
executeCommandIfExists(":CccHighlighterDisable")
|
||||
end,
|
||||
@@ -29,7 +28,7 @@ return {
|
||||
executeCommandIfExists(":LspLensOn")
|
||||
executeCommandIfExists(":NvimContextVtEnable")
|
||||
executeCommandIfExists(":IBLEnable")
|
||||
Util.toggle.inlay_hints()
|
||||
LazyVim.toggle.inlay_hints()
|
||||
executeCommandIfExists(":Gitsigns toggle_current_line_blame")
|
||||
executeCommandIfExists(":CccHighlighterEnable")
|
||||
end,
|
||||
|
||||
Reference in new issue
Block a user