Skip to content

Commit 8b68865

Browse files
brycewalkerdevbrycewalkerdev
committed
For babes
1 parent 9a96351 commit 8b68865

17 files changed

+331
-118
lines changed

‎lazy-lock.json

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,52 @@
11
{
22
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3-
"LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" },
3+
"LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
44
"beacon.nvim": { "branch": "master", "commit": "a786c9a89b2c739c69f9500a2f70f2586c06ec27" },
55
"betterTerm.nvim": { "branch": "main", "commit": "ffc3cd82a616061e0df93f3bc4c0aab32de75995" },
6-
"catppuccin": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" },
7-
"cmake-tools.nvim": { "branch": "master", "commit": "8506c426d5b361dbaa7c61c0490a2589a9c555ce" },
6+
"clangd_extensions.nvim": { "branch": "main", "commit": "430a8f56605cb1d0ed9876301d6e9bf675195e16" },
7+
"cmake-tools.nvim": { "branch": "master", "commit": "b221c5973ca520b0f079e16cd9919a8d944f7890" },
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": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
12-
"gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" },
11+
"friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
12+
"gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
1313
"glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
14-
"inc-rename.nvim": { "branch": "main", "commit": "5e03e986625961d1fac296d1bf332a6510c3add6" },
14+
"gruvbox.nvim": { "branch": "main", "commit": "c442515506caa166118e157980f62a9ac24fa8c3" },
15+
"image.nvim": { "branch": "master", "commit": "66af29f7244256eea82b2583ab65c2fab0567d0d" },
16+
"inc-rename.nvim": { "branch": "main", "commit": "1d7d3f647d0928614c00ca9ef4ce695c45147c05" },
1517
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
16-
"lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
18+
"lazy.nvim": { "branch": "main", "commit": "e44636a43376e8a1e851958f7e9cbe996751d59f" },
1719
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
18-
"mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" },
20+
"luarocks.nvim": { "branch": "main", "commit": "d3dda396d66e484590f253d1ac6d8980e3130807" },
21+
"mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
1922
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
20-
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
23+
"mason.nvim": { "branch": "main", "commit": "1b3d60405d1d720b2c4927f19672e9479703b00f" },
2124
"nabla.nvim": { "branch": "master", "commit": "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f" },
2225
"neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
2326
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
24-
"neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" },
25-
"noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
26-
"nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
27-
"nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
28-
"nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
29-
"nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" },
30-
"nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
31-
"nvim-lspconfig": { "branch": "master", "commit": "b73f30d113ace671bcf1f731dfc66987880410e6" },
32-
"nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
33-
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
34-
"nvim-treesitter": { "branch": "master", "commit": "40e8c92f99ef26625ff2206f5e183ac3109f20ba" },
35-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "6e9bb569a510bdfab6095c217a2f714af7a3d116" },
36-
"nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" },
37-
"obsidian.nvim": { "branch": "main", "commit": "9644aca08334bb3f6fbeeccacc9e4dbb5855577e" },
38-
"plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
39-
"rainbow-delimiters.nvim": { "branch": "master", "commit": "0563a31b1f46a911865cb85df3ddde2eff9fdada" },
40-
"suda.vim": { "branch": "master", "commit": "d0ccc1a5172f6a26182238767e60e08b931d11fa" },
27+
"neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" },
28+
"noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" },
29+
"nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" },
30+
"nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" },
31+
"nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" },
32+
"nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" },
33+
"nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
34+
"nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" },
35+
"nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
36+
"nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" },
37+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" },
38+
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
39+
"obsidian.nvim": { "branch": "main", "commit": "db41b1f20459293436fab510bec58c82a73bd1f7" },
40+
"plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
41+
"rainbow-delimiters.nvim": { "branch": "master", "commit": "dd1156723eb8483e4403eb8765bbdff456b6981d" },
42+
"suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" },
4143
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
4244
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
4345
"telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
4446
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
4547
"tree-sitter-hyprlang": { "branch": "master", "commit": "e5da7d0aa44403153e0394d87d9edea4e5bd6609" },
46-
"trouble.nvim": { "branch": "dev", "commit": "10eff94809ecd6ee6cc59f42e9521b9b8a14e9ce" },
47-
"vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" },
48+
"trouble.nvim": { "branch": "dev", "commit": "52fe175294a4ccd4b759c59a08ae45b768ffda1c" },
49+
"vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" },
4850
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
4951
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
5052
"vim-startify": { "branch": "master", "commit": "4e089dffdad46f3f5593f34362d530e8fe823dcf" },

‎lua/keymaps.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local keymaps = {
66
-- Keymaps for better default experience
77
-- See `:help vim.keymap.set()`
88
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
9-
vim.keymap.set('n', '<leader>sa', '<cmd>:wa<CR>', { desc = '[S]ave [A]ll buffers' })
9+
-- vim.keymap.set('n', '<leader>sa', '<cmd>:wa<CR>', { desc = '[S]ave [A]ll buffers' })
1010
vim.keymap.set('n', '<Esc>', '<cmd> noh <CR>', { desc = 'Clear highlighting' })
1111

1212
-- Remap for dealing with word wrap

‎lua/options.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
-- See `:help vim.o`
33
-- NOTE: You can change these options as you wish!
44
--
5+
56
vim.o.laststatus = 3 -- For horizontal split border
67

78
vim.o.tabstop = 2
@@ -55,13 +56,13 @@ vim.opt.splitbelow = true
5556
-- See `:help 'list'`
5657
-- and `:help 'listchars'`
5758
vim.opt.list = true
58-
vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
59+
vim.opt.listchars = { tab = '󰌒 ', trail = '·', nbsp = '␣' }
5960

6061
-- Show which line your cursor is on
6162
vim.opt.cursorline = true
6263

6364
-- Minimal number of screen lines to keep above and below the cursor.
64-
vim.opt.scrolloff = 10
65+
vim.opt.scrolloff = 999
6566

6667
-- Preview substitutions live, as you type!
6768
vim.opt.inccommand = 'split'

‎lua/plugin-manifest.lua

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ return {
1818
require('plugins/comment'),
1919
-- Additional Plugins
2020
require('plugins/obsidian'),
21-
require('plugins/notify'),
21+
-- require('plugins/notify'),
2222
require('plugins/start-screen'),
2323
require('plugins/noice'), -- causing fidget to still exist
2424
require('plugins/file-tree'),
@@ -34,5 +34,8 @@ return {
3434
require('plugins.nabla'),
3535
require('plugins.errors'),
3636
require('plugins.win-picker'),
37-
require('plugins.terminal')
37+
require('plugins.clangd-extensions'),
38+
require('plugins.terminal'),
39+
require('plugins.rocks'),
40+
require('plugins.image')
3841
}

‎lua/plugins/autoformat.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
return {
77
'neovim/nvim-lspconfig',
8+
lazy = true,
89
config = function()
910
-- Switch for controlling whether you want autoformatting.
1011
-- Use :KickstartFormatToggle to toggle autoformatting on or off

‎lua/plugins/clangd-extensions.lua

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
return {
2+
"p00f/clangd_extensions.nvim",
3+
lazy = true,
4+
config = function() end,
5+
opts = {
6+
inlay_hints = {
7+
inline = false,
8+
},
9+
ast = {
10+
--These require codicons (https://github.com/microsoft/vscode-codicons)
11+
role_icons = {
12+
type = "",
13+
declaration = "",
14+
expression = "",
15+
specifier = "",
16+
statement = "",
17+
["template argument"] = "",
18+
},
19+
kind_icons = {
20+
Compound = "",
21+
Recovery = "",
22+
TranslationUnit = "",
23+
PackExpansion = "",
24+
TemplateTypeParm = "",
25+
TemplateTemplateParm = "",
26+
TemplateParamObject = "",
27+
},
28+
},
29+
},
30+
}

‎lua/plugins/file-tree.lua

Lines changed: 77 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,95 @@
11
return {
22
"nvim-neo-tree/neo-tree.nvim",
3+
lazy = true,
34
branch = "v3.x",
45
dependencies = {
56
"nvim-lua/plenary.nvim",
67
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
78
"MunifTanjim/nui.nvim",
8-
-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
9+
"3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
910
},
11+
keys = {
12+
{
13+
"<C-n>",
14+
"<cmd> Neotree toggle <cr>",
15+
"Toggle filetree"
16+
}
17+
},
18+
1019
config = function()
1120
require("neo-tree").setup({
12-
source_selector = {
13-
winbar = false,
14-
statusline = false
15-
},
21+
sources = { "filesystem", "buffers", "git_status", "document_symbols" },
22+
open_files_do_not_replace_types = { "terminal", "Trouble", "trouble", "qf", "Outline" },
1623
window = {
24+
position = "left",
25+
width = 40,
26+
mapping_options = {
27+
noremap = true,
28+
nowait = true,
29+
},
1730
mappings = {
31+
["<space>"] = {
32+
"toggle_node",
33+
nowait = false, -- disable `nowait` if you have existing combos starting with this char that you want to use
34+
},
35+
["<2-LeftMouse>"] = "open",
36+
["<cr>"] = "open",
37+
["<esc>"] = "cancel", -- close preview or floating neo-tree window
1838
["P"] = { "toggle_preview", config = { use_float = false, use_image_nvim = true } },
39+
-- Read `# Preview Mode` for more information
40+
["l"] = "focus_preview",
41+
["S"] = "open_split",
42+
["s"] = "open_vsplit",
43+
-- ["S"] = "split_with_window_picker",
44+
-- ["s"] = "vsplit_with_window_picker",
45+
["t"] = "open_tabnew",
46+
-- ["<cr>"] = "open_drop",
47+
-- ["t"] = "open_tab_drop",
48+
["w"] = "open_with_window_picker",
49+
--["P"] = "toggle_preview", -- enter preview mode, which shows the current node without focusing
50+
["C"] = "close_node",
51+
-- ['C'] = 'close_all_subnodes',
52+
["z"] = "close_all_nodes",
53+
--["Z"] = "expand_all_nodes",
54+
["a"] = {
55+
"add",
56+
-- this command supports BASH style brace expansion ("x{a,b,c}" -> xa,xb,xc). see `:h neo-tree-file-actions` for details
57+
-- some commands may take optional config options, see `:h neo-tree-mappings` for details
58+
config = {
59+
show_path = "none" -- "none", "relative", "absolute"
60+
}
61+
},
62+
["A"] = "add_directory", -- also accepts the optional config.show_path option like "add". this also supports BASH style brace expansion.
63+
["d"] = "delete",
64+
["r"] = "rename",
65+
["y"] = "copy_to_clipboard",
66+
["x"] = "cut_to_clipboard",
67+
["p"] = "paste_from_clipboard",
68+
["c"] = "copy", -- takes text input for destination, also accepts the optional config.show_path option like "add":
69+
-- ["c"] = {
70+
-- "copy",
71+
-- config = {
72+
-- show_path = "none" -- "none", "relative", "absolute"
73+
-- }
74+
--}
75+
["m"] = "move", -- takes text input for destination, also accepts the optional config.show_path option like "add".
76+
["q"] = "close_window",
77+
["R"] = "refresh",
78+
["?"] = "show_help",
79+
["<"] = "prev_source",
80+
[">"] = "next_source",
81+
["i"] = "show_file_details",
1982
}
20-
}
83+
},
84+
default_component_configs = {
85+
indent = {
86+
with_expanders = true, -- if nil and file nesting is enabled, will enable expanders
87+
expander_collapsed = "",
88+
expander_expanded = "",
89+
expander_highlight = "NeoTreeExpander",
90+
},
91+
},
2192
})
22-
require('keymaps').map_file_tree();
2393
end
2494
}
2595

0 commit comments

Comments
 (0)