Skip to content

Commit 2a17ee3

Browse files
brycewalkerdevbrycewalkerdev
committed
Added some more goodies
1 parent 366b712 commit 2a17ee3

File tree

11 files changed

+230
-110
lines changed

11 files changed

+230
-110
lines changed

‎init.lua

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,23 @@ vim.g.maplocalleader = ' '
66
vim.wo.relativenumber = true
77
vim.opt.conceallevel = 1
88

9-
require('lazy-bootstrap')
9+
if vim.g.vscode then
10+
-- VSCode extension
11+
else
12+
-- ordinary Neovim
13+
require('lazy-bootstrap')
1014

11-
require('lazy').setup({
12-
{ import = 'plugin-manifest' },
13-
}, {
14-
defaults = {
15-
-- lazy = true
16-
}
17-
})
18-
19-
require('options')
20-
21-
require('lsp-cfg')
22-
23-
require('keymaps').map_basic()
15+
require('lazy').setup({
16+
{ import = 'plugin-manifest' },
17+
}, {
18+
defaults = {
19+
-- lazy = true
20+
}
21+
})
22+
require('options')
23+
require('lsp-cfg')
24+
require('keymaps').map_basic()
25+
end
2426

2527
-- The line beneath this is called `modeline`. See `:help modeline`
2628
-- vim: ts=2 sts=2 sw=2 et

‎lazy-lock.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
2020
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
2121
"nabla.nvim": { "branch": "master", "commit": "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f" },
22+
"neo-tree.nvim": { "branch": "v3.x", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" },
2223
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
2324
"neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" },
2425
"noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
@@ -30,7 +31,6 @@
3031
"nvim-lspconfig": { "branch": "master", "commit": "e25c4cdecd3d58c0deccce0f372426c8c480bcce" },
3132
"nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
3233
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
33-
"nvim-tree.lua": { "branch": "master", "commit": "ddd1d6eb21c45433bdc65cc8015f2457998f2bf2" },
3434
"nvim-treesitter": { "branch": "master", "commit": "c16f66cca0c38b4e21371d8330b7f2ad6404f6dc" },
3535
"nvim-treesitter-textobjects": { "branch": "master", "commit": "2aa454e4037424c678a8ff033951a5be39e54b9c" },
3636
"nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" },
@@ -43,9 +43,11 @@
4343
"telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
4444
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
4545
"tree-sitter-hyprlang": { "branch": "master", "commit": "e5da7d0aa44403153e0394d87d9edea4e5bd6609" },
46+
"trouble.nvim": { "branch": "dev", "commit": "10eff94809ecd6ee6cc59f42e9521b9b8a14e9ce" },
4647
"vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" },
4748
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
4849
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
4950
"vim-startify": { "branch": "master", "commit": "4e089dffdad46f3f5593f34362d530e8fe823dcf" },
50-
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
51+
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
52+
"window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }
5153
}

‎lua/keymaps.lua

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ local keymaps = {
1919
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
2020
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
2121

22+
-- Buffers and Tabs
23+
vim.keymap.set('n', '<leader>x', '<cmd>bdelete<CR>', { desc = 'Close current buffer' })
24+
vim.keymap.set('n', '<leader><tab>', '<cmd>tabnew<CR>', { desc = 'Move to next tab' })
25+
vim.keymap.set('n', '<tab>', '<cmd>tabn<CR>', { desc = 'Move to next tab' })
26+
vim.keymap.set('n', '<S-tab>', '<cmd>tabp<CR>', { desc = 'Move to previous tab' })
27+
vim.keymap.set('n', '<leader>X', '<cmd>bdelete!<CR>', { desc = 'Force close current buffer' })
28+
2229
-- Move between windows
2330
vim.keymap.set('n', '<C-h>', '<C-w>h', { desc = 'Window left' })
2431
vim.keymap.set('n', '<C-l>', '<C-w>l', { desc = 'Window right' })
@@ -112,6 +119,12 @@ local keymaps = {
112119
{ desc = 'Hover Latex' })
113120
end,
114121

122+
map_file_tree = function()
123+
vim.keymap.set('n', '<C-n>', '<Cmd>Neotree toggle<CR>')
124+
-- vim.keymap.set('n', '<C-n>', '<cmd>Neotree toggle<CR>',
125+
-- { desc = 'Toggle filetree' })
126+
end,
127+
115128
map_better_term = function()
116129
local betterTerm = require('betterTerm')
117130
vim.keymap.set({ "n", "t" }, "<C-;>", betterTerm.open, { desc = "Open terminal" })

‎lua/options.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
-- [[ Setting options ]]
22
-- See `:help vim.o`
33
-- NOTE: You can change these options as you wish!
4+
--
5+
vim.o.laststatus = 3 -- For horizontal split border
46

57
vim.o.tabstop = 2
68

@@ -63,6 +65,7 @@ vim.opt.scrolloff = 10
6365

6466
-- Preview substitutions live, as you type!
6567
vim.opt.inccommand = 'split'
68+
6669
-- [[ Highlight on yank ]]
6770
-- See `:help vim.highlight.on_yank()`
6871
local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })

‎lua/plugin-manifest.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,7 @@ return {
3232
require('plugins/cmake-tools'),
3333
require('plugins/suda'),
3434
require('plugins.nabla'),
35+
require('plugins.errors'),
36+
require('plugins.win-picker'),
3537
require('plugins.terminal')
3638
}

‎lua/plugins/debug.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ return {
7272

7373
dap.listeners.after.event_initialized['dapui_config'] = function()
7474
-- Close Nvim-Tree using api
75-
vim.cmd('NvimTreeClose')
75+
-- vim.cmd('NvimTreeClose')
76+
vim.cmd('Neotree close')
7677
dapui.open()
7778
end
7879
dap.listeners.before.event_terminated['dapui_config'] = function()

‎lua/plugins/errors.lua

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
return {
2+
"folke/trouble.nvim",
3+
branch = "dev", -- IMPORTANT!
4+
keys = {
5+
{
6+
"<leader>xx",
7+
"<cmd>Trouble diagnostics toggle<cr>",
8+
desc = "Diagnostics (Trouble)",
9+
},
10+
{
11+
"<leader>xX",
12+
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
13+
desc = "Buffer Diagnostics (Trouble)",
14+
},
15+
{
16+
"<leader>cs",
17+
"<cmd>Trouble symbols toggle focus=false<cr>",
18+
desc = "Symbols (Trouble)",
19+
},
20+
{
21+
"<leader>cl",
22+
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
23+
desc = "LSP Definitions / references / ... (Trouble)",
24+
},
25+
{
26+
"<leader>xL",
27+
"<cmd>Trouble loclist toggle<cr>",
28+
desc = "Location List (Trouble)",
29+
},
30+
{
31+
"<leader>xQ",
32+
"<cmd>Trouble qflist toggle<cr>",
33+
desc = "Quickfix List (Trouble)",
34+
},
35+
},
36+
opts = {}, -- for default options, refer to the configuration section for custom setup.
37+
}

‎lua/plugins/file-tree.lua

Lines changed: 94 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,101 @@
1-
-- -- Unless you are still migrating, remove the deprecated commands from v1.x
2-
-- vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
3-
--
4-
-- return {
5-
-- "nvim-neo-tree/neo-tree.nvim",
6-
-- version = "*",
7-
-- dependencies = {
8-
-- "nvim-lua/plenary.nvim",
9-
-- "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
10-
-- "MunifTanjim/nui.nvim",
11-
-- "3rd/image.nvim",
12-
-- },
13-
-- config = function()
14-
-- require('neo-tree').setup {}
15-
-- vim.keymap.set('n', '<C-n>', '<cmd>Neotree toggle<CR>', { desc = '[F]iletree [T]oggle' })
16-
-- end,
17-
-- }
18-
--
191
return {
20-
"nvim-tree/nvim-tree.lua",
21-
version = "*",
22-
lazy = true,
23-
keys = {
24-
-- vim.keymap.set('n', '<C-n>', '<cmd>NvimTreeToggle<CR>', { desc = 'Toggle Filetree' })
25-
{ "<C-N>", "<cmd>NvimTreeToggle<CR>", desc = "Toggle Filetree" },
26-
},
2+
"nvim-neo-tree/neo-tree.nvim",
3+
branch = "v3.x",
274
dependencies = {
28-
"nvim-tree/nvim-web-devicons",
5+
"nvim-lua/plenary.nvim",
6+
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
7+
"MunifTanjim/nui.nvim",
8+
-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
299
},
3010
config = function()
31-
local setup, nvimtree = pcall(require, "nvim-tree")
32-
if not setup then return end
33-
34-
vim.cmd([[
35-
nnoremap - :NvimTreeToggle<CR>
36-
]])
37-
38-
-- local keymap = vim.keymap -- for conciseness
39-
-- keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>") -- toggle file explorer
40-
41-
-- vim.opt.foldmethod = "expr"
42-
-- vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
43-
-- vim.opt.foldenable = false -- " Disable folding at startup.
44-
45-
vim.g.loaded_netrw = 1
46-
vim.g.loaded_netrwPlugin = 1
47-
48-
vim.opt.termguicolors = true
49-
50-
local HEIGHT_RATIO = 0.8 -- You can change this
51-
local WIDTH_RATIO = 0.5 -- You can change this too
52-
53-
nvimtree.setup({
54-
disable_netrw = true,
55-
hijack_netrw = true,
56-
respect_buf_cwd = true,
57-
sync_root_with_cwd = true,
58-
view = {
59-
relativenumber = true,
60-
float = {
61-
enable = true,
62-
open_win_config = function()
63-
local screen_w = vim.opt.columns:get()
64-
local screen_h = vim.opt.lines:get() - vim.opt.cmdheight:get()
65-
local window_w = screen_w * WIDTH_RATIO
66-
local window_h = screen_h * HEIGHT_RATIO
67-
local window_w_int = math.floor(window_w)
68-
local window_h_int = math.floor(window_h)
69-
local center_x = (screen_w - window_w) / 2
70-
local center_y = ((vim.opt.lines:get() - window_h) / 2)
71-
- vim.opt.cmdheight:get()
72-
return {
73-
border = "rounded",
74-
relative = "editor",
75-
row = center_y,
76-
col = center_x,
77-
width = window_w_int,
78-
height = window_h_int,
79-
}
80-
end,
81-
},
82-
width = function()
83-
return math.floor(vim.opt.columns:get() * WIDTH_RATIO)
84-
end,
11+
require("neo-tree").setup({
12+
source_selector = {
13+
winbar = false,
14+
statusline = false
8515
},
86-
-- filters = {
87-
-- custom = { "^.git$" },
88-
-- },
89-
-- renderer = {
90-
-- indent_width = 1,
91-
-- },
16+
window = {
17+
mappings = {
18+
["P"] = { "toggle_preview", config = { use_float = false, use_image_nvim = true } },
19+
}
20+
}
9221
})
93-
end,
22+
require('keymaps').map_file_tree();
23+
end
9424
}
25+
26+
-- return {
27+
-- "nvim-tree/nvim-tree.lua",
28+
-- version = "*",
29+
-- lazy = true,
30+
-- keys = {
31+
-- -- vim.keymap.set('n', '<C-n>', '<cmd>NvimTreeToggle<CR>', { desc = 'Toggle Filetree' })
32+
-- { "<C-N>", "<cmd>NvimTreeToggle<CR>", desc = "Toggle Filetree" },
33+
-- },
34+
-- dependencies = {
35+
-- "nvim-tree/nvim-web-devicons",
36+
-- },
37+
-- config = function()
38+
-- local setup, nvimtree = pcall(require, "nvim-tree")
39+
-- if not setup then return end
40+
--
41+
-- vim.cmd([[
42+
-- nnoremap - :NvimTreeToggle<CR>
43+
-- ]])
44+
--
45+
-- -- local keymap = vim.keymap -- for conciseness
46+
-- -- keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>") -- toggle file explorer
47+
--
48+
-- -- vim.opt.foldmethod = "expr"
49+
-- -- vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
50+
-- -- vim.opt.foldenable = false -- " Disable folding at startup.
51+
--
52+
-- vim.g.loaded_netrw = 1
53+
-- vim.g.loaded_netrwPlugin = 1
54+
--
55+
-- vim.opt.termguicolors = true
56+
--
57+
-- local HEIGHT_RATIO = 0.8 -- You can change this
58+
-- local WIDTH_RATIO = 0.5 -- You can change this too
59+
--
60+
-- nvimtree.setup({
61+
-- disable_netrw = true,
62+
-- hijack_netrw = true,
63+
-- respect_buf_cwd = true,
64+
-- sync_root_with_cwd = true,
65+
-- view = {
66+
-- relativenumber = true,
67+
-- float = {
68+
-- enable = true,
69+
-- open_win_config = function()
70+
-- local screen_w = vim.opt.columns:get()
71+
-- local screen_h = vim.opt.lines:get() - vim.opt.cmdheight:get()
72+
-- local window_w = screen_w * WIDTH_RATIO
73+
-- local window_h = screen_h * HEIGHT_RATIO
74+
-- local window_w_int = math.floor(window_w)
75+
-- local window_h_int = math.floor(window_h)
76+
-- local center_x = (screen_w - window_w) / 2
77+
-- local center_y = ((vim.opt.lines:get() - window_h) / 2)
78+
-- - vim.opt.cmdheight:get()
79+
-- return {
80+
-- border = "rounded",
81+
-- relative = "editor",
82+
-- row = center_y,
83+
-- col = center_x,
84+
-- width = window_w_int,
85+
-- height = window_h_int,
86+
-- }
87+
-- end,
88+
-- },
89+
-- width = function()
90+
-- return math.floor(vim.opt.columns:get() * WIDTH_RATIO)
91+
-- end,
92+
-- },
93+
-- -- filters = {
94+
-- -- custom = { "^.git$" },
95+
-- -- },
96+
-- -- renderer = {
97+
-- -- indent_width = 1,
98+
-- -- },
99+
-- })
100+
-- end,
101+
-- }

‎lua/plugins/noice.lua

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ return {
1515
require("noice").setup({
1616
lsp = {
1717
progress = {
18-
enabled = false,
18+
-- enabled = false,
1919
},
20+
21+
2022
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
2123
override = {
2224
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
@@ -26,11 +28,26 @@ return {
2628
},
2729
-- you can enable a preset for easier configuration
2830
presets = {
29-
-- bottom_search = true, -- use a classic bottom cmdline for search
30-
-- command_palette = true, -- position the cmdline and popupmenu together
31+
bottom_search = true, -- use a classic bottom cmdline for search
32+
-- command_palette = true, -- position the cmdline and popupmenu together
3133
long_message_to_split = true, -- long messages will be sent to a split
32-
inc_rename = true, -- enables an input dialog for inc-rename.nvim
33-
lsp_doc_border = true, -- add a border to hover docs and signature help
34+
inc_rename = true, -- enables an input dialog for inc-rename.nvim
35+
lsp_doc_border = true, -- add a border to hover docs and signature help
36+
},
37+
38+
cmdline = {
39+
view = "cmdline",
40+
},
41+
42+
routes = {
43+
{
44+
filter = {
45+
event = "msg_show",
46+
kind = "",
47+
find = "written",
48+
},
49+
opts = { skip = true },
50+
},
3451
},
3552
})
3653
end

0 commit comments

Comments
 (0)