Skip to content

Commit bcc3d0c

Browse files
brycewalkerdevbrycewalkerdev
committed
pulling up to date
1 parent 8f8d1c1 commit bcc3d0c

File tree

6 files changed

+112
-10
lines changed

6 files changed

+112
-10
lines changed

‎init.lua

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
vim.g.mapleader = ' '
55
vim.g.maplocalleader = ' '
66
vim.wo.relativenumber = true
7+
vim.opt.conceallevel = 1
78

89
-- [[ Install `lazy.nvim` plugin manager ]]
910
-- https://github.com/folke/lazy.nvim
@@ -466,7 +467,7 @@ vim.defer_fn(function()
466467
local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
467468
parser_config.hypr = {
468469
install_info = {
469-
url = "https://github.com/luckasRanarison/tree-sitter-hypr",
470+
url = "https://github.com/luckasRanarison/tree-sitter-hyprlang",
470471
files = { "src/parser.c" },
471472
branch = "master",
472473
},
@@ -641,6 +642,13 @@ require('luasnip.loaders.from_vscode').lazy_load()
641642
luasnip.config.setup {}
642643

643644
cmp.setup {
645+
window = {
646+
-- NOTE: You can set this to try to avoid showing extra documentation
647+
-- See `:help cmp-config` for more information
648+
completion = cmp.config.window.bordered(),
649+
documentation = cmp.config.window.bordered(),
650+
651+
},
644652
preselect = cmp.PreselectMode.None, -- NOTE: Added this to stop selecting first opt
645653
snippet = {
646654
expand = function(args)

‎lazy-lock.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,33 @@
1212
"fidget.nvim": { "branch": "main", "commit": "3a93300c076109d86c7ce35ec67a8034ae6ba9db" },
1313
"friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
1414
"gitsigns.nvim": { "branch": "main", "commit": "4aaacbf5e5e2218fd05eb75703fe9e0f85335803" },
15+
"glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
1516
"indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
1617
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
1718
"lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" },
18-
"mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" },
19+
"mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" },
1920
"mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
2021
"mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
21-
"neodev.nvim": { "branch": "main", "commit": "dde00106b9094f101980b364fae02fd85d357306" },
22+
"neodev.nvim": { "branch": "main", "commit": "8947132fb831f166179af81fca2cb073503250ae" },
2223
"neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
24+
"noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" },
25+
"nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
2326
"nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
24-
"nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" },
27+
"nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" },
2528
"nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" },
2629
"nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" },
27-
"nvim-lspconfig": { "branch": "master", "commit": "e47ccfae775f0d572ef0f3a7d245f043b259dafc" },
30+
"nvim-lspconfig": { "branch": "master", "commit": "7eed8b2150192e5ad05e1886fdf133493ddf2928" },
31+
"nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" },
2832
"nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" },
29-
"nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" },
30-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" },
31-
"nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" },
33+
"nvim-treesitter": { "branch": "master", "commit": "fcf843bf14adaeee53aad1b28fabba1d3b62fc8d" },
34+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" },
35+
"nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" },
36+
"obsidian.nvim": { "branch": "main", "commit": "bc2561cd4d8049a5c91415f15bfb5c3e68b79c48" },
3237
"plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
3338
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
3439
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
3540
"todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
36-
"tree-sitter-hypr": { "branch": "master", "commit": "42aa7274b5f093cec92b7a5bab629ba26b4be439" },
41+
"tree-sitter-hyprlang": { "branch": "master", "commit": "42aa7274b5f093cec92b7a5bab629ba26b4be439" },
3742
"vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" },
3843
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
3944
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },

‎lua/custom/plugins/noice.lua

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
-- lazy.nvim
2+
return {
3+
"folke/noice.nvim",
4+
event = "VeryLazy",
5+
opts = {
6+
-- add any options here
7+
},
8+
dependencies = {
9+
-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
10+
"MunifTanjim/nui.nvim",
11+
-- OPTIONAL:
12+
-- `nvim-notify` is only needed, if you want to use the notification view.
13+
-- If not available, we use `mini` as the fallback
14+
"rcarriga/nvim-notify",
15+
}
16+
}

‎lua/custom/plugins/notify.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
return {
2+
3+
"rcarriga/nvim-notify",
4+
config = function()
5+
require("notify").setup({
6+
background_colour = "#000000",
7+
render = "compact",
8+
})
9+
end
10+
}

‎lua/custom/plugins/obsidian.lua

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
return {
2+
"epwalsh/obsidian.nvim",
3+
version = "*", -- recommended, use latest release instead of latest commit
4+
lazy = true,
5+
ft = "markdown",
6+
-- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault:
7+
-- event = {
8+
-- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
9+
-- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/**.md"
10+
-- "BufReadPre path/to/my-vault/**.md",
11+
-- "BufNewFile path/to/my-vault/**.md",
12+
-- },
13+
dependencies = {
14+
-- Required.
15+
"nvim-lua/plenary.nvim",
16+
17+
-- see below for full list of optional dependencies 👇
18+
},
19+
opts = {
20+
workspaces = {
21+
{
22+
name = "personal",
23+
path = "~/Walker-Brain-Fork/",
24+
},
25+
},
26+
detect_cwd = true,
27+
-- Optional, completion of wiki links, local markdown links, and tags using nvim-cmp.
28+
completion = {
29+
-- Set to false to disable completion.
30+
nvim_cmp = true,
31+
32+
-- Trigger completion at 2 chars.
33+
min_chars = 2,
34+
35+
-- Where to put new notes created from completion. Valid options are
36+
-- * "current_dir" - put new notes in same directory as the current buffer.
37+
-- * "notes_subdir" - put new notes in the default notes subdirectory.
38+
new_notes_location = "current_dir",
39+
40+
-- Control how wiki links are completed with these (mutually exclusive) options:
41+
--
42+
-- 1. Whether to add the note ID during completion.
43+
-- E.g. "[[Foo" completes to "[[foo|Foo]]" assuming "foo" is the ID of the note.
44+
-- Mutually exclusive with 'prepend_note_path' and 'use_path_only'.
45+
prepend_note_id = true,
46+
-- 2. Whether to add the note path during completion.
47+
-- E.g. "[[Foo" completes to "[[notes/foo|Foo]]" assuming "notes/foo.md" is the path of the note.
48+
-- Mutually exclusive with 'prepend_note_id' and 'use_path_only'.
49+
prepend_note_path = false,
50+
-- 3. Whether to only use paths during completion.
51+
-- E.g. "[[Foo" completes to "[[notes/foo]]" assuming "notes/foo.md" is the path of the note.
52+
-- Mutually exclusive with 'prepend_note_id' and 'prepend_note_path'.
53+
use_path_only = false,
54+
},
55+
finder = "telescope.nvim",
56+
57+
-- see below for full list of options 👇
58+
},
59+
}

‎lua/custom/plugins/plugins.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
--
44
-- See the kickstart.nvim README for more information
55
return {
6+
require('custom.plugins.obsidian'),
7+
require('custom.plugins.notify'),
68
require('custom.plugins.file_tree'),
9+
require('custom.plugins.noice'),
710
require('custom.plugins.start_screen'),
811
require('custom.plugins.tab_line'),
12+
{ "ellisonleao/glow.nvim", config = true, cmd = "Glow" },
913
{
1014
'folke/todo-comments.nvim',
1115
dependencies = { "nvim-lua/plenary.nvim" },
@@ -46,6 +50,6 @@ return {
4650
end
4751
},
4852
{
49-
"luckasRanarison/tree-sitter-hypr"
53+
"luckasRanarison/tree-sitter-hyprlang"
5054
},
5155
}

0 commit comments

Comments
 (0)