feat: basic config on search and minor styling
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
"blueprints": { "branch": "main", "commit": "e5825c30464f98e77e8b5ffb88d59fd98df6c802" },
|
"blueprints": { "branch": "main", "commit": "e5825c30464f98e77e8b5ffb88d59fd98df6c802" },
|
||||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
|
"conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
|
||||||
|
"ctrlsf.vim": { "branch": "master", "commit": "50186c529c881b7844bcd66c7b8e9826eb8990a4" },
|
||||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
|
"gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
|
||||||
@@ -17,6 +18,7 @@
|
|||||||
"no-neck-pain.nvim": { "branch": "main", "commit": "0463fbb77bcab4cc9716ba1e87255bbe4d002de7" },
|
"no-neck-pain.nvim": { "branch": "main", "commit": "0463fbb77bcab4cc9716ba1e87255bbe4d002de7" },
|
||||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||||
|
"nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||||
"nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
|
"nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
|
||||||
@@ -32,5 +34,6 @@
|
|||||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||||
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
|
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
|
||||||
|
"windline.nvim": { "branch": "master", "commit": "1630ab15aa3349f1ad32ef78d5cff632ae74625d" }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ map("n", "<S-l>", "<cmd>BufferLineMoveNext<cr>", { desc = "Move buffer to right"
|
|||||||
map("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev Buffer" })
|
map("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev Buffer" })
|
||||||
map("n", "]b", "<cmd>bnext<cr>", { desc = "Next Buffer" })
|
map("n", "]b", "<cmd>bnext<cr>", { desc = "Next Buffer" })
|
||||||
map("n", "<leader>bd", function()
|
map("n", "<leader>bd", function()
|
||||||
Snacks.bufdelete()
|
Snacks.bufdelete()
|
||||||
end, { desc = "Delete Buffer" })
|
end, { desc = "Delete Buffer" })
|
||||||
map("n", "<leader>x", function()
|
map("n", "<leader>x", function()
|
||||||
Snacks.bufdelete()
|
Snacks.bufdelete()
|
||||||
end, { desc = "Delete Buffer" })
|
end, { desc = "Delete Buffer" })
|
||||||
|
|
||||||
-- tabpages
|
-- tabpages
|
||||||
@@ -34,7 +34,18 @@ map("n", "<leader>nt", "<cmd>:tabnew<cr>", { desc = "Create new tabpage" })
|
|||||||
map("n", "<leader>tc", "<cmd>TSContextToggle<CR>", { desc = "Toggle treesitter context" })
|
map("n", "<leader>tc", "<cmd>TSContextToggle<CR>", { desc = "Toggle treesitter context" })
|
||||||
|
|
||||||
-- Regex search and replace
|
-- Regex search and replace
|
||||||
map("n", "<leader>fs", "<cmd>GrugFar<CR>", { desc = "Search all with replace option" })
|
map("n", "<leader>S", '<cmd>lua require("spectre").toggle()<CR>', {
|
||||||
|
desc = "Toggle Spectre",
|
||||||
|
})
|
||||||
|
map("n", "<leader>sw", '<cmd>lua require("spectre").open_visual({select_word=true})<CR>', {
|
||||||
|
desc = "Search current word",
|
||||||
|
})
|
||||||
|
map("v", "<leader>sw", '<esc><cmd>lua require("spectre").open_visual()<CR>', {
|
||||||
|
desc = "Search current word",
|
||||||
|
})
|
||||||
|
map("n", "<leader>sp", '<cmd>lua require("spectre").open_file_search({select_word=true})<CR>', {
|
||||||
|
desc = "Search on current file",
|
||||||
|
})
|
||||||
|
|
||||||
-- Blueprints
|
-- Blueprints
|
||||||
map("n", "<leader>ct", "<cmd>lua require('blueprints').createFromTemplateTelescope()<CR>", { desc = "Nvim blueprints" })
|
map("n", "<leader>ct", "<cmd>lua require('blueprints').createFromTemplateTelescope()<CR>", { desc = "Nvim blueprints" })
|
||||||
@@ -52,28 +63,28 @@ map("n", "<leader>gs", "<cmd>Telescope git_status <CR>", { desc = "Git status" }
|
|||||||
|
|
||||||
-- lazygit
|
-- lazygit
|
||||||
map("n", "<leader>gg", function()
|
map("n", "<leader>gg", function()
|
||||||
Snacks.lazygit({ cwd = LazyVim.root.git() })
|
Snacks.lazygit({ cwd = LazyVim.root.git() })
|
||||||
end, { desc = "Lazygit (Root Dir)" })
|
end, { desc = "Lazygit (Root Dir)" })
|
||||||
map("n", "<leader>gG", function()
|
map("n", "<leader>gG", function()
|
||||||
Snacks.lazygit()
|
Snacks.lazygit()
|
||||||
end, { desc = "Lazygit (cwd)" })
|
end, { desc = "Lazygit (cwd)" })
|
||||||
map("n", "<leader>gb", function()
|
map("n", "<leader>gb", function()
|
||||||
Snacks.lazygit.blame_line()
|
Snacks.lazygit.blame_line()
|
||||||
end, { desc = "Git Blame Line" })
|
end, { desc = "Git Blame Line" })
|
||||||
map("n", "<leader>gB", function()
|
map("n", "<leader>gB", function()
|
||||||
Snacks.lazygit.browse()
|
Snacks.lazygit.browse()
|
||||||
end, { desc = "Git Browse" })
|
end, { desc = "Git Browse" })
|
||||||
|
|
||||||
map("n", "<leader>gf", function()
|
map("n", "<leader>gf", function()
|
||||||
local git_path = vim.api.nvim_buf_get_name(0)
|
local git_path = vim.api.nvim_buf_get_name(0)
|
||||||
Snacks.lazygit({ args = { "-f", vim.trim(git_path) } })
|
Snacks.lazygit({ args = { "-f", vim.trim(git_path) } })
|
||||||
end, { desc = "Lazygit Current File History" })
|
end, { desc = "Lazygit Current File History" })
|
||||||
|
|
||||||
map("n", "<leader>gl", function()
|
map("n", "<leader>gl", function()
|
||||||
Snacks.lazygit({ args = { "log" }, cwd = LazyVim.root.git() })
|
Snacks.lazygit({ args = { "log" }, cwd = LazyVim.root.git() })
|
||||||
end, { desc = "Lazygit Log" })
|
end, { desc = "Lazygit Log" })
|
||||||
map("n", "<leader>gL", function()
|
map("n", "<leader>gL", function()
|
||||||
Snacks.lazygit({ args = { "log" } })
|
Snacks.lazygit({ args = { "log" } })
|
||||||
end, { desc = "Lazygit Log (cwd)" })
|
end, { desc = "Lazygit Log (cwd)" })
|
||||||
|
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
@@ -84,74 +95,74 @@ map("n", "<leader>e", "<cmd>Neotree focus<cr>", { desc = "Focus neotree" })
|
|||||||
|
|
||||||
-- LSP
|
-- LSP
|
||||||
map("n", "gD", function()
|
map("n", "gD", function()
|
||||||
vim.lsp.buf.declaration()
|
vim.lsp.buf.declaration()
|
||||||
end, { desc = "LSP declaration" })
|
end, { desc = "LSP declaration" })
|
||||||
map("n", "gd", function()
|
map("n", "gd", function()
|
||||||
vim.lsp.buf.definition()
|
vim.lsp.buf.definition()
|
||||||
end, { desc = "LSP definition" })
|
end, { desc = "LSP definition" })
|
||||||
map("n", "gr", function()
|
map("n", "gr", function()
|
||||||
vim.lsp.buf.references()
|
vim.lsp.buf.references()
|
||||||
end, { desc = "LSP references" })
|
end, { desc = "LSP references" })
|
||||||
map("n", "K", function()
|
map("n", "K", function()
|
||||||
vim.lsp.buf.hover()
|
vim.lsp.buf.hover()
|
||||||
end, { desc = "LSP hover" })
|
end, { desc = "LSP hover" })
|
||||||
map("n", "gi", function()
|
map("n", "gi", function()
|
||||||
vim.lsp.buf.implementation()
|
vim.lsp.buf.implementation()
|
||||||
end, { desc = "LSP implementation" })
|
end, { desc = "LSP implementation" })
|
||||||
map("n", "<leader>ls", function()
|
map("n", "<leader>ls", function()
|
||||||
vim.lsp.buf.signature_help()
|
vim.lsp.buf.signature_help()
|
||||||
end, { desc = "LSP signature help" })
|
end, { desc = "LSP signature help" })
|
||||||
map("n", "<leader>lf", function()
|
map("n", "<leader>lf", function()
|
||||||
vim.diagnostic.open_float({ border = "rounded" })
|
vim.diagnostic.open_float({ border = "rounded" })
|
||||||
end, { desc = "Floating diagnostics" })
|
end, { desc = "Floating diagnostics" })
|
||||||
map("n", "<leader>D", function()
|
map("n", "<leader>D", function()
|
||||||
vim.lsp.buf.type_definition()
|
vim.lsp.buf.type_definition()
|
||||||
end, { desc = "LSP type definition" })
|
end, { desc = "LSP type definition" })
|
||||||
map("n", "<leader>ca", function()
|
map("n", "<leader>ca", function()
|
||||||
vim.lsp.buf.code_action()
|
vim.lsp.buf.code_action()
|
||||||
end, { desc = "LSP code actions" })
|
end, { desc = "LSP code actions" })
|
||||||
map("n", "[d", function()
|
map("n", "[d", function()
|
||||||
vim.diagnostic.goto_prev({ float = { border = "rounded" } })
|
vim.diagnostic.goto_prev({ float = { border = "rounded" } })
|
||||||
end, { desc = "Goto prev diagnostic" })
|
end, { desc = "Goto prev diagnostic" })
|
||||||
map("n", "]d", function()
|
map("n", "]d", function()
|
||||||
vim.diagnostic.goto_next({ float = { border = "rounded" } })
|
vim.diagnostic.goto_next({ float = { border = "rounded" } })
|
||||||
end, { desc = "Goto next diagnostic" })
|
end, { desc = "Goto next diagnostic" })
|
||||||
map("v", "<leader>ca", function()
|
map("v", "<leader>ca", function()
|
||||||
vim.lsp.buf.code_action()
|
vim.lsp.buf.code_action()
|
||||||
end, { desc = "LSP code action" })
|
end, { desc = "LSP code action" })
|
||||||
map("n", "<leader>r", function()
|
map("n", "<leader>r", function()
|
||||||
-- when rename opens the prompt, this autocommand will trigger
|
-- when rename opens the prompt, this autocommand will trigger
|
||||||
-- it will "press" CTRL-F to enter the command-line window `:h cmdwin`
|
-- it will "press" CTRL-F to enter the command-line window `:h cmdwin`
|
||||||
-- in this window I can use normal mode keybindings
|
-- in this window I can use normal mode keybindings
|
||||||
local cmdId
|
local cmdId
|
||||||
cmdId = vim.api.nvim_create_autocmd({ "CmdlineEnter" }, {
|
cmdId = vim.api.nvim_create_autocmd({ "CmdlineEnter" }, {
|
||||||
callback = function()
|
callback = function()
|
||||||
local key = vim.api.nvim_replace_termcodes("<C-f>", true, false, true)
|
local key = vim.api.nvim_replace_termcodes("<C-f>", true, false, true)
|
||||||
vim.api.nvim_feedkeys(key, "c", false)
|
vim.api.nvim_feedkeys(key, "c", false)
|
||||||
vim.api.nvim_feedkeys("0", "n", false)
|
vim.api.nvim_feedkeys("0", "n", false)
|
||||||
-- autocmd was triggered and so we can remove the ID and return true to delete the autocmd
|
-- autocmd was triggered and so we can remove the ID and return true to delete the autocmd
|
||||||
cmdId = nil
|
cmdId = nil
|
||||||
return true
|
return true
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
vim.lsp.buf.rename()
|
vim.lsp.buf.rename()
|
||||||
-- if LPS couldn't trigger rename on the symbol, clear the autocmd
|
-- if LPS couldn't trigger rename on the symbol, clear the autocmd
|
||||||
vim.defer_fn(function()
|
vim.defer_fn(function()
|
||||||
-- the cmdId is not nil only if the LSP failed to rename
|
-- the cmdId is not nil only if the LSP failed to rename
|
||||||
if cmdId then
|
if cmdId then
|
||||||
vim.api.nvim_del_autocmd(cmdId)
|
vim.api.nvim_del_autocmd(cmdId)
|
||||||
end
|
end
|
||||||
end, 500)
|
end, 500)
|
||||||
end, { desc = "Rename symbol" })
|
end, { desc = "Rename symbol" })
|
||||||
|
|
||||||
map("n", "<leader>wa", function()
|
map("n", "<leader>wa", function()
|
||||||
vim.lsp.buf.add_workspace_folder()
|
vim.lsp.buf.add_workspace_folder()
|
||||||
end, { desc = "Add workspace folder" })
|
end, { desc = "Add workspace folder" })
|
||||||
map("n", "<leader>wr", function()
|
map("n", "<leader>wr", function()
|
||||||
vim.lsp.buf.remove_workspace_folder()
|
vim.lsp.buf.remove_workspace_folder()
|
||||||
end, { desc = "Remove workspace folder" })
|
end, { desc = "Remove workspace folder" })
|
||||||
map("n", "<leader>wl", function()
|
map("n", "<leader>wl", function()
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||||
end, { desc = "List workspace folders" })
|
end, { desc = "List workspace folders" })
|
||||||
|
|
||||||
---- Debugging with dap ----
|
---- Debugging with dap ----
|
||||||
@@ -203,10 +214,10 @@ map({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and Clear hlsea
|
|||||||
-- Clear search, diff update and redraw
|
-- Clear search, diff update and redraw
|
||||||
-- taken from runtime/lua/_editor.lua
|
-- taken from runtime/lua/_editor.lua
|
||||||
map(
|
map(
|
||||||
"n",
|
"n",
|
||||||
"<leader>ur",
|
"<leader>ur",
|
||||||
"<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
|
"<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
|
||||||
{ desc = "Redraw / Clear hlsearch / Diff Update" }
|
{ desc = "Redraw / Clear hlsearch / Diff Update" }
|
||||||
)
|
)
|
||||||
|
|
||||||
-- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n
|
-- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n
|
||||||
@@ -237,16 +248,16 @@ map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" })
|
|||||||
|
|
||||||
-- formatting
|
-- formatting
|
||||||
map({ "n", "v" }, "<leader>cf", function()
|
map({ "n", "v" }, "<leader>cf", function()
|
||||||
require("conform").format()
|
require("conform").format()
|
||||||
end, { desc = "Format" })
|
end, { desc = "Format" })
|
||||||
|
|
||||||
-- diagnostic
|
-- diagnostic
|
||||||
local diagnostic_goto = function(next, severity)
|
local diagnostic_goto = function(next, severity)
|
||||||
local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev
|
local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev
|
||||||
severity = severity and vim.diagnostic.severity[severity] or nil
|
severity = severity and vim.diagnostic.severity[severity] or nil
|
||||||
return function()
|
return function()
|
||||||
go({ severity = severity })
|
go({ severity = severity })
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
map("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
|
map("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
|
||||||
map("n", "]d", diagnostic_goto(true), { desc = "Next Diagnostic" })
|
map("n", "]d", diagnostic_goto(true), { desc = "Next Diagnostic" })
|
||||||
@@ -259,44 +270,44 @@ map("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })
|
|||||||
---- Toggle options ----
|
---- Toggle options ----
|
||||||
|
|
||||||
map("n", "<leader>uf", function()
|
map("n", "<leader>uf", function()
|
||||||
LazyVim.format.toggle()
|
LazyVim.format.toggle()
|
||||||
end, { desc = "Toggle Auto Format (Global)" })
|
end, { desc = "Toggle Auto Format (Global)" })
|
||||||
map("n", "<leader>uF", function()
|
map("n", "<leader>uF", function()
|
||||||
LazyVim.format.toggle(true)
|
LazyVim.format.toggle(true)
|
||||||
end, { desc = "Toggle Auto Format (Buffer)" })
|
end, { desc = "Toggle Auto Format (Buffer)" })
|
||||||
map("n", "<leader>us", function()
|
map("n", "<leader>us", function()
|
||||||
LazyVim.toggle("spell")
|
LazyVim.toggle("spell")
|
||||||
end, { desc = "Toggle Spelling" })
|
end, { desc = "Toggle Spelling" })
|
||||||
map("n", "<leader>uw", function()
|
map("n", "<leader>uw", function()
|
||||||
LazyVim.toggle("wrap")
|
LazyVim.toggle("wrap")
|
||||||
end, { desc = "Toggle Word Wrap" })
|
end, { desc = "Toggle Word Wrap" })
|
||||||
map("n", "<leader>uL", function()
|
map("n", "<leader>uL", function()
|
||||||
LazyVim.toggle("relativenumber")
|
LazyVim.toggle("relativenumber")
|
||||||
end, { desc = "Toggle Relative Line Numbers" })
|
end, { desc = "Toggle Relative Line Numbers" })
|
||||||
map("n", "<leader>ul", function()
|
map("n", "<leader>ul", function()
|
||||||
LazyVim.toggle.number()
|
LazyVim.toggle.number()
|
||||||
end, { desc = "Toggle Line Numbers" })
|
end, { desc = "Toggle Line Numbers" })
|
||||||
map("n", "<leader>ud", function()
|
map("n", "<leader>ud", function()
|
||||||
LazyVim.toggle.diagnostics()
|
LazyVim.toggle.diagnostics()
|
||||||
end, { desc = "Toggle Diagnostics" })
|
end, { desc = "Toggle Diagnostics" })
|
||||||
local conceallevel = vim.o.conceallevel > 0 and vim.o.conceallevel or 3
|
local conceallevel = vim.o.conceallevel > 0 and vim.o.conceallevel or 3
|
||||||
map("n", "<leader>uc", function()
|
map("n", "<leader>uc", function()
|
||||||
LazyVim.toggle("conceallevel", false, { 0, conceallevel })
|
LazyVim.toggle("conceallevel", false, { 0, conceallevel })
|
||||||
end, { desc = "Toggle Conceal" })
|
end, { desc = "Toggle Conceal" })
|
||||||
if vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint then
|
if vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint then
|
||||||
map("n", "<leader>uh", function()
|
map("n", "<leader>uh", function()
|
||||||
LazyVim.toggle.inlay_hints()
|
LazyVim.toggle.inlay_hints()
|
||||||
end, { desc = "Toggle Inlay Hints" })
|
end, { desc = "Toggle Inlay Hints" })
|
||||||
end
|
end
|
||||||
map("n", "<leader>uT", function()
|
map("n", "<leader>uT", function()
|
||||||
if vim.b.ts_highlight then
|
if vim.b.ts_highlight then
|
||||||
vim.treesitter.stop()
|
vim.treesitter.stop()
|
||||||
else
|
else
|
||||||
vim.treesitter.start()
|
vim.treesitter.start()
|
||||||
end
|
end
|
||||||
end, { desc = "Toggle Treesitter Highlight" })
|
end, { desc = "Toggle Treesitter Highlight" })
|
||||||
map("n", "<leader>ub", function()
|
map("n", "<leader>ub", function()
|
||||||
LazyVim.toggle("background", false, { "light", "dark" })
|
LazyVim.toggle("background", false, { "light", "dark" })
|
||||||
end, { desc = "Toggle Background" })
|
end, { desc = "Toggle Background" })
|
||||||
-- aerial
|
-- aerial
|
||||||
map("n", "<leader>ua", "<cmd>AerialToggle<cr>", { desc = "Toggle aerial view" })
|
map("n", "<leader>ua", "<cmd>AerialToggle<cr>", { desc = "Toggle aerial view" })
|
||||||
@@ -331,7 +342,7 @@ map("n", "<leader>w|", "<C-W>v", { desc = "Split Window Right", remap = true })
|
|||||||
map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
|
map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
|
||||||
map("n", "<leader>|", "<C-W>v", { desc = "Split Window Right", remap = true })
|
map("n", "<leader>|", "<C-W>v", { desc = "Split Window Right", remap = true })
|
||||||
map("n", "<leader>wm", function()
|
map("n", "<leader>wm", function()
|
||||||
LazyVim.toggle.maximize()
|
LazyVim.toggle.maximize()
|
||||||
end, { desc = "Maximize Toggle" })
|
end, { desc = "Maximize Toggle" })
|
||||||
|
|
||||||
-- Move to window using the <ctrl> hjkl keys
|
-- Move to window using the <ctrl> hjkl keys
|
||||||
|
|||||||
@@ -2,73 +2,73 @@
|
|||||||
-- │ Context │
|
-- │ Context │
|
||||||
-- ╰─────────╯
|
-- ╰─────────╯
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"akinsho/bufferline.nvim",
|
"akinsho/bufferline.nvim",
|
||||||
version = "*",
|
version = "*",
|
||||||
dependencies = "nvim-tree/nvim-web-devicons",
|
dependencies = "nvim-tree/nvim-web-devicons",
|
||||||
opts = function()
|
opts = function()
|
||||||
return require("plugins.opts.bufferline")
|
return require("plugins.opts.bufferline")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"nvim-lualine/lualine.nvim",
|
"nvim-lualine/lualine.nvim",
|
||||||
event = "VeryLazy",
|
event = "VeryLazy",
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||||
opts = function()
|
opts = function()
|
||||||
return require("plugins.opts.lualine")
|
return require("plugins.opts.lualine")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"nvim-neo-tree/neo-tree.nvim",
|
"nvim-neo-tree/neo-tree.nvim",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"nvim-tree/nvim-web-devicons",
|
"nvim-tree/nvim-web-devicons",
|
||||||
"MunifTanjim/nui.nvim",
|
"MunifTanjim/nui.nvim",
|
||||||
{
|
{
|
||||||
"s1n7ax/nvim-window-picker",
|
"s1n7ax/nvim-window-picker",
|
||||||
version = "2.*",
|
version = "2.*",
|
||||||
config = function()
|
config = function()
|
||||||
require("window-picker").setup({
|
require("window-picker").setup({
|
||||||
filter_rules = {
|
filter_rules = {
|
||||||
include_current_win = false,
|
include_current_win = false,
|
||||||
autoselect_one = true,
|
autoselect_one = true,
|
||||||
bo = {
|
bo = {
|
||||||
filetype = { "neo-tree", "neo-tree-popup", "notify" },
|
filetype = { "neo-tree", "neo-tree-popup", "notify" },
|
||||||
buftype = { "terminal", "quickfix" },
|
buftype = { "terminal", "quickfix" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
opts = function()
|
opts = function()
|
||||||
return require("plugins.opts.neotree")
|
return require("plugins.opts.neotree")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"stevearc/aerial.nvim",
|
"stevearc/aerial.nvim",
|
||||||
opts = {},
|
opts = {},
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
"nvim-tree/nvim-web-devicons",
|
"nvim-tree/nvim-web-devicons",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"lukas-reineke/indent-blankline.nvim",
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
main = "ibl",
|
main = "ibl",
|
||||||
opts = {},
|
opts = {},
|
||||||
init = function()
|
init = function()
|
||||||
require("ibl").setup({
|
require("ibl").setup({
|
||||||
whitespace = {
|
whitespace = {
|
||||||
highlight = { "Whitespace", "NonText" },
|
highlight = { "Whitespace", "NonText" },
|
||||||
remove_blankline_trail = true,
|
remove_blankline_trail = true,
|
||||||
},
|
},
|
||||||
scope = { exclude = { language = { "lua", "css" } } },
|
scope = { exclude = { language = { "lua", "css" } } },
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,51 +1,51 @@
|
|||||||
local config = {
|
local config = {
|
||||||
signs = {
|
signs = {
|
||||||
add = { text = '┃' },
|
add = { text = "┃" },
|
||||||
change = { text = '┃' },
|
change = { text = "┃" },
|
||||||
delete = { text = '_' },
|
delete = { text = "_" },
|
||||||
topdelete = { text = '‾' },
|
topdelete = { text = "‾" },
|
||||||
changedelete = { text = '~' },
|
changedelete = { text = "~" },
|
||||||
untracked = { text = '┆' },
|
untracked = { text = "┆" },
|
||||||
},
|
},
|
||||||
signs_staged = {
|
signs_staged = {
|
||||||
add = { text = '┃' },
|
add = { text = "┃" },
|
||||||
change = { text = '┃' },
|
change = { text = "┃" },
|
||||||
delete = { text = '_' },
|
delete = { text = "_" },
|
||||||
topdelete = { text = '‾' },
|
topdelete = { text = "‾" },
|
||||||
changedelete = { text = '~' },
|
changedelete = { text = "~" },
|
||||||
untracked = { text = '┆' },
|
untracked = { text = "┆" },
|
||||||
},
|
},
|
||||||
signs_staged_enable = true,
|
signs_staged_enable = true,
|
||||||
signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
|
signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
|
||||||
numhl = true, -- Toggle with `:Gitsigns toggle_numhl`
|
numhl = true, -- Toggle with `:Gitsigns toggle_numhl`
|
||||||
linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
|
linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
|
||||||
word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
|
word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
|
||||||
watch_gitdir = {
|
watch_gitdir = {
|
||||||
follow_files = true,
|
follow_files = true,
|
||||||
},
|
},
|
||||||
auto_attach = true,
|
auto_attach = true,
|
||||||
attach_to_untracked = false,
|
attach_to_untracked = false,
|
||||||
current_line_blame = true, -- Toggle with `:Gitsigns toggle_current_line_blame`
|
current_line_blame = true, -- Toggle with `:Gitsigns toggle_current_line_blame`
|
||||||
current_line_blame_opts = {
|
current_line_blame_opts = {
|
||||||
virt_text = true,
|
virt_text = true,
|
||||||
virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
|
virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
|
||||||
delay = 500,
|
delay = 500,
|
||||||
ignore_whitespace = false,
|
ignore_whitespace = false,
|
||||||
virt_text_priority = 100,
|
virt_text_priority = 100,
|
||||||
},
|
},
|
||||||
current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
|
current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
|
||||||
sign_priority = 6,
|
sign_priority = 6,
|
||||||
update_debounce = 100,
|
update_debounce = 100,
|
||||||
status_formatter = nil, -- Use default
|
status_formatter = nil, -- Use default
|
||||||
max_file_length = 40000, -- Disable if file is longer than this (in lines)
|
max_file_length = 40000, -- Disable if file is longer than this (in lines)
|
||||||
preview_config = {
|
preview_config = {
|
||||||
-- Options passed to nvim_open_win
|
-- Options passed to nvim_open_win
|
||||||
border = "single",
|
border = "single",
|
||||||
style = "minimal",
|
style = "minimal",
|
||||||
relative = "cursor",
|
relative = "cursor",
|
||||||
row = 0,
|
row = 0,
|
||||||
col = 1,
|
col = 1,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
return config
|
return config
|
||||||
|
|||||||
@@ -2,31 +2,35 @@
|
|||||||
-- │ Telescope │
|
-- │ Telescope │
|
||||||
-- ╰───────────╯
|
-- ╰───────────╯
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
|
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
|
||||||
{
|
{
|
||||||
"isak102/telescope-git-file-history.nvim",
|
"isak102/telescope-git-file-history.nvim",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"tpope/vim-fugitive",
|
"tpope/vim-fugitive",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
cmd = "Telescope",
|
cmd = "Telescope",
|
||||||
opts = function()
|
opts = function()
|
||||||
return require("plugins.opts.telescope")
|
return require("plugins.opts.telescope")
|
||||||
end,
|
end,
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
local telescope = require("telescope")
|
local telescope = require("telescope")
|
||||||
telescope.setup(opts)
|
telescope.setup(opts)
|
||||||
|
|
||||||
-- load extensions
|
-- load extensions
|
||||||
for _, ext in ipairs(opts.extensions_list) do
|
for _, ext in ipairs(opts.extensions_list) do
|
||||||
telescope.load_extension(ext)
|
telescope.load_extension(ext)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
-- Multi buffer search
|
||||||
|
{
|
||||||
|
"nvim-pack/nvim-spectre",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user