this repo has no description
nvim: drop whichkey, add trouble
+127
-148
+2
nvim/lazy-lock.json
+2
nvim/lazy-lock.json
···
7
7
"gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
8
8
"gitsigns.nvim": { "branch": "main", "commit": "130beacf8a51f00aede9c31064c749136679a321" },
9
9
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
10
+
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
10
11
"mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" },
11
12
"mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
12
13
"neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
···
23
24
"schemastore.nvim": { "branch": "main", "commit": "60f1b3d1bde39396cdfb1362dd207970ec57e731" },
24
25
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
25
26
"toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
27
+
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
26
28
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
27
29
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
28
30
}
+103
-133
nvim/lua/config/keys.lua
+103
-133
nvim/lua/config/keys.lua
···
1
-
local wk = require("which-key")
2
-
3
1
local function qflist_is_open()
4
2
local is_open = false
5
3
for _, win in ipairs(vim.fn.getwininfo()) do
···
10
8
end
11
9
return is_open
12
10
end
11
+
13
12
local function toggle_qf_list()
14
13
if qflist_is_open() then
15
14
vim.cmd("cclose")
···
18
17
end
19
18
end
20
19
21
-
wk.add({
22
-
{ "<C-h>", "<C-w>h", desc = "Move focus to left pane" },
23
-
{ "<C-j>", "<C-w>j", desc = "Move focus to below pane" },
24
-
{ "<C-k>", "<C-w>k", desc = "Move focus to above pane" },
25
-
{ "<C-l>", "<C-w>l", desc = "Move focus to right pane" },
26
-
27
-
{ "<M-h>", "5zh", desc = "Scroll left" },
28
-
{ "<M-l>", "5zl", desc = "Scroll right" },
20
+
-- movement
21
+
vim.keymap.set("n", "<C-h>", "<C-w>h")
22
+
vim.keymap.set("n", "<C-j>", "<C-w>j")
23
+
vim.keymap.set("n", "<C-k>", "<C-w>k")
24
+
vim.keymap.set("n", "<C-l>", "<C-w>l")
25
+
vim.keymap.set("n", "<M-l>", "5zl")
26
+
vim.keymap.set("n", "<M-h>", "5zh")
27
+
vim.keymap.set("n", "H", ":bp<cr>")
28
+
vim.keymap.set("n", "L", ":bn<cr>")
29
29
30
-
{ "H", ":bp<cr>", desc = "Switch to previous buffer" },
31
-
{ "L", ":bn<cr>", desc = "Switch to next buffer" },
30
+
vim.keymap.set("n", "E", "<cmd>Neotree toggle reveal position=current<cr>")
32
31
33
-
-- Prevents the pane from being removed when closing a buffer
34
-
{ "<leader>d", "<cmd>bp<bar>sp<bar>bn<bar>bd<cr>", desc = "Close buffer" },
35
-
{ "<leader>D", "<cmd>bp<bar>sp<bar>bn<bar>bd!<cr>", desc = "Close buffer (force)" },
36
-
-- { "<leader>d", "<cmd>bd<cr>", desc = "Close buffer" },
37
-
-- { "<leader>D", "<cmd>bd!<cr>", desc = "Close buffer (force)" },
38
-
{ "<leader>BD", "<cmd>bufdo bd<cr>", desc = "Close all buffers" },
39
-
40
-
{ "<leader>n", "<cmd>vnew<CR>", desc = "New buffer" },
41
-
42
-
{ "<C-t>", "<cmd>tabnext<cr>", desc = "Next tab", group = "tab" },
43
-
{ "<leader>tn", "<cmd>tabnew<cr>", desc = "New Tab", group = "tab" },
44
-
{ "<leader>td", "<cmd>tabclose<cr>", desc = "Close Tab", group = "tab" },
45
-
46
-
{ "<leader>LC", "<cmd>ConfigLocalEdit<cr>", desc = "Edit local nvim config" },
47
-
-- { "<leader>N", "<cmd>vsp<cr><C-w>l<cmd>e NOTES.sethetter.md<cr>", desc = "Open personal notes" },
48
-
{ "<leader>N", "<cmd>e NOTES.sethetter.md<cr>", desc = "Open personal notes" },
49
-
50
-
{
51
-
"<leader>/",
52
-
"<cmd>CommentToggle<cr>",
53
-
desc = "Toggle comment",
54
-
mode = { "n" },
55
-
},
56
-
{
57
-
"<leader>/",
58
-
":'<,'>CommentToggle<cr>",
59
-
desc = "Toggle comment",
60
-
mode = { "v" },
61
-
},
32
+
-- buffers
33
+
vim.keymap.set("n", "<leader>BD", "<cmd>bufdo bd<cr>")
34
+
vim.keymap.set("n", "<leader>n", "<cmd>vnew<CR>")
35
+
-- Prevents the pane from being removed when closing a buffer
36
+
vim.keymap.set("n", "<leader>d", "<cmd>bp<bar>sp<bar>bn<bar>bd<cr>")
37
+
vim.keymap.set("n", "<leader>D", "<cmd>bp<bar>sp<bar>bn<bar>bd!<cr>")
38
+
vim.keymap.set("n", "<leader>v/", "<cmd>vsp<cr>")
39
+
vim.keymap.set("n", "<leader>v?", "<cmd>sp<cr>")
62
40
63
-
-- { "E", "<cmd>Neotree position=current toggle reveal<cr>", desc = "Open file explorer" },
64
-
{ "E", "<cmd>Neotree toggle reveal position=current<cr>", desc = "Open file explorer" },
65
-
{ "<leader>e", "<cmd>Neotree toggle position=current<cr>", desc = "Open file explorer" },
66
-
-- { "<leader>E", "<cmd>Neotree focus reveal position=current<cr>", desc = "Open file explorer" },
41
+
-- tabs
42
+
vim.keymap.set("n", "<C-t>", "<cmd>tabnext<cr>")
43
+
vim.keymap.set("n", "<leader>tn", "<cmd>tabnew<cr>")
44
+
vim.keymap.set("n", "<leader>td", "<cmd>tabclose<cr>")
67
45
68
-
{ "<leader>h", "<cmd>noh<cr>", desc = "Clear highlight" },
69
-
{ "<leader>v/", "<cmd>vsp<cr>", desc = "Split vertical", group = "split" },
70
-
{ "<leader>v?", "<cmd>sp<cr>", desc = "Split horizontal", group = "split" },
46
+
-- comments
47
+
vim.keymap.set("n", "<leader>/", "<cmd>CommentToggle<cr>")
48
+
vim.keymap.set("v", "<leader>/", ":'<,'>CommentToggle<cr>")
71
49
72
-
{
73
-
"<leader>f",
74
-
"<cmd>Telescope find_files find_command=rg,--ignore,--hidden,--files,--iglob=!.git sort_mru=true<cr>",
75
-
desc = "Find files",
76
-
},
77
-
{ "<leader>b", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
78
-
{ "<leader>sp", "<cmd>Telescope live_grep<cr>", desc = "Live grep" },
79
-
{ "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help tags" },
80
-
{ "<leader>sc", "<cmd>Telescope commands<cr>", desc = "Commands" },
81
50
82
-
{
83
-
"<leader>cl",
84
-
toggle_qf_list,
85
-
desc = "Toggle quickfix list",
86
-
group = "quickfix",
87
-
},
88
-
{ "<leader>cn", "<cmd>cnext<cr>", desc = "Next QF item", group = "quickfix" },
89
-
{ "<leader>cp", "<cmd>cprev<cr>", desc = "Prev QF item", group = "quickfix" },
51
+
-- telescope
52
+
vim.keymap.set("n",
53
+
"<leader>f",
54
+
"<cmd>Telescope find_files find_command=rg,--ignore,--hidden,--files,--iglob=!.git sort_mru=true<cr>"
55
+
)
56
+
vim.keymap.set("n", "<leader>b", "<cmd>Telescope buffers<cr>")
57
+
vim.keymap.set("n", "<leader>sp", "<cmd>Telescope live_grep<cr>")
58
+
vim.keymap.set("n", "<leader>sh", "<cmd>Telescope help_tags<cr>")
59
+
vim.keymap.set("n", "<leader>sc", "<cmd>Telescope commands<cr>")
90
60
91
-
{
92
-
"<leader>m",
93
-
function()
94
-
vim.diagnostic.setqflist({ open = true, focus = true })
95
-
end,
96
-
desc = "Diagnostics in qf list",
97
-
},
61
+
vim.keymap.set("n", "<leader>h", "<cmd>noh<cr>")
98
62
99
-
{ "<leader>M", "<cmd>messages<cr>", desc = "Messages" },
63
+
vim.keymap.set("n", "<leader>M", "<cmd>messages<cr>")
100
64
101
-
{ "<leader>T", ":term ", desc = "Run a terminal command" },
65
+
vim.keymap.set("n", "<leader>T", ":term ")
102
66
103
-
{ "<leader>o", "<cmd>AerialToggle<cr>", desc = "Symbols outline" },
67
+
vim.keymap.set("n", "<leader>m", function()
68
+
vim.diagnostic.setqflist({ open = true, focus = true })
69
+
end)
70
+
vim.keymap.set("n", "<leader>cc", toggle_qf_list)
71
+
vim.keymap.set("n", "<leader>cn", "<cmd>cnext<cr>")
72
+
vim.keymap.set("n", "<leader>cp", "<cmd>cprev<cr>")
104
73
105
-
{ "<leader>Z", "<cmd>Goyo<cr>", desc = "Goyo toggle" },
74
+
-- write/quit
75
+
vim.keymap.set("n", "<leader>w", "<cmd>w<cr>")
76
+
vim.keymap.set("n", "<leader>X", "<cmd>x<cr>")
77
+
vim.keymap.set("n", "<leader>q", "<cmd>q<cr>")
78
+
vim.keymap.set("n", "<leader>Q", "<cmd>qa<cr>")
106
79
107
-
{ "<leader>w", "<cmd>w<cr>", desc = "Save" },
108
-
{ "<leader>X", "<cmd>x<cr>", desc = "Save and close" },
109
-
{ "<leader>q", "<cmd>q<cr>", desc = "Quit" },
110
-
{ "<leader>Q", "<cmd>qa<cr>", desc = "Quit all" },
80
+
-- lsp
81
+
vim.keymap.set("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<cr>")
82
+
vim.keymap.set("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<cr>")
83
+
vim.keymap.set("n", "K", "<cmd>lua vim.lsp.buf.hover()<cr>")
84
+
vim.keymap.set("n", "gs", "<cmd>Telescope lsp_document_symbols<cr>")
85
+
vim.keymap.set("n", "gS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>")
86
+
vim.keymap.set("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>")
87
+
vim.keymap.set("n", "gd", "<cmd>lua vim.lsp.buf.definition()<cr>")
88
+
vim.keymap.set("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<cr>")
89
+
vim.keymap.set("n", "gr", "<cmd>lua vim.lsp.buf.references()<cr>")
90
+
vim.keymap.set("n", "g.", "<cmd>lua vim.lsp.buf.code_action()<cr>")
91
+
vim.keymap.set("n", "<leader>R", "<cmd>lua vim.lsp.buf.rename()<cr>")
92
+
vim.keymap.set("n", "<leader>F", "<cmd>Format<CR>")
111
93
112
-
{
113
-
"<leader>y",
114
-
function()
115
-
local filepath = vim.fn.expand('%:.')
116
-
local line = vim.fn.line('.')
117
-
local ref = filepath .. ':' .. line
118
-
vim.fn.system('pbcopy', ref)
119
-
vim.notify('Copied: ' .. ref, vim.log.levels.INFO)
120
-
end,
121
-
desc = "Copy filepath:line to clipboard"
122
-
},
94
+
-- trouble
95
+
vim.keymap.set("n", "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>", { desc = "Diagnostics (Trouble)" })
96
+
vim.keymap.set("n", "<leader>xX", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
97
+
{ desc = "Buffer Diagnostics (Trouble)" })
98
+
vim.keymap.set("n", "<leader>cs", "<cmd>Trouble symbols toggle focus=false win.position=bottom<cr>",
99
+
{ desc = "Symbols (Trouble)" })
100
+
vim.keymap.set("n", "<leader>cl", "<cmd>Trouble lsp toggle focus=false<cr>",
101
+
{ desc = "LSP Definitions / references / ... (Trouble)" })
102
+
vim.keymap.set("n", "<leader>xL", "<cmd>Trouble loclist toggle<cr>", { desc = "Location List (Trouble)" })
103
+
vim.keymap.set("n", "<leader>xQ", "<cmd>Trouble qflist toggle<cr>", { desc = "Quickfix List (Trouble)" })
123
104
124
-
{ "[d", "<cmd>lua vim.diagnostic.goto_prev()<cr>", desc = "Previous diagnostic" },
125
-
{ "]d", "<cmd>lua vim.diagnostic.goto_next()<cr>", desc = "Next diagnostic" },
126
-
{ "[g", "<cmd>Gitsigns prev_hunk<cr>", desc = "Previous change" },
127
-
{ "]g", "<cmd>Gitsigns next_hunk<cr>", desc = "Next change" },
105
+
-- git
106
+
vim.keymap.set("n", "[g", "<cmd>Gitsigns prev_hunk<cr>")
107
+
vim.keymap.set("n", "]g", "<cmd>Gitsigns next_hunk<cr>")
108
+
vim.keymap.set("n", "<leader>gg", "<cmd>LazyGit<cr>")
109
+
vim.keymap.set("n", "<leader>gs", "<cmd>Telescope git_status<cr>")
110
+
vim.keymap.set("n", "<leader>gd", "<cmd>Gitsigns diffthis vertical=true HEAD<cr>")
111
+
vim.keymap.set("n", "<leader>Gd", ":Gitsigns diffthis vertical=true ")
112
+
vim.keymap.set("n", "<leader>GD", ":DiffviewOpen ")
113
+
vim.keymap.set("n", "<leader>gh", "<cmd>DiffviewFileHistory %<cr>")
114
+
vim.keymap.set("n", "<leader>gH", "<cmd>DiffviewFileHistory<cr>")
115
+
vim.keymap.set("n", "<leader>gb", "<cmd>Gitsigns toggle_current_line_blame<cr>")
128
116
129
-
{ "K", "<cmd>lua vim.lsp.buf.hover()<cr>", desc = "Hover" },
117
+
vim.keymap.set("v", "<leader>gl", function()
118
+
require("gitlinker").get_buf_range_url("n", {
119
+
action_callback = require("gitlinker.actions").copy_to_clipboard
120
+
})
121
+
end, { silent = true })
130
122
131
-
{ "g", group = "goto" },
132
-
{ "gs", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document symbols" },
133
-
{ "gS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace symbols" },
134
-
{ "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", desc = "Declaration" },
135
-
{ "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", desc = "Definition" },
136
-
{ "gi", "<cmd>lua vim.lsp.buf.implementation()<cr>", desc = "Implementation" },
137
-
{ "gr", "<cmd>lua vim.lsp.buf.references()<cr>", desc = "References" },
138
-
{ "g.", "<cmd>lua vim.lsp.buf.code_action()<cr>", desc = "Code action" },
139
-
{ "<leader>R", "<cmd>lua vim.lsp.buf.rename()<cr>", desc = "Rename symbol" },
140
-
{ "<leader>F", "<cmd>Format<CR>", desc = "Format buffer" },
123
+
vim.keymap.set("v", "<leader>gl", function()
124
+
require("gitlinker").get_buf_range_url("v", {
125
+
action_callback = require("gitlinker.actions").copy_to_clipboard
126
+
})
127
+
end, { silent = true })
141
128
142
-
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "Lazygit", group = "git" },
143
-
{ "<leader>gs", "<cmd>Telescope git_status<cr>", desc = "Git status", group = "git" },
144
-
{ "<leader>gd", "<cmd>Gitsigns diffthis vertical=true HEAD<cr>", desc = "File diff", group = "git" },
145
-
{ "<leader>Gd", ":Gitsigns diffthis vertical=true ", desc = "File diff provided ref", group = "git" },
146
-
{ "<leader>GD", ":DiffviewOpen ", desc = "Diff provided ref", group = "git" },
147
-
{ "<leader>gh", "<cmd>DiffviewFileHistory %<cr>", desc = "File history", group = "git" },
148
-
{ "<leader>gH", "<cmd>DiffviewFileHistory<cr>", desc = "Git history", group = "git" },
149
-
{ "<leader>gb", "<cmd>Gitsigns toggle_current_line_blame<cr>", desc = "Git history", group = "git" },
150
-
{
151
-
"<leader>gl",
152
-
'<cmd>lua require("gitlinker").get_buf_range_url("n", {action_callback = require("gitlinker.actions").copy_to_clipboard})<cr>',
153
-
desc = "Copy git url",
154
-
mode = "n",
155
-
silent = true,
156
-
},
157
-
{
158
-
"<leader>gl",
159
-
'<cmd>lua require("gitlinker").get_buf_range_url("v", {action_callback = require("gitlinker.actions").copy_to_clipboard})<cr>',
160
-
desc = "Copy git url",
161
-
mode = "v",
162
-
-- TODO: make this actually silent
163
-
silent = true,
164
-
},
129
+
vim.keymap.set("n", "<leader>y", function()
130
+
local filepath = vim.fn.expand('%:.')
131
+
local line = vim.fn.line('.')
132
+
local ref = filepath .. ':' .. line
133
+
vim.fn.system('pbcopy', ref)
134
+
vim.notify('Copied: ' .. ref, vim.log.levels.INFO)
135
+
end, { desc = "Copy filepath:line to clipboard" })
165
136
166
-
{ "<leader>PP", "<cmd>Lazy<cr>", desc = "Manage plugins", group = "plugin" },
137
+
vim.keymap.set("n", "<leader>PP", "<cmd>Lazy<cr>")
167
138
168
-
{ "<leader>CI", ":CodeCompanion<CR>", desc = "Code Companion inline", mode = { "n", "v" }, group = "codecompanion" },
169
-
{ "<leader>CC", ":CodeCompanionChat<CR>", desc = "Claude edit selection", mode = { "n", "v" }, group = "codecompanion" },
170
-
})
139
+
vim.keymap.set("n", "<leader>LC", "<cmd>ConfigLocalEdit<cr>")
140
+
vim.keymap.set("n", "<leader>N", "<cmd>e NOTES.sethetter.md<cr>")
+10
-3
nvim/lua/plugins/config.lua
+10
-3
nvim/lua/plugins/config.lua
···
9
9
hashfile = vim.fn.stdpath("data") .. "/config-local",
10
10
11
11
autocommands_create = true, -- Create autocommands (VimEnter, DirectoryChanged)
12
-
commands_create = true, -- Create commands (ConfigLocalSource, ConfigLocalEdit, ConfigLocalTrust, ConfigLocalIgnore)
13
-
silent = false, -- Disable plugin messages (Config loaded/ignored)
14
-
lookup_parents = false, -- Lookup config files in parent directories
12
+
commands_create = true, -- Create commands (ConfigLocalSource, ConfigLocalEdit, ConfigLocalTrust, ConfigLocalIgnore)
13
+
silent = false, -- Disable plugin messages (Config loaded/ignored)
14
+
lookup_parents = false, -- Lookup config files in parent directories
15
15
})
16
16
end,
17
+
keys = {
18
+
{
19
+
"<leader>LC",
20
+
"<cmd>ConfigLocalEdit<cr>",
21
+
desc = "Edit local config",
22
+
},
23
+
},
17
24
}
+12
nvim/lua/plugins/lsp.lua
+12
nvim/lua/plugins/lsp.lua
···
159
159
end,
160
160
},
161
161
{
162
+
"folke/lazydev.nvim",
163
+
ft = "lua", -- only load on lua files
164
+
opts = {},
165
+
},
166
+
{
167
+
"folke/trouble.nvim",
168
+
opts = {
169
+
icons = {},
170
+
},
171
+
cmd = "Trouble",
172
+
},
173
+
{
162
174
"antosha417/nvim-lsp-file-operations",
163
175
dependencies = {
164
176
"nvim-lua/plenary.nvim",
-12
nvim/lua/plugins/ui.lua
-12
nvim/lua/plugins/ui.lua
···
33
33
},
34
34
},
35
35
{
36
-
"stevearc/aerial.nvim",
37
-
opts = {
38
-
-- default starts with treesitter, but I like lsp
39
-
backends = { "lsp", "markdown", "asciidoc", "man" },
40
-
filter_kind = false,
41
-
layout = {
42
-
max_width = { 40, 0.2 },
43
-
min_width = 30,
44
-
},
45
-
},
46
-
},
47
-
{
48
36
"nvim-telescope/telescope.nvim",
49
37
tag = "0.1.8",
50
38
dependencies = { "nvim-lua/plenary.nvim" },