Skip to content

Commit 786f7e4

Browse files
General cleanup to make things nicer. Added autobrackets, and rainbow brackets
1 parent a3a218e commit 786f7e4

13 files changed

+45
-29
lines changed

init.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ require('lazy-bootstrap')
1010

1111
require('lazy').setup({
1212
{ import = 'plugins/manifest' },
13-
}, {})
13+
}, {
14+
defaults = {
15+
-- lazy = true
16+
}
17+
})
1418

1519
require('options')
1620

lazy-lock.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,44 @@
22
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
33
"LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
44
"beacon.nvim": { "branch": "master", "commit": "a786c9a89b2c739c69f9500a2f70f2586c06ec27" },
5-
"bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" },
6-
"catppuccin": { "branch": "main", "commit": "6853cc8e6efc76e85e10ec153d05fc2520653508" },
7-
"cmake-tools.nvim": { "branch": "master", "commit": "aba5b805082b3c1027ac4f5051b84c61989c34c8" },
5+
"bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" },
6+
"catppuccin": { "branch": "main", "commit": "afab7ec2a79c7127627dede79c0018b6e45663d0" },
7+
"cmake-tools.nvim": { "branch": "master", "commit": "b7554dd2aeb436012b852a3d30780c00a2f9f30b" },
88
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
99
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
1010
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
11-
"friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
12-
"gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" },
11+
"friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" },
12+
"gitsigns.nvim": { "branch": "main", "commit": "0a2a93f687ec051292943a4d139366332ac93688" },
1313
"glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
1414
"inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
1515
"indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
16-
"lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
17-
"lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" },
18-
"mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" },
16+
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
17+
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
18+
"mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" },
1919
"mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
20-
"mason.nvim": { "branch": "main", "commit": "bce96d2fd483e71826728c6f9ac721fc9dd7d2cf" },
21-
"neodev.nvim": { "branch": "main", "commit": "aaeb44589cab39c2545a328661af355622d68479" },
20+
"mason.nvim": { "branch": "main", "commit": "dcd0ea30ccfc7d47e879878d1270d6847a519181" },
21+
"neodev.nvim": { "branch": "main", "commit": "3408a4daeca5ff8f41cb2c668b6d8fcc665f793a" },
2222
"neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
23-
"noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" },
23+
"noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
2424
"nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
2525
"nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
2626
"nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" },
27-
"nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" },
28-
"nvim-dap-ui": { "branch": "master", "commit": "a62e86b124a94ad1f34a3f936ea146d00aa096d1" },
27+
"nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
2928
"nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" },
3029
"nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" },
3130
"nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" },
32-
"nvim-treesitter": { "branch": "master", "commit": "94bd4bcc5bbce8334303727627b628ece72e798d" },
31+
"nvim-treesitter": { "branch": "master", "commit": "cb79d2446196d25607eb1d982c96939abdf67b8e" },
3332
"nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" },
34-
"nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" },
35-
"obsidian.nvim": { "branch": "main", "commit": "e2d6ce7b07941b0788177e1297699ad99c1470dc" },
33+
"nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" },
34+
"obsidian.nvim": { "branch": "main", "commit": "f604a30f74617850ca91a85fd35118ad6325bd5e" },
3635
"plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" },
36+
"rainbow-delimiters.nvim": { "branch": "master", "commit": "35530b4ad48f01bdaa852da34e4de9930fb54c89" },
3737
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
3838
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
3939
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
4040
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
4141
"tree-sitter-hyprlang": { "branch": "master", "commit": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee" },
42+
"vim-closer": { "branch": "master", "commit": "6007d9db0a35e983af246b667282606612076b07" },
4243
"vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" },
4344
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
4445
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },

lua/keymaps.lua

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ local keymaps = {
8181
{ desc = '[D]ocument [C]ode' })
8282
end,
8383

84-
map_filetree = function()
85-
vim.keymap.set('n', '<C-n>', '<cmd>NvimTreeToggle<CR>', { desc = 'Toggle Filetree' })
86-
end,
87-
8884
map_tabline = function()
8985
vim.keymap.set('n', '<Tab>', function() require('bufferline').cycle(1) end,
9086
{ desc = 'Move to next buffer on bufferline' })

lua/options.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
-- See `:help vim.o`
33
-- NOTE: You can change these options as you wish!
44

5+
vim.o.tabstop = 2
6+
7+
vim.o.shiftwidth = 2
8+
9+
vim.o.expandtab = true
10+
511
-- Set highlight on search
612
vim.o.hlsearch = false
713

lua/plugins/brackets.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
return {
2+
"rstacruz/vim-closer",
3+
}

lua/plugins/debug.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
return {
1010
-- NOTE: Yes, you can install new plugins here!
1111
'mfussenegger/nvim-dap',
12+
lazy = true,
1213
-- NOTE: And you can specify dependencies as well
1314
dependencies = {
1415
-- Creates a beautiful debugger UI
@@ -19,7 +20,7 @@ return {
1920
'jay-babu/mason-nvim-dap.nvim',
2021

2122
-- Add your own debuggers here
22-
'leoluz/nvim-dap-go',
23+
-- 'leoluz/nvim-dap-go',
2324
},
2425

2526
config = function(_, _)
@@ -80,7 +81,7 @@ return {
8081
end
8182

8283
-- Install golang specific config
83-
require('dap-go').setup()
84+
-- require('dap-go').setup()
8485

8586
-- Load Launch JS
8687
require('dap.ext.vscode').load_launchjs(nil, { cppdbg = { 'c', 'cpp' } })

lua/plugins/file-tree.lua

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
return {
2020
"nvim-tree/nvim-tree.lua",
2121
version = "*",
22-
lazy = false,
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+
},
2327
dependencies = {
2428
"nvim-tree/nvim-web-devicons",
2529
},
@@ -86,6 +90,5 @@ return {
8690
-- indent_width = 1,
8791
-- },
8892
})
89-
require('keymaps').map_filetree()
9093
end,
9194
}

lua/plugins/hyprlang.lua

Lines changed: 0 additions & 3 deletions
This file was deleted.

lua/plugins/indent-blankline.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ return {
44
'lukas-reineke/indent-blankline.nvim',
55
-- Enable `lukas-reineke/indent-blankline.nvim`
66
-- See `:help ibl`
7+
event = "InsertEnter",
78
main = 'ibl',
89
opts = {},
910
}

lua/plugins/manifest.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ return {
2727
require('plugins.comments'),
2828
require('plugins.beacon'),
2929
require('plugins.neogen'),
30+
require('plugins.brackets'),
3031
-- require('plugins.copilot'),
31-
require('plugins.hyprlang'),
3232
require('plugins.cmake-tools'),
3333
}

0 commit comments

Comments
 (0)