this repo has no description
more nvim stuff
+126
-33
+1
nvim/init.lua
+1
nvim/init.lua
+3
nvim/lazy-lock.json
+3
nvim/lazy-lock.json
···
6
6
"copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
7
7
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
8
8
"dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
9
+
"gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
9
10
"img-clip.nvim": { "branch": "main", "commit": "28a32d811d69042f4fa5c3d5fa35571df2bc1623" },
10
11
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
11
12
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
···
19
20
"render-markdown.nvim": { "branch": "main", "commit": "fc05fb7c56795f191b6800799a2ec6ea325ba715" },
20
21
"rose-pine": { "branch": "main", "commit": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e" },
21
22
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
23
+
"toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" },
24
+
"trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
22
25
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
23
26
}
+69
-33
nvim/lua/config/keys.lua
+69
-33
nvim/lua/config/keys.lua
···
1
1
local wk = require("which-key")
2
2
3
+
local Terminal = require('toggleterm.terminal').Terminal
4
+
5
+
-- Create a lazygit fullscreen terminal
6
+
local lazygit = Terminal:new({
7
+
cmd = "lazygit",
8
+
direction = "float", -- This can use "horizontal" or "vertical" if float doesn't fill
9
+
float_opts = {
10
+
border = "none", -- or single/double if you prefer
11
+
width = function() return vim.o.columns end, -- full width
12
+
height = function() return vim.o.lines end, -- full height
13
+
},
14
+
-- adjust other options as needed
15
+
hidden = true
16
+
})
17
+
18
+
function _LAZYGIT_TOGGLE()
19
+
lazygit:toggle()
20
+
end
21
+
22
+
vim.cmd("command! LazyGit lua _LAZYGIT_TOGGLE()")
23
+
24
+
3
25
wk.add({
4
-
{ "<C-h>", "<C-w>h", desc = "Move focus to left pane" },
5
-
{ "<C-j>", "<C-w>j", desc = "Move focus to below pane" },
6
-
{ "<C-k>", "<C-w>k", desc = "Move focus to above pane" },
7
-
{ "<C-l>", "<C-w>l", desc = "Move focus to right pane" },
26
+
{ "<C-h>", "<C-w>h", desc = "Move focus to left pane" },
27
+
{ "<C-j>", "<C-w>j", desc = "Move focus to below pane" },
28
+
{ "<C-k>", "<C-w>k", desc = "Move focus to above pane" },
29
+
{ "<C-l>", "<C-w>l", desc = "Move focus to right pane" },
30
+
{ "H", ":bp<cr>", desc = "Switch to previous buffer" },
31
+
{ "L", ":bn<cr>", desc = "Switch to next buffer" },
8
32
9
-
{ "<leader>b", group = "buffer" },
10
-
{ "<leader>bd", "<cmd>bd<cr>", desc = "Delete Buffer" },
11
-
{ "<leader>bf", "<cmd>lua vim.lsp.buf.format()<CR>", desc = "Format buffer" },
12
-
{ "<leader>c", "<cmd>CommentToggle<cr>", desc = "Toggle Comment" },
13
-
{ "<leader>ca", "<cmd>lua vim.lsp.buf.code_action()<cr>", desc = "Code Action" },
14
-
{ "<leader>e", "<cmd>NvimTreeToggle<cr>", desc = "Toggle NvimTree" },
15
-
{ "E", "<cmd>NvimTreeFindFile<cr>", desc = "Toggle NvimTree" },
33
+
{ "<leader>c", "<cmd>bd<cr>", desc = "Delete Buffer" },
34
+
{ "<leader>/", "<cmd>CommentToggle<cr>", desc = "Toggle comment" },
35
+
{ "<leader>e", "<cmd>NvimTreeToggle<cr>", desc = "Toggle nvimtree" },
36
+
{ "E", "<cmd>NvimTreeFindFile<cr>", desc = "Toggle nvimtree" },
37
+
{ "<leader>h", "<cmd>noh<cr>", desc = "Clear highlight" },
38
+
{ "<leader>v/", "<cmd>vsp<cr>", desc = "Split vertical" },
39
+
{ "<leader>v?", "<cmd>sp<cr>", desc = "Split horizontal" },
16
40
17
-
{ "<leader>f", group = "file" },
18
-
{ "<leader>ff", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
19
-
{ "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent Files" },
20
-
{ "<leader>q", "<cmd>q<cr>", desc = "Quit" },
41
+
{ "<leader>bn", "<cmd>new<CR>", desc = "New buffer" },
42
+
{ "<leader>bf", "<cmd>lua vim.lsp.buf.format()<CR>", desc = "Format buffer" },
21
43
22
-
{ "<leader>s", group = "search" },
23
-
{ "<leader>sb", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
24
-
{ "<leader>sg", "<cmd>Telescope live_grep<cr>", desc = "Live Grep" },
25
-
{ "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Tags" },
26
-
{ "<leader>w", "<cmd>w<cr>", desc = "Save" },
44
+
{ "<leader>f", "<cmd>Telescope find_files<cr>", desc = "Find files" },
45
+
{ "<leader>sp", "<cmd>Telescope lgve_grep<cr>", desc = "Live grep" },
46
+
{ "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help tags" },
47
+
{ "<leader>sc", "<cmd>Telescope commands<cr>", desc = "Commands" },
27
48
28
-
{ "<leader>Q", "<cmd>qa<cr>", desc = "Quit all" },
29
-
{ "H", ":bp<cr>", desc = "Switch to previous buffer" },
30
-
{ "K", "<cmd>lua vim.lsp.buf.hover()<cr>", desc = "Hover" },
31
-
{ "L", ":bn<cr>", desc = "Switch to next buffer" },
32
-
{ "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>", desc = "Previous Diagnostic" },
33
-
{ "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>", desc = "Next Diagnostic" },
49
+
{ "<leader>w", "<cmd>w<cr>", desc = "Save" },
50
+
{ "<leader>q", "<cmd>q<cr>", desc = "Quit" },
51
+
{ "<leader>Q", "<cmd>qa<cr>", desc = "Quit all" },
52
+
53
+
{ "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>", desc = "Previous diagnostic" },
54
+
{ "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>", desc = "Next diagnostic" },
55
+
56
+
{ "K", "<cmd>lua vim.lsp.buf.hover()<cr>", desc = "Hover" },
57
+
58
+
{ "g", group = "goto" },
59
+
{ "gs", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document symbols" },
60
+
{ "gS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace symbols" },
61
+
{ "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", desc = "Declaration" },
62
+
{ "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", desc = "Definition" },
63
+
{ "gi", "<cmd>lua vim.lsp.buf.implementation()<cr>", desc = "Implementation" },
64
+
{ "gr", "<cmd>lua vim.lsp.buf.references()<cr>", desc = "References" },
65
+
{ "g.", "<cmd>lua vim.lsp.buf.code_action()<cr>", desc = "Code action" },
34
66
35
-
{ "g", group = "goto" },
36
-
{ "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", desc = "Declaration" },
37
-
{ "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", desc = "Definition" },
38
-
{ "gi", "<cmd>lua vim.lsp.buf.implementation()<cr>", desc = "Implementation" },
39
-
{ "gr", "<cmd>lua vim.lsp.buf.references()<cr>", desc = "References" },
67
+
{ "<leader>t", group = "tab" },
68
+
{ "<leader>td", "<cmd>tabclose<cr>", desc = "Close Tab" },
69
+
{ "<leader>tn", "<cmd>tabnew<cr>", desc = "Close Tab" },
40
70
41
-
{ "G", group = "git" },
42
-
-- { "Gd",
71
+
{ "<leader>g", group = "git" },
72
+
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "Lazygit" },
73
+
{ "<leader>gs", "<cmd>Telescope git_status<cr>", desc = "Git status" },
74
+
{ "<leader>gd", "<cmd>Gitsigns diffthis HEAD<cr>", desc = "File diff" },
75
+
{ "<leader>gD", "<cmd>DiffviewOpen<cr>", desc = "Git diff" },
76
+
{ "<leader>Gd", ":Gitsigns diffthis ", desc = "File diff provided ref" },
77
+
{ "<leader>GD", ":DiffviewOpen ", desc = "Diff provided ref" },
78
+
{ "<leader>gh", "<cmd>DiffviewFileHistory<cr>", desc = "File history" },
43
79
})
+8
nvim/lua/plugins/gitsigns.lua
+8
nvim/lua/plugins/gitsigns.lua
+42
nvim/lua/plugins/trouble.lua
+42
nvim/lua/plugins/trouble.lua
···
1
+
return {
2
+
"folke/trouble.nvim",
3
+
opts = {
4
+
focus = true,
5
+
win = {
6
+
position = "right",
7
+
},
8
+
},
9
+
cmd = "Trouble",
10
+
keys = {
11
+
{
12
+
"<leader>xx",
13
+
"<cmd>Trouble diagnostics toggle<cr>",
14
+
desc = "Diagnostics (Trouble)",
15
+
},
16
+
{
17
+
"<leader>xX",
18
+
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
19
+
desc = "Buffer Diagnostics (Trouble)",
20
+
},
21
+
{
22
+
"<leader>cs",
23
+
"<cmd>Trouble symbols toggle focus=false<cr>",
24
+
desc = "Symbols (Trouble)",
25
+
},
26
+
{
27
+
"<leader>cl",
28
+
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
29
+
desc = "LSP Definitions / references / ... (Trouble)",
30
+
},
31
+
{
32
+
"<leader>xL",
33
+
"<cmd>Trouble loclist toggle<cr>",
34
+
desc = "Location List (Trouble)",
35
+
},
36
+
{
37
+
"<leader>xQ",
38
+
"<cmd>Trouble qflist toggle<cr>",
39
+
desc = "Quickfix List (Trouble)",
40
+
},
41
+
},
42
+
}