Skip to content

Commit aabc25c

Browse files
crivotzcrivotz
committed
Clean
1 parent a099136 commit aabc25c

22 files changed

+338
-334
lines changed

‎lazy-lock.json

+15-17
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"CopilotChat.nvim": { "branch": "main", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" },
33
"arrow.nvim": { "branch": "master", "commit": "5438c977e729a29d96bd54c8da3103154e80dbd1" },
44
"blink-cmp-copilot": { "branch": "main", "commit": "c5c5cbce5748d21073f1d5348a92ebe6ce63f387" },
5-
"blink-ripgrep.nvim": { "branch": "main", "commit": "182da8e98da4453e6f6282643839a9dfa2025c69" },
6-
"blink.cmp": { "branch": "main", "commit": "5b0f52d42ecbb374695da1a93fa40eca4dc7a7ff" },
7-
"colorful-menu.nvim": { "branch": "master", "commit": "1f92ebd073da2f81df6a36aebacf1f5ef94b3a26" },
5+
"blink-ripgrep.nvim": { "branch": "main", "commit": "705069a57566a5e7427025264451c581f0bfb9c4" },
6+
"blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" },
7+
"colorful-menu.nvim": { "branch": "master", "commit": "785a0d808969c1adabd4d8b039c9c548cb6f72d5" },
88
"copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" },
99
"csv.vim": { "branch": "master", "commit": "44aeb7e26e8b42f7c14c328f16ac4744ae53b22c" },
1010
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
@@ -13,39 +13,37 @@
1313
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
1414
"formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" },
1515
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
16-
"fzf-lua": { "branch": "main", "commit": "87eff1a57685eb9c8804824e677c7fb0014656ce" },
17-
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
16+
"fzf-lua": { "branch": "main", "commit": "54d505c17576f10d4c74c8e110b445369bd71548" },
17+
"gitsigns.nvim": { "branch": "main", "commit": "68114837e81ca16d06514c3a997c9102d1b25c15" },
1818
"grug-far.nvim": { "branch": "main", "commit": "08f32182335754abf461dfb77b2c4e24bfe4d614" },
19-
"hardtime.nvim": { "branch": "main", "commit": "5d9adcbe2f12741de79e435c8b85dca69a3b22e4" },
2019
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
2120
"lspkind-nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
2221
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
2322
"marks.nvim": { "branch": "master", "commit": "bb25ae3f65f504379e3d08c8a02560b76eaf91e8" },
24-
"markview.nvim": { "branch": "main", "commit": "72cd34279e94ee96ee33bdf30a87b00e6d45319d" },
23+
"markview.nvim": { "branch": "main", "commit": "6e9f1840ba33e5318285ad97c22676f55b753479" },
2524
"mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
2625
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
2726
"noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
2827
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
2928
"numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
30-
"nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
31-
"nvim-dap": { "branch": "master", "commit": "0e673accbb512e1e191dfb4fecea89cc38c1bcdd" },
32-
"nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" },
29+
"nvim-autopairs": { "branch": "master", "commit": "d2f791ceeb26d04d87aa54343bc94e8ad8d7be1c" },
30+
"nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
31+
"nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" },
3332
"nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
34-
"nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" },
33+
"nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" },
3534
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
36-
"nvim-neoclip.lua": { "branch": "main", "commit": "5e5e010251281f4aea69cfc1d4976ffe6065cf0f" },
35+
"nvim-neoclip.lua": { "branch": "main", "commit": "108ad22f284737e93f6bd4ba5614bfe9d716be60" },
3736
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
38-
"nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" },
37+
"nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" },
3938
"nvim-rip-substitute": { "branch": "main", "commit": "7be26ea5ebb0fe38fbfc3c69c22d535d02c9ab1e" },
4039
"nvim-spider": { "branch": "main", "commit": "2b38e3e95e143313d78ca098eeecda7aebfce925" },
41-
"nvim-treesitter": { "branch": "master", "commit": "622a4a6ba76d1de52b72a965159213ae655b4ac7" },
42-
"nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" },
40+
"nvim-treesitter": { "branch": "master", "commit": "306dd6e9dc806db1d79568d26e1c9b6c98b95fbc" },
41+
"nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
4342
"oil-vcs-status": { "branch": "main", "commit": "729f65d5ac6f115df0b54ffd24a4f3f0e8834a47" },
44-
"oil.nvim": { "branch": "master", "commit": "a6a4f48b14b4a51fded531c86f6c04b4503a2ef8" },
43+
"oil.nvim": { "branch": "master", "commit": "7041528bdedb350ad66e650684deec8456e053cc" },
4544
"oklch-color-picker.nvim": { "branch": "master", "commit": "24f46c92c2d8228843a4628530ec873469650d16" },
4645
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
4746
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
48-
"ror.nvim": { "branch": "main", "commit": "9d31ad3953be83ac8dd542725ca4881c861f64a5" },
4947
"snacks.nvim": { "branch": "main", "commit": "14e89401da348f5d14509fca164fb7bcec83e597" },
5048
"suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" },
5149
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },

‎lua/config/mappings.lua

-27
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,17 @@ vim.keymap.set('n', '<F3>', ':set nu! rnu!<CR>', {noremap = true, silent = true}
33
vim.keymap.set('n', '<F4>', ':set list! list?<CR>', {noremap = false, silent = true})
44
-- <F7> Yazi
55
vim.keymap.set('n', '<leader>nm', ':Dispatch npm start<CR>', {noremap = false, silent = true})
6-
-- Buffers
7-
vim.keymap.set('n', '<leader>bn', ':BufSurfForward<CR>', {noremap = false, silent = true})
8-
vim.keymap.set('n', '<leader>bp', ':BufSurfBack<CR>', {noremap = false, silent = true})
9-
vim.keymap.set('n', '<leader>bl', ':BufSurfList<CR>', {noremap = false, silent = true})
106
-- Diff
117
vim.keymap.set('n', '<leader>dd', ':windo diffthis<CR>', {noremap = false, silent = true})
128
-- LSP
139
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, {noremap = true, silent = true})
1410
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, {noremap = true, silent = true})
1511
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, {noremap = true, silent = true})
16-
-- Trouble
17-
vim.keymap.set('n', '<leader>tt', ':Trouble todo filter = { tag = {TODO} }<CR>', {noremap = true, silent = true})
18-
vim.keymap.set('n', '<leader>tf', ':Trouble todo filter = { tag = {FIX,FIXME} }<CR>', {noremap = true, silent = true})
19-
vim.keymap.set('n', '<leader>tn', ':Trouble todo filter = { tag = {NOTE} }<CR>', {noremap = true, silent = true})
20-
vim.keymap.set("n", "<leader>tr", "<cmd>TroubleToggle<cr>", {silent = true, noremap = true})
21-
vim.keymap.set("n", "<leader>tw", "<cmd>Trouble workspace_diagnostics<cr>", {silent = true, noremap = true})
22-
vim.keymap.set("n", "<leader>td", "<cmd>Trouble document_diagnostics<cr>", {silent = true, noremap = true})
23-
vim.keymap.set("n", "<leader>tll", "<cmd>Trouble loclist<cr>", {silent = true, noremap = true})
24-
vim.keymap.set("n", "<leader>tq", "<cmd>Trouble quickfix<cr>", {silent = true, noremap = true})
25-
vim.keymap.set("n", "<leader>tl", "<cmd>Trouble lsp_references<cr>", {silent = true, noremap = true})
26-
-- Nvim-dap
27-
vim.keymap.set("n", "<leader>dc", "<cmd>lua require'dap'.continue()<CR>", {silent = true, noremap = true})
28-
vim.keymap.set("n", "<leader>ds", "<cmd>lua require'dap'.step_over()<CR>", {silent = true, noremap = true})
29-
vim.keymap.set("n", "<leader>dsi", "<cmd>lua require'dap'.step_into()<CR>", {silent = true, noremap = true})
30-
vim.keymap.set("n", "<leader>dso", "<cmd>lua require'dap'.step_out()<CR>", {silent = true, noremap = true})
31-
vim.keymap.set("n", "<leader>db", "<cmd>lua require'dap'.toggle_breakpoint()<CR>", {silent = true, noremap = true})
32-
vim.keymap.set("n", "<leader>dui", ":lua require('dapui').toggle()<cr>", {silent = true, noremap = true})
33-
vim.keymap.set("n", "<leader>dro", "<cmd>lua require'dap'.repl.open()<CR>", {silent = true, noremap = true})
34-
vim.keymap.set("n", "<leader>dcc", "<cmd>lua require'telescope'.extensions.dap.commands{}<CR>", {silent = true, noremap = true})
35-
vim.keymap.set("n", "<leader>dlb", "<cmd>lua require'telescope'.extensions.dap.list_breakpoints{}<CR>", {silent = true, noremap = true})
36-
vim.keymap.set("n", "<leader>dv", "<cmd>lua require'telescope'.extensions.dap.variables{}<CR>", {silent = true, noremap = true})
37-
vim.keymap.set("n", "<leader>df", "<cmd>lua require'telescope'.extensions.dap.frames{}<CR>", {silent = true, noremap = true})
3812
-- Notes & Todo
3913
vim.keymap.set('n', '<leader>tv', ":lua require('util.scratches').open_scratch_file()<CR>", {noremap = true, silent = true})
4014
vim.keymap.set('n', '<leader>nt', ":lua require('util.scratches').open_scratch_file_floating()<CR>", {noremap = true, silent = true})
4115
vim.keymap.set('n', '<leader>n', ":lua require('plugins.telescope').my_note()<CR>", {noremap = true, silent = true})
4216
vim.keymap.set('n', '<leader>nn', ":lua NewNote()<CR>", {noremap = true, silent = true})
4317
-- ROR
44-
vim.keymap.set("n", "<Leader>ror", ":lua require('ror.commands').list_commands()<CR>", { silent = true })
4518
vim.keymap.set("n", "<Leader>or", ":! overmind restart<CR>", { silent = true })
4619

‎lua/plugins/arrow.lua

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
return {
2+
"otavioschwanck/arrow.nvim",
3+
event = 'VeryLazy',
4+
opts = {
5+
show_icons = true,
6+
leader_key = '-'
7+
}
8+
}

‎lua/plugins/bufsurf.lua

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
return {
2+
"ton/vim-bufsurf",
3+
event = 'VeryLazy',
4+
keys = {
5+
{ "<leader>bn", ":BufSurfForward<CR>", desc ="Surf >>>" },
6+
{ "<leader>bp", ":BufSurfBack<CR>", desc ="Surf <<<" },
7+
{ "<leader>bl", ":BufSurfList<CR>", desc ="Surf list" },
8+
}
9+
}

‎lua/plugins/diffview.lua

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
return {
2+
"sindrets/diffview.nvim",
3+
lazy = true,
4+
cmd = { "DiffviewOpen", "DiffviewClose" },
5+
keys = {
6+
{ "<leader>gd",function() if next(require('diffview.lib').views) == nil then vim.cmd('DiffviewOpen') else vim.cmd('DiffviewClose') end end, desc = "Git diff" },
7+
},
8+
config = function()
9+
require("diffview").setup({
10+
view = {
11+
file_history = {
12+
layout = "diff2_vertical",
13+
},
14+
},
15+
})
16+
end
17+
}

‎lua/plugins/flash.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
return {
2+
"folke/flash.nvim",
3+
event = "VeryLazy",
4+
opts = {
5+
modes = {
6+
search = {
7+
enabled = true,
8+
}
9+
}
10+
},
11+
keys = {
12+
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
13+
{ "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
14+
{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
15+
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
16+
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
17+
},
18+
}

‎lua/plugins/grug-far.lua

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
return {
2+
'MagicDuck/grug-far.nvim',
3+
event = 'VeryLazy',
4+
keys = {
5+
{
6+
"<leader>sr",
7+
"<cmd>lua require('grug-far').toggle_instance({ instanceName='far', staticTitle='Search and Replace' })<CR>",
8+
mode = { "n", "o", "x" },
9+
},
10+
{
11+
"<leader>srw",
12+
"<cmd>lua require('grug-far').grug_far({ prefills = { search = vim.fn.expand('<cword>') } })<CR>",
13+
mode = { "n", "o", "x" },
14+
},
15+
},
16+
config = function()
17+
require('grug-far').setup({
18+
-- startInInsertMode = false,
19+
});
20+
end
21+
}

‎lua/plugins/gutentags.lua

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
return {
2+
"ludovicchabant/vim-gutentags",
3+
enabled = false,
4+
lazy = false,
5+
config = function()
6+
vim.cmd('set tags+=tags,.git/tags')
7+
vim.g.gutentags_enabled = 1
8+
vim.g.gutentags_generate_on_missing = 1
9+
vim.g.gutentags_generate_on_write = 1
10+
vim.g.gutentags_resolve_symlinks = 1
11+
vim.g.gutentags_ctags_tagfile = '.git/tags'
12+
vim.g.gutentags_project_root = { '.git' }
13+
vim.g.gutentags_ctags_extra_args = { '--fields=+l' }
14+
vim.g.gutentags_add_default_project_roots = 0
15+
vim.g.gutentags_ctags_executable_ruby = 'ripper-tags'
16+
vim.g.gutentags_ctags_extra_args_ruby = { '--ignore-unsupported-options', '--recursive' }
17+
-- vim.g.gutentags_trace = 1
18+
end,
19+
}

0 commit comments

Comments
 (0)