Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(nvim): add hlchunk, remove indent-blankline and rainbow-delimiters #372

Merged
merged 1 commit into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 11 additions & 29 deletions config/.config/nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ vim.opt.completeopt = 'menu,menuone,noselect'

-- show whitespace chars
vim.opt.list = true
vim.opt.listchars = 'tab:»-,trail:_,extends:»,precedes:«,nbsp:・'
vim.opt.listchars = 'tab:│─,trail:_,extends:»,precedes:«,nbsp:・'

-- search
vim.opt.ignorecase = true
Expand Down Expand Up @@ -216,11 +216,6 @@ require('lazy').setup({
},
'nvim-treesitter/nvim-treesitter-textobjects', -- required by nvim-surround
'JoosepAlviste/nvim-ts-context-commentstring',
{
'HiPhish/rainbow-delimiters.nvim',
version = '*',
init = require('pluginconfig.treesitter').init_rainbow_delimiters,
},
{
'haringsrob/nvim_context_vt',
init = require('pluginconfig.treesitter').init_context_vt,
Expand Down Expand Up @@ -287,10 +282,6 @@ require('lazy').setup({
integrations = {
aerial = true,
fidget = true,
indent_blankline = {
enabled = true,
colored_indent_levels = true,
},
lsp_saga = true,
mason = true,
which_key = true,
Expand Down Expand Up @@ -420,32 +411,23 @@ require('lazy').setup({
config = require('pluginconfig.modes').setup,
},
{
'lukas-reineke/indent-blankline.nvim',
"shellRaining/hlchunk.nvim",
cond = not vim.g.vscode,
version = '*',
main = 'ibl',
event = { 'BufReadPost', 'BufAdd', 'BufNewFile' },
config = function()
require('ibl').setup({
indent = {
char = '│',
tab_char = '│'
},
scope = {
show_start = false,
highlight = {
'RainbowRed',
'RainbowYellow',
'RainbowBlue',
'RainbowOrange',
'RainbowGreen',
'RainbowViolet',
'RainbowCyan',
local palette = require('colors').palette
require("hlchunk").setup({
chunk = {
style = {
{ fg = palette.sapphire },
{ fg = palette.red },
}
},
indent = { enable = true },
line_num = { enable = false },
blank = { enable = false },
})
local hooks = require('ibl.hooks')
hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
end
},
{
Expand Down
3 changes: 1 addition & 2 deletions config/.config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"flit.nvim": { "branch": "main", "commit": "04f744bbb2b91fb2ad2c702b5eb8e23d17924fa6" },
"git.nvim": { "branch": "main", "commit": "6b4a66f8a66e567bf27a0ef1de72cf5e338df4c3" },
"gitsigns.nvim": { "branch": "main", "commit": "81369ed5405ec0c5d55a9608b495dbf827415116" },
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
"hlchunk.nvim": { "branch": "main", "commit": "8b3bfc331eeb62e6105b2fdb51b460f7423c6ec7" },
"lasterisk.nvim": { "branch": "main", "commit": "bbcfcaeca50f686e338a03386e41645fc3305f44" },
"lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
"leap.nvim": { "branch": "main", "commit": "ea61597e64189fdeca49898f9e2a548a6ebbbab6" },
Expand Down Expand Up @@ -56,7 +56,6 @@
"nvim_context_vt": { "branch": "master", "commit": "8f7b6b46292e0819290b0d368abc3366b8a163fc" },
"package-info.nvim": { "branch": "master", "commit": "45acce5b12ce824332d8000cc2c91805b6710446" },
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "a249476e451673f7811852d93109dff19311ee39" },
"telescope-alternate.nvim": { "branch": "master", "commit": "89ca203921e4f9282f1e1b72d600077be87d3770" },
"telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
"telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
Expand Down
14 changes: 0 additions & 14 deletions config/.config/nvim/lua/pluginconfig/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,6 @@ function M.setup_treesitter_context()
})
end

function M.init_rainbow_delimiters()
local rainbow_delimiters = require('rainbow-delimiters')
vim.g.rainbow_delimiters = {
strategy = {
[''] = rainbow_delimiters.strategy['global'],
vim = rainbow_delimiters.strategy['local'],
},
query = {
[''] = 'rainbow-delimiters',
lua = 'rainbow-blocks',
},
}
end

function M.setup_context_vt()
require('nvim_context_vt').setup({
min_rows = 3,
Expand Down