Compare commits
7 Commits
92c9f02ab2
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| ffda7781b5 | |||
| 7c60569d7c | |||
| d0e1af9fa0 | |||
| fe5e852a48 | |||
| 8a6899a8fc | |||
| cdc850e8e8 | |||
| a7c14ff0ae |
9
init.lua
9
init.lua
@@ -25,7 +25,7 @@ vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,
|
|||||||
-- ╭─────────────╮
|
-- ╭─────────────╮
|
||||||
-- │ Colorscheme │
|
-- │ Colorscheme │
|
||||||
-- ╰─────────────╯
|
-- ╰─────────────╯
|
||||||
vim.cmd("colorscheme gruvbox") -- rose-pine, gruvbox
|
vim.cmd("colorscheme komau") -- rose-pine, gruvbox, koda-{dark/light/moss/glade}, komau
|
||||||
vim.o.background = "dark" -- "dark" or "light"
|
vim.o.background = "dark" -- "dark" or "light"
|
||||||
|
|
||||||
-- ╭───────────────────╮
|
-- ╭───────────────────╮
|
||||||
@@ -47,8 +47,13 @@ vim.opt.listchars = {
|
|||||||
trail = " ",
|
trail = " ",
|
||||||
nbsp = "+",
|
nbsp = "+",
|
||||||
}
|
}
|
||||||
|
|
||||||
vim.fn.sign_define("DiagnosticSignError", { text = " ", texthl = "DiagnosticSignError" })
|
vim.fn.sign_define("DiagnosticSignError", { text = " ", texthl = "DiagnosticSignError" })
|
||||||
vim.fn.sign_define("DiagnosticSignWarn", { text = " ", texthl = "DiagnosticSignWarn" })
|
vim.fn.sign_define("DiagnosticSignWarn", { text = " ", texthl = "DiagnosticSignWarn" })
|
||||||
vim.fn.sign_define("DiagnosticSignInfo", { text = " ", texthl = "DiagnosticSignInfo" })
|
vim.fn.sign_define("DiagnosticSignInfo", { text = " ", texthl = "DiagnosticSignInfo" })
|
||||||
vim.fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
|
vim.fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
|
||||||
|
|
||||||
|
-- ╭─────────────────────╮
|
||||||
|
-- │ IA initial disables │
|
||||||
|
-- ╰─────────────────────╯
|
||||||
|
vim.b.copilot_enabled = false
|
||||||
|
vim.g.copilot_enabled = false
|
||||||
|
|||||||
@@ -1,46 +1,45 @@
|
|||||||
{
|
{
|
||||||
"aerial.nvim": { "branch": "master", "commit": "2aeafd99937602fc40609ffffbdd2f99d77343e9" },
|
"aerial.nvim": { "branch": "master", "commit": "645d108a5242ec7b378cbe643eb6d04d4223f034" },
|
||||||
"autoclose.nvim": { "branch": "main", "commit": "3f86702b54a861a17d7994b2e32a7c648cb12fb1" },
|
"autoclose.nvim": { "branch": "main", "commit": "3f86702b54a861a17d7994b2e32a7c648cb12fb1" },
|
||||||
"avante.nvim": { "branch": "main", "commit": "d80b7966c0505809e83e408353bbe8cb3394936d" },
|
"blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
|
||||||
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
|
|
||||||
"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": "363243c03102a531a8203311d4f2ae704c620d9b" },
|
"codecompanion.nvim": { "branch": "main", "commit": "1913b5aa05745bca90d7912c76ed118f1744a620" },
|
||||||
"copilot.lua": { "branch": "master", "commit": "3faffefbd6ddeb52578535ec6b730e0b72d7fd1a" },
|
"conform.nvim": { "branch": "master", "commit": "40dcec5555f960b0a04340d76eabdf4efe78599d" },
|
||||||
|
"copilot.vim": { "branch": "release", "commit": "a12fd5672110c8aa7e3c8419e28c96943ca179be" },
|
||||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
"flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
|
||||||
"fzf-lua": { "branch": "main", "commit": "fb8c50ba62a0daa433b7ac2b78834f318322b879" },
|
"gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" },
|
"grug-far.nvim": { "branch": "main", "commit": "ac52ee2d87399dfd7b0d59d5b1d2bbaf2a4028f1" },
|
||||||
"gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
|
"gruvbox.nvim": { "branch": "main", "commit": "334d5fd49fc8033f26408425366c66c6390c57bb" },
|
||||||
"img-clip.nvim": { "branch": "main", "commit": "b6ddfb97b5600d99afe3452d707444afda658aca" },
|
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
|
"koda.nvim": { "branch": "main", "commit": "a560a332ccc1eb2caacb280a390213bb9f37b3cb" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
|
"komau.vim": { "branch": "master", "commit": "8817ec3fb91488d1687f3fe3f83e5e768c4daf8f" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
|
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||||
"mini.clue": { "branch": "main", "commit": "2d361459de6a5fd7ea20a14ee4b95c6caec383b9" },
|
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
|
||||||
"mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" },
|
"mini.clue": { "branch": "main", "commit": "8b748316c5a5ab24ab18ccd5db9d62fe86fdddee" },
|
||||||
"mini.pick": { "branch": "main", "commit": "4ad37ade984e69c43227b82ccdca5a92a22886de" },
|
"mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" },
|
||||||
"neo-tree.nvim": { "branch": "main", "commit": "521bb4253b1adc2a1ff6c584bc839eba9bc99c0b" },
|
"neo-tree.nvim": { "branch": "main", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" },
|
||||||
"no-neck-pain.nvim": { "branch": "main", "commit": "860462dd8b3d36861a81724a7b473db279f673f2" },
|
"no-neck-pain.nvim": { "branch": "main", "commit": "434fed70b1ee553f8f27e6da7b3899f71b3c6f99" },
|
||||||
"noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
|
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||||
"nvim-scrollbar": { "branch": "main", "commit": "5b103ef0fd2e8b9b4be3878ed38d224522192c6c" },
|
"nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "d34e62afd3e483fe0fa2f24b6323f3bb1d35ddcc" },
|
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||||
"nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
|
"nvim-treesitter-context": { "branch": "master", "commit": "529ee357b8c03d76ff71233afed68fd0f5fe10b1" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "37334adf4517fecfd97c0b44e1d4718e377e9e52" },
|
"nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" },
|
||||||
"nvim-window-picker": { "branch": "main", "commit": "0dfef64eaf063e1cd27983ab11a30e7bc5b74fac" },
|
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
|
||||||
"overseer.nvim": { "branch": "master", "commit": "36298eab791cca87ac3a228933413d094423400e" },
|
"overseer.nvim": { "branch": "master", "commit": "2802c15182dae2de71f9c82e918d7ba850b90c22" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
|
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||||
"render-markdown.nvim": { "branch": "main", "commit": "48b4175dbca8439d30c1f52231cbe5a712c8f9d9" },
|
"smear-cursor.nvim": { "branch": "main", "commit": "c85bdbb25db096fbcf616bc4e1357bd61fe2c199" },
|
||||||
"smear-cursor.nvim": { "branch": "main", "commit": "aff844fc1483fd673f721a41affcd7e2fcb885f5" },
|
"snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" },
|
||||||
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
|
"telescope-git-file-history.nvim": { "branch": "master", "commit": "4442114f9257e682e60a8cb6de14cf988e26055c" },
|
||||||
"telescope-git-file-history.nvim": { "branch": "master", "commit": "c27d99ba88ec5f0b6d2b9f9bc67dd3d14c610b25" },
|
"telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
|
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" },
|
"undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" },
|
||||||
"undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
|
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }
|
||||||
"vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,15 +2,16 @@ vim.g.mapleader = " "
|
|||||||
local map = vim.keymap.set
|
local map = vim.keymap.set
|
||||||
|
|
||||||
---- Bufferline ----
|
---- Bufferline ----
|
||||||
map("n", "bg", "<CMD>BufferLinePick<CR>")
|
-- Not used but maybe in the future
|
||||||
map("n", "<leader>bpx", "<CMD>BufferLinePickClose<CR>")
|
-- map("n", "bg", "<CMD>BufferLinePick<CR>")
|
||||||
|
-- map("n", "<leader>bpx", "<CMD>BufferLinePickClose<CR>")
|
||||||
map("n", "<leader>box", "<CMD>BufferLineCloseOthers<CR>")
|
map("n", "<leader>box", "<CMD>BufferLineCloseOthers<CR>")
|
||||||
map("n", "<Tab>", "<CMD>BufferLineCycleNext<CR>")
|
map("n", "<Tab>", "<CMD>BufferLineCycleNext<CR>")
|
||||||
map("n", "<S-Tab>", "<CMD>BufferLineCyclePrev<CR>")
|
map("n", "<S-Tab>", "<CMD>BufferLineCyclePrev<CR>")
|
||||||
map("n", "bsd", "<CMD>BufferLineSortByDirectory<CR>")
|
map("n", "<leader>bsd", "<CMD>BufferLineSortByDirectory<CR>")
|
||||||
map("n", "bse", "<CMD>BufferLineSortByExtension<CR>")
|
map("n", "<leader>bse", "<CMD>BufferLineSortByExtension<CR>")
|
||||||
map("n", "bsr", "<CMD>BufferLineSortByRelativeDirectory<CR>")
|
map("n", "<leader>bsr", "<CMD>BufferLineSortByRelativeDirectory<CR>")
|
||||||
map("n", "bst", "<CMD>BufferLineSortByTabs<CR>")
|
map("n", "<leader>bst", "<CMD>BufferLineSortByTabs<CR>")
|
||||||
-- buffers
|
-- buffers
|
||||||
map("n", "<S-h>", "<cmd>BufferLineMovePrev<cr>", { desc = "Move buffer to left" })
|
map("n", "<S-h>", "<cmd>BufferLineMovePrev<cr>", { desc = "Move buffer to left" })
|
||||||
map("n", "<S-l>", "<cmd>BufferLineMoveNext<cr>", { desc = "Move buffer to right" })
|
map("n", "<S-l>", "<cmd>BufferLineMoveNext<cr>", { desc = "Move buffer to right" })
|
||||||
@@ -31,63 +32,40 @@ map("n", "<leader>nt", "<cmd>:tabnew<cr>", { desc = "Create new tabpage" })
|
|||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
-- Treesitter context
|
-- Treesitter context
|
||||||
map("n", "<leader>tc", "<cmd>TSContextToggle<CR>", { desc = "Toggle treesitter context" })
|
map("n", "<leader>tc", "<cmd>TSContext toggle<CR>", { desc = "Toggle treesitter context" })
|
||||||
|
|
||||||
-- Regex search and replace
|
|
||||||
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" })
|
||||||
|
|
||||||
---- Git ----
|
---- Git ----
|
||||||
map("n", "<leader>gb", "<CMD>Gitsigns blame<CR>")
|
map("n", "<leader>gb", "<CMD>Gitsigns blame<CR>", { desc = "Git blame" })
|
||||||
map("n", "<leader>gd", "<CMD>DiffviewOpen<CR>")
|
map("n", "]g", "<CMD>Gitsigns next_hunk<CR>", { desc = "Git next change" })
|
||||||
map("n", "<leader>gx", "<CMD>DiffviewClose<CR>")
|
map("n", "[g", "<CMD>Gitsigns prev_hunk<CR>", { desc = "Git prev change" })
|
||||||
map("n", "K", "<CMD>Gitsigns blame_line<CR>")
|
map("n", "<leader>gdo", "<CMD>DiffviewOpen<CR>", { desc = "Git diff view open" })
|
||||||
map("n", "<leader>gh", "<CMD>Gitsigns preview_hunk_inline<CR>")
|
map("n", "<leader>gdx", "<CMD>DiffviewClose<CR>", { desc = "Git diff view close" })
|
||||||
map("n", "<leader>gtb", "<CMD>Gitsigns toggle_current_line_blame<CR>")
|
map("n", "<leader>gh", "<CMD>Gitsigns preview_hunk_inline<CR>", { desc = "Git preview hunk inline" })
|
||||||
map("n", "<leader>gtd", "<CMD>Gitsigns toggle_deleted")
|
map("n", "<leader>gtb", "<CMD>Gitsigns toggle_current_line_blame<CR>", { desc = "Git toggle line blame" })
|
||||||
map("n", "<leader>gc", "<cmd>Telescope git_commits <CR>", { desc = "Git commits" })
|
map("n", "<leader>gtd", "<CMD>Gitsigns toggle_deleted<CR>", { desc = "Git toggle deleted" })
|
||||||
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() })
|
|
||||||
end, { desc = "Lazygit (Root Dir)" })
|
|
||||||
map("n", "<leader>gG", function()
|
|
||||||
Snacks.lazygit()
|
Snacks.lazygit()
|
||||||
end, { desc = "Lazygit (cwd)" })
|
end, { desc = "Lazygit (Root Dir)" })
|
||||||
map("n", "<leader>gB", function()
|
|
||||||
Snacks.lazygit.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() })
|
|
||||||
end, { desc = "Lazygit Log" })
|
|
||||||
map("n", "<leader>gL", function()
|
|
||||||
Snacks.lazygit({ args = { "log" } })
|
Snacks.lazygit({ args = { "log" } })
|
||||||
end, { desc = "Lazygit Log (cwd)" })
|
end, { desc = "Lazygit Log (cwd)" })
|
||||||
|
map("n", "<leader>gs", function()
|
||||||
|
Snacks.lazygit({ args = { "status" } })
|
||||||
|
end, { desc = "Lazygit Log (cwd)" })
|
||||||
|
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
-- Neotree
|
-- Neotree
|
||||||
map("n", "<C-n>", "<cmd>Neotree toggle<cr>", { desc = "Toggle Neotree open" })
|
map("n", "<C-e>", "<cmd>Neotree toggle<cr>", { desc = "Toggle Neotree open" })
|
||||||
map("n", "<leader>e", "<cmd>Neotree focus<cr>", { desc = "Focus neotree" })
|
map("n", "<leader>e", "<cmd>Neotree focus<cr>", { desc = "Focus neotree" })
|
||||||
|
|
||||||
-- LSP
|
-- LSP
|
||||||
@@ -97,6 +75,9 @@ 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", "gT", function()
|
||||||
|
vim.lsp.buf.type_definition()
|
||||||
|
end, { desc = "LSP type 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" })
|
||||||
@@ -112,9 +93,6 @@ 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()
|
|
||||||
vim.lsp.buf.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" })
|
||||||
@@ -130,20 +108,16 @@ end, { desc = "LSP code action" })
|
|||||||
map("n", "<leader>r", function()
|
map("n", "<leader>r", function()
|
||||||
vim.lsp.buf.rename()
|
vim.lsp.buf.rename()
|
||||||
end, { desc = "LSP rename" })
|
end, { desc = "LSP rename" })
|
||||||
map("n", "<leader>wa", function()
|
-- LSP workspace folders (not used at the moment)
|
||||||
vim.lsp.buf.add_workspace_folder()
|
-- map("n", "<leader>wa", function()
|
||||||
end, { desc = "Add workspace folder" })
|
-- vim.lsp.buf.add_workspace_folder()
|
||||||
map("n", "<leader>wr", function()
|
-- end, { desc = "Add workspace folder" })
|
||||||
vim.lsp.buf.remove_workspace_folder()
|
-- map("n", "<leader>wr", function()
|
||||||
end, { desc = "Remove workspace folder" })
|
-- vim.lsp.buf.remove_workspace_folder()
|
||||||
map("n", "<leader>wl", function()
|
-- end, { desc = "Remove workspace folder" })
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
-- map("n", "<leader>wl", function()
|
||||||
end, { desc = "List workspace folders" })
|
-- print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||||
|
-- end, { desc = "List workspace folders" })
|
||||||
---- Debugging with dap ----
|
|
||||||
map("n", "<Leader>cdt", ":DapToggleBreakpoint<CR>")
|
|
||||||
map("n", "<Leader>cdx", ":DapTerminate<CR>")
|
|
||||||
map("n", "<Leader>cdo", ":DapStepOver<CR>")
|
|
||||||
|
|
||||||
---- Completion ----
|
---- Completion ----
|
||||||
-- map({ "i", "s" }, "<Tab>", function()
|
-- map({ "i", "s" }, "<Tab>", function()
|
||||||
@@ -161,10 +135,14 @@ map("n", "<leader>ff", "<cmd> Telescope find_files <CR>", { desc = "Find files"
|
|||||||
map("n", "<leader>fa", "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", { desc = "Find all" })
|
map("n", "<leader>fa", "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", { desc = "Find all" })
|
||||||
map("n", "<leader>fw", "<cmd> Telescope live_grep <CR>", { desc = "Live grep" })
|
map("n", "<leader>fw", "<cmd> Telescope live_grep <CR>", { desc = "Live grep" })
|
||||||
map("n", "<leader>fb", "<cmd> Telescope buffers <CR>", { desc = "Find buffers" })
|
map("n", "<leader>fb", "<cmd> Telescope buffers <CR>", { desc = "Find buffers" })
|
||||||
map("n", "<leader><leader>", "<cmd> Telescope buffers <CR>", { desc = "Find buffers" })
|
map("n", "<leader><leader>", "<cmd> Telescope current_buffer_fuzzy_find <CR>", { desc = "Find in current buffer" })
|
||||||
map("n", "<leader>fh", "<cmd> Telescope help_tags <CR>", { desc = "Help page" })
|
map("n", "<leader>fh", "<cmd> Telescope help_tags <CR>", { desc = "Help page" })
|
||||||
map("n", "<leader>fo", "<cmd> Telescope oldfiles <CR>", { desc = "Fild old files" })
|
map("n", "<leader>fo", "<cmd> Telescope oldfiles <CR>", { desc = "Fild old files" })
|
||||||
map("n", "<leader>fz", "<cmd> Telescope current_buffer_fuzzy_find <CR>", { desc = "Find in current buffer" })
|
map("n", "<leader>fz", "<cmd> Telescope current_buffer_fuzzy_find <CR>", { desc = "Find in current buffer" })
|
||||||
|
map("n", "<C-/>", "<cmd> Telescope current_buffer_fuzzy_find <CR>", { desc = "Find in current buffer" })
|
||||||
|
|
||||||
|
---- Replace ----
|
||||||
|
map("n", "<leader>/", "<cmd> GrugFar <CR>", { desc = "Find in current buffer" })
|
||||||
|
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
|
|
||||||
@@ -244,7 +222,6 @@ map("n", "]w", diagnostic_goto(true, "WARN"), { desc = "Next Warning" })
|
|||||||
map("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })
|
map("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })
|
||||||
|
|
||||||
---- Toggle options ----
|
---- Toggle options ----
|
||||||
|
|
||||||
map("n", "<leader>um", function()
|
map("n", "<leader>um", function()
|
||||||
require("monkey-alert").enable() -- does not toggle :O
|
require("monkey-alert").enable() -- does not toggle :O
|
||||||
end, { desc = "Toggle monkey alert" })
|
end, { desc = "Toggle monkey alert" })
|
||||||
|
|||||||
@@ -1,78 +1,19 @@
|
|||||||
return { {
|
return {
|
||||||
"yetone/avante.nvim",
|
{
|
||||||
|
"github/copilot.vim",
|
||||||
enabled = false,
|
enabled = false,
|
||||||
-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
|
|
||||||
-- ⚠️ must add this setting! ! !
|
|
||||||
build = vim.fn.has("win32") ~= 0
|
|
||||||
and "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false"
|
|
||||||
or "make",
|
|
||||||
event = "VeryLazy",
|
|
||||||
version = false, -- Never set this value to "*"! Never!
|
|
||||||
---@module 'avante'
|
|
||||||
---@type avante.Config
|
|
||||||
opts = {
|
|
||||||
-- add any opts here
|
|
||||||
-- this file can contain specific instructions for your project
|
|
||||||
instructions_file = "avante.md",
|
|
||||||
-- for example
|
|
||||||
provider = "claude",
|
|
||||||
providers = {
|
|
||||||
claude = {
|
|
||||||
endpoint = "https://api.anthropic.com",
|
|
||||||
model = "claude-sonnet-4-20250514",
|
|
||||||
timeout = 30000, -- Timeout in milliseconds
|
|
||||||
extra_request_body = {
|
|
||||||
temperature = 0.75,
|
|
||||||
max_tokens = 20480,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
moonshot = {
|
|
||||||
endpoint = "https://api.moonshot.ai/v1",
|
|
||||||
model = "kimi-k2-0711-preview",
|
|
||||||
timeout = 30000, -- Timeout in milliseconds
|
|
||||||
extra_request_body = {
|
|
||||||
temperature = 0.75,
|
|
||||||
max_tokens = 32768,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"olimorris/codecompanion.nvim",
|
||||||
|
enabled = false,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"MunifTanjim/nui.nvim",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
--- The below dependencies are optional,
|
},
|
||||||
"nvim-mini/mini.pick", -- for file_selector provider mini.pick
|
|
||||||
"nvim-telescope/telescope.nvim", -- for file_selector provider telescope
|
|
||||||
"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
|
|
||||||
"ibhagwan/fzf-lua", -- for file_selector provider fzf
|
|
||||||
"stevearc/dressing.nvim", -- for input provider dressing
|
|
||||||
"folke/snacks.nvim", -- for input provider snacks
|
|
||||||
"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
|
|
||||||
"zbirenbaum/copilot.lua", -- for providers='copilot'
|
|
||||||
{
|
|
||||||
-- support for image pasting
|
|
||||||
"HakonHarnes/img-clip.nvim",
|
|
||||||
event = "VeryLazy",
|
|
||||||
opts = {
|
opts = {
|
||||||
-- recommended settings
|
|
||||||
default = {
|
|
||||||
embed_image_as_base64 = false,
|
|
||||||
prompt_for_file_name = false,
|
|
||||||
drag_and_drop = {
|
|
||||||
insert_mode = true,
|
|
||||||
},
|
|
||||||
-- required for Windows users
|
|
||||||
use_absolute_path = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
-- Make sure to set this up properly if you have lazy=true
|
|
||||||
'MeanderingProgrammer/render-markdown.nvim',
|
|
||||||
opts = {
|
opts = {
|
||||||
file_types = { "markdown", "Avante" },
|
log_level = "DEBUG", -- or "TRACE"
|
||||||
},
|
|
||||||
ft = { "markdown", "Avante" },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
} }
|
},
|
||||||
|
}
|
||||||
|
|||||||
@@ -53,31 +53,31 @@ local config = {
|
|||||||
toggle_hidden_on_enter = true, -- when you re-enter a hidden group this options re-opens that group so the buffer is visible
|
toggle_hidden_on_enter = true, -- when you re-enter a hidden group this options re-opens that group so the buffer is visible
|
||||||
},
|
},
|
||||||
items = {
|
items = {
|
||||||
|
-- {
|
||||||
|
-- name = "Tests",
|
||||||
|
-- -- icon = " ",
|
||||||
|
-- highlight = { underline = false },
|
||||||
|
-- priority = 2,
|
||||||
|
-- matcher = function(buf)
|
||||||
|
-- return buf.path:match("%.test") or buf.path:match("%_test") or buf.path:match("%_spec")
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
-- {
|
||||||
|
-- name = "Docs",
|
||||||
|
-- -- icon = " ",
|
||||||
|
-- priority = 3,
|
||||||
|
-- -- highlight = { undercurl = false, sp = "grey" },
|
||||||
|
-- highlight = { undercurl = false },
|
||||||
|
-- auto_close = false,
|
||||||
|
-- matcher = function(buf)
|
||||||
|
-- return buf.path:match("%.md") or buf.path:match("%.txt")
|
||||||
|
-- end,
|
||||||
|
-- separator = {
|
||||||
|
-- style = require("bufferline.groups").separator.tab,
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
{
|
{
|
||||||
name = "Tests",
|
name = "Sh",
|
||||||
-- icon = " ",
|
|
||||||
highlight = { underline = false },
|
|
||||||
priority = 2,
|
|
||||||
matcher = function(buf)
|
|
||||||
return buf.path:match("%.test") or buf.path:match("%_test") or buf.path:match("%_spec")
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name = "Docs",
|
|
||||||
-- icon = " ",
|
|
||||||
priority = 3,
|
|
||||||
-- highlight = { undercurl = false, sp = "grey" },
|
|
||||||
highlight = { undercurl = false },
|
|
||||||
auto_close = false,
|
|
||||||
matcher = function(buf)
|
|
||||||
return buf.path:match("%.md") or buf.path:match("%.txt")
|
|
||||||
end,
|
|
||||||
separator = {
|
|
||||||
style = require("bufferline.groups").separator.tab,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name = "Shells",
|
|
||||||
-- icon = " ",
|
-- icon = " ",
|
||||||
highlight = { undercurl = false },
|
highlight = { undercurl = false },
|
||||||
auto_close = false,
|
auto_close = false,
|
||||||
|
|||||||
@@ -9,4 +9,10 @@ return {
|
|||||||
-- vim.api.nvim_create_user_command("PeekClose", require("peek").close, {})
|
-- vim.api.nvim_create_user_command("PeekClose", require("peek").close, {})
|
||||||
-- end,
|
-- end,
|
||||||
-- },
|
-- },
|
||||||
|
{
|
||||||
|
"norcalli/nvim-colorizer.lua",
|
||||||
|
init = function(_, opts)
|
||||||
|
return require("colorizer").setup(opts)
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,5 +29,25 @@ return {
|
|||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{ 'mbbill/undotree' }
|
{ 'mbbill/undotree' },
|
||||||
|
{
|
||||||
|
"folke/flash.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
---@type Flash.Config
|
||||||
|
opts = {},
|
||||||
|
keys = {
|
||||||
|
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
|
||||||
|
{ "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
|
||||||
|
{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
|
||||||
|
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
|
||||||
|
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'MagicDuck/grug-far.nvim',
|
||||||
|
-- config = function()
|
||||||
|
-- require('grug-far').setup({
|
||||||
|
-- });
|
||||||
|
-- end
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,36 @@ return {
|
|||||||
-- variant = "darker", -- dark, light, darker | dawn
|
-- variant = "darker", -- dark, light, darker | dawn
|
||||||
-- },
|
-- },
|
||||||
-- },
|
-- },
|
||||||
|
{
|
||||||
|
"oskarnurm/koda.nvim",
|
||||||
|
lazy = false,
|
||||||
|
priority = 1000,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"dqnid/komau.vim",
|
||||||
|
-- dir = "~/Documents/Code/komau.vim",
|
||||||
|
opts = {
|
||||||
|
style = "auto", -- "dark" | "light" | "auto" (uses &background)
|
||||||
|
transparent = false,
|
||||||
|
dim_inactive = false,
|
||||||
|
terminal_colors = true,
|
||||||
|
styles = {
|
||||||
|
comments = { italic = true },
|
||||||
|
keywords = { bold = true },
|
||||||
|
},
|
||||||
|
integrations = {
|
||||||
|
treesitter = true,
|
||||||
|
lsp = true,
|
||||||
|
telescope = true,
|
||||||
|
cmp = true,
|
||||||
|
gitsigns = true,
|
||||||
|
which_key = true,
|
||||||
|
indent_blankline = true,
|
||||||
|
mini = true,
|
||||||
|
statusline = { lightline = true, lualine = true },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"ellisonleao/gruvbox.nvim",
|
"ellisonleao/gruvbox.nvim",
|
||||||
priority = 1000,
|
priority = 1000,
|
||||||
@@ -38,7 +67,7 @@ return {
|
|||||||
overrides = {},
|
overrides = {},
|
||||||
dim_inactive = false,
|
dim_inactive = false,
|
||||||
transparent_mode = false,
|
transparent_mode = false,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "echasnovski/mini.icons" },
|
{ "echasnovski/mini.icons" },
|
||||||
|
|||||||
Reference in New Issue
Block a user