this repo has no description
drop nvim-tree and trouble!
+48
-117
+7
-6
nvim/lazy-lock.json
+7
-6
nvim/lazy-lock.json
···
1
1
{
2
+
"aerial.nvim": { "branch": "master", "commit": "ddd25f57e5205b36bc2e939c486b47818bef9ec3" },
2
3
"auto-dark-mode.nvim": { "branch": "master", "commit": "4531f8b2b09ed8f0b8875a706419f9cecda1d969" },
3
-
"avante.nvim": { "branch": "main", "commit": "d17905a1c81996985d93551d1a601b86afdc6f5a" },
4
+
"avante.nvim": { "branch": "main", "commit": "2863473bbf575bd7ae3836ed385602515e0fab12" },
4
5
"bufferline.nvim": { "branch": "main", "commit": "5c528bee3dd797d5bd6bae5f229411939b25b203" },
5
6
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
6
7
"copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
···
12
13
"gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },
13
14
"goyo.vim": { "branch": "master", "commit": "fa0263d456dd43f5926484d1c4c7022dfcb21ba9" },
14
15
"img-clip.nvim": { "branch": "main", "commit": "28a32d811d69042f4fa5c3d5fa35571df2bc1623" },
15
-
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
16
+
"lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
16
17
"lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
17
18
"mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
18
19
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
···
20
21
"nvim-cmp": { "branch": "main", "commit": "40a03dc225383c4f6256596c2cdf27e03b8119b5" },
21
22
"nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" },
22
23
"nvim-config-local": { "branch": "main", "commit": "83bb6d9881653a5cf8b489ba8a6fe5a06049a10a" },
23
-
"nvim-lspconfig": { "branch": "master", "commit": "f012c1b176f0e3c71f40eb309bdec0316689462e" },
24
-
"nvim-tree.lua": { "branch": "master", "commit": "c7639482a1598f4756798df1b2d72f79fe5bb34f" },
25
-
"nvim-treesitter": { "branch": "master", "commit": "c50981479e4271ec87c5a15ec991472bdec4f1b8" },
24
+
"nvim-lspconfig": { "branch": "master", "commit": "291a8f1a319dc712db85bcc174b0cf406f0a5b69" },
25
+
"nvim-treesitter": { "branch": "master", "commit": "a3a732107f8b529f97bf4921b3e1af5dcc756bb6" },
26
26
"nvim-web-devicons": { "branch": "master", "commit": "e87554285f581047b1bf236794b0eb812b444b87" },
27
27
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
28
-
"render-markdown.nvim": { "branch": "main", "commit": "430a671655ac84a63f41cd3e940caebdd0a99434" },
28
+
"render-markdown.nvim": { "branch": "main", "commit": "d6a82d70765aa238b7ea48d257a1d57a92501423" },
29
29
"rose-pine": { "branch": "main", "commit": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e" },
30
30
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
31
31
"toggleterm.nvim": { "branch": "main", "commit": "87b2d6a3cab8e2bd9a0255427074285f0365398d" },
32
32
"trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
33
33
"vim-prisma": { "branch": "main", "commit": "95c5b25066efb34c75bce78698baa371fe0ee7c2" },
34
34
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
35
+
"vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
35
36
"which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }
36
37
}
+2
nvim/lua/config/base.lua
+2
nvim/lua/config/base.lua
+31
-6
nvim/lua/config/keys.lua
+31
-6
nvim/lua/config/keys.lua
···
25
25
26
26
vim.cmd("command! LazyGit lua _LAZYGIT_TOGGLE()")
27
27
28
+
function _TOGGLE_QF_LIST()
29
+
local is_open = false
30
+
for _, win in ipairs(vim.fn.getwininfo()) do
31
+
if win.quickfix == 1 then
32
+
is_open = true
33
+
break
34
+
end
35
+
end
36
+
if is_open then
37
+
vim.cmd("cclose")
38
+
else
39
+
vim.cmd("copen")
40
+
end
41
+
end
42
+
28
43
wk.add({
29
44
{ "<C-h>", "<C-w>h", desc = "Move focus to left pane" },
30
45
{ "<C-j>", "<C-w>j", desc = "Move focus to below pane" },
···
35
50
{ "<M-l>", "5zl", desc = "Scroll right" },
36
51
37
52
{ "H", ":bp<cr>", desc = "Switch to previous buffer" },
38
-
{ "L", ":bn<cr>", desc = "Switch to next buffer" },
53
+
{ "L", ":bn<cr>", desc = "Switch to next buffer", remap = false }, -- No remap to prevent disabling in netrw
39
54
-- Prevents the pane from being removed when closing a buffer
40
55
{ "<leader>d", "<cmd>bp<bar>sp<bar>bn<bar>bd<cr>", desc = "Close buffer" },
41
56
{ "<leader>D", "<cmd>bp<bar>sp<bar>bn<bar>bd!<cr>", desc = "Close buffer (force)" },
···
62
77
mode = { "v" },
63
78
},
64
79
65
-
{ "<leader>e", "<cmd>NvimTreeToggle<cr>", desc = "Toggle file tree" },
66
-
{ "E", "<cmd>NvimTreeFindFileToggle<cr>", desc = "Reveal file in file tree" },
80
+
{ "E", "<cmd>e .<cr>", desc = "Toggle netrw" },
67
81
68
82
{ "<leader>h", "<cmd>noh<cr>", desc = "Clear highlight" },
69
83
{ "<leader>v/", "<cmd>vsp<cr>", desc = "Split vertical" },
···
75
89
{ "<leader>sc", "<cmd>Telescope commands<cr>", desc = "Commands" },
76
90
{ "<leader>sb", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
77
91
78
-
{ "<leader>m", "<cmd>Trouble diagnostics toggle<cr>", desc = "Trouble diagnostics" },
79
-
{ "<leader>l", "<cmd>Trouble lsp toggle include_declarations=false<cr>", desc = "Trouble LSP bar" },
80
-
{ "<leader>o", "<cmd>Trouble lsp_document_symbols toggle<cr>", desc = "Symbols outline" },
92
+
-- TODO: Make this a toggle?
93
+
{ "<leader>co", _TOGGLE_QF_LIST, desc = "Toggle QF list" },
94
+
{ "<leader>cn", "<cmd>cnext<cr>", desc = "Next QF item" },
95
+
{ "<leader>cp", "<cmd>cprev<cr>", desc = "Prev QF item" },
96
+
97
+
{
98
+
"<leader>m",
99
+
function()
100
+
vim.diagnostic.setqflist({ open = true, focus = true })
101
+
end,
102
+
desc = "Diagnostics in qf list",
103
+
},
104
+
105
+
{ "<leader>o", "<cmd>AerialToggle<cr>", desc = "Symbols outline" },
81
106
82
107
{ "<leader>Z", "<cmd>Goyo<cr>", desc = "Goyo toggle" },
83
108
+8
-105
nvim/lua/plugins/ui.lua
+8
-105
nvim/lua/plugins/ui.lua
···
7
7
end,
8
8
},
9
9
{
10
-
"nvim-tree/nvim-tree.lua",
11
-
version = "*",
12
-
lazy = false,
13
-
config = function()
14
-
vim.g.loaded_netrw = 1
15
-
vim.g.loaded_netrwPlugin = 1
16
-
17
-
require("nvim-tree").setup({
18
-
hijack_netrw = true,
19
-
disable_netrw = true,
20
-
hijack_directories = {
21
-
enable = true,
22
-
},
23
-
filters = {
24
-
git_ignored = false,
25
-
},
26
-
view = {
27
-
width = 50,
28
-
},
29
-
on_attach = function(bufnr)
30
-
local api = require("nvim-tree.api")
31
-
32
-
local function opts(desc)
33
-
return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
34
-
end
35
-
36
-
-- Defaults applied manually so I can omit the `<C-e>` binding for open in place, and some others
37
-
-- that I just don't use.
38
-
vim.keymap.set("n", "<C-]>", api.tree.change_root_to_node, opts("CD"))
39
-
vim.keymap.set("n", "<C-k>", api.node.show_info_popup, opts("Info"))
40
-
vim.keymap.set("n", "<C-r>", api.fs.rename_sub, opts("Rename: Omit Filename"))
41
-
vim.keymap.set("n", "<C-v>", api.node.open.vertical, opts("Open: Vertical Split"))
42
-
vim.keymap.set("n", "<C-x>", api.node.open.horizontal, opts("Open: Horizontal Split"))
43
-
vim.keymap.set("n", "<CR>", api.node.open.edit, opts("Open"))
44
-
vim.keymap.set("n", "<Tab>", api.node.open.preview, opts("Open Preview"))
45
-
vim.keymap.set("n", ">", api.node.navigate.sibling.next, opts("Next Sibling"))
46
-
vim.keymap.set("n", "<", api.node.navigate.sibling.prev, opts("Previous Sibling"))
47
-
vim.keymap.set("n", ".", api.node.run.cmd, opts("Run Command"))
48
-
vim.keymap.set("n", "-", api.tree.change_root_to_parent, opts("Up"))
49
-
vim.keymap.set("n", "a", api.fs.create, opts("Create"))
50
-
vim.keymap.set("n", "bmv", api.marks.bulk.move, opts("Move Bookmarked"))
51
-
vim.keymap.set("n", "B", api.tree.toggle_no_buffer_filter, opts("Toggle No Buffer"))
52
-
vim.keymap.set("n", "c", api.fs.copy.node, opts("Copy"))
53
-
vim.keymap.set("n", "C", api.tree.toggle_git_clean_filter, opts("Toggle Git Clean"))
54
-
vim.keymap.set("n", "[c", api.node.navigate.git.prev, opts("Prev Git"))
55
-
vim.keymap.set("n", "]c", api.node.navigate.git.next, opts("Next Git"))
56
-
vim.keymap.set("n", "d", api.fs.remove, opts("Delete"))
57
-
vim.keymap.set("n", "D", api.fs.trash, opts("Trash"))
58
-
vim.keymap.set("n", "e", api.fs.rename_basename, opts("Rename: Basename"))
59
-
vim.keymap.set("n", "]e", api.node.navigate.diagnostics.next, opts("Next Diagnostic"))
60
-
vim.keymap.set("n", "[e", api.node.navigate.diagnostics.prev, opts("Prev Diagnostic"))
61
-
vim.keymap.set("n", "F", api.live_filter.clear, opts("Clean Filter"))
62
-
vim.keymap.set("n", "f", api.live_filter.start, opts("Filter"))
63
-
vim.keymap.set("n", "g?", api.tree.toggle_help, opts("Help"))
64
-
vim.keymap.set("n", "gy", api.fs.copy.absolute_path, opts("Copy Absolute Path"))
65
-
vim.keymap.set("n", "H", api.tree.toggle_hidden_filter, opts("Toggle Dotfiles"))
66
-
vim.keymap.set("n", "I", api.tree.toggle_gitignore_filter, opts("Toggle Git Ignore"))
67
-
vim.keymap.set("n", "J", api.node.navigate.sibling.last, opts("Last Sibling"))
68
-
vim.keymap.set("n", "K", api.node.navigate.sibling.first, opts("First Sibling"))
69
-
vim.keymap.set("n", "m", api.marks.toggle, opts("Toggle Bookmark"))
70
-
vim.keymap.set("n", "o", api.node.open.edit, opts("Open"))
71
-
vim.keymap.set("n", "O", api.node.open.no_window_picker, opts("Open: No Window Picker"))
72
-
vim.keymap.set("n", "p", api.fs.paste, opts("Paste"))
73
-
vim.keymap.set("n", "P", api.node.navigate.parent, opts("Parent Directory"))
74
-
vim.keymap.set("n", "q", api.tree.close, opts("Close"))
75
-
vim.keymap.set("n", "r", api.fs.rename, opts("Rename"))
76
-
vim.keymap.set("n", "R", api.tree.reload, opts("Refresh"))
77
-
vim.keymap.set("n", "S", api.tree.search_node, opts("Search"))
78
-
vim.keymap.set("n", "U", api.tree.toggle_custom_filter, opts("Toggle Hidden"))
79
-
vim.keymap.set("n", "W", api.tree.collapse_all, opts("Collapse"))
80
-
vim.keymap.set("n", "x", api.fs.cut, opts("Cut"))
81
-
vim.keymap.set("n", "y", api.fs.copy.filename, opts("Copy Name"))
82
-
vim.keymap.set("n", "Y", api.fs.copy.relative_path, opts("Copy Relative Path"))
83
-
end,
84
-
})
85
-
86
-
-- https://github.com/Gelio/ubuntu-dotfiles/pull/1/files
87
-
-- local winopts = require("nvim-tree.view").View.winopts
88
-
-- winopts.winfixwidth = false
89
-
-- winopts.winfixheight = false
90
-
end,
10
+
"tpope/vim-vinegar", -- netrw improved
91
11
},
92
12
{
93
-
"folke/trouble.nvim",
13
+
"stevearc/aerial.nvim",
94
14
opts = {
95
-
warn_no_results = false,
96
-
open_no_results = true,
97
-
auto_preview = false,
98
-
modes = {
99
-
diagnostics = {
100
-
focus = true,
101
-
format = "{severity_icon} {message:md} {item.source} {code} {pos}",
102
-
},
103
-
lsp_references = {
104
-
-- some modes are configurable, see the source code for more details
105
-
params = {
106
-
include_declaration = false,
107
-
},
108
-
},
109
-
lsp_document_symbols = {
110
-
focus = true,
111
-
win = {
112
-
position = "right",
113
-
size = 50,
114
-
},
115
-
format = "{kind_icon} {symbol.name}",
116
-
},
15
+
-- backends = { "treesitter", "lsp", "markdown", "asciidoc", "man" },
16
+
backends = { "lsp", "markdown", "asciidoc", "man" },
17
+
filter_kind = false,
18
+
layout = {
19
+
max_width = { 40, 0.2 },
20
+
min_width = 30,
117
21
},
118
22
},
119
-
cmd = "Trouble",
120
23
},
121
24
{
122
25
"nvim-telescope/telescope.nvim",