WIP: update-upstream #4

Closed
cscherrNT wants to merge 69 commits from update-upstream into master
2 changed files with 7 additions and 21 deletions
Showing only changes of commit f48ff142f0 - Show all commits

View File

@ -2,24 +2,8 @@ local M = {}
local utils = require "core.utils" local utils = require "core.utils"
M.blankline = { M.blankline = {
indentLine_enabled = 1, indent = { highlight = "IblChar" },
filetype_exclude = { scope = { highlight = "IblScopeChar" },
"help",
"terminal",
"lazy",
"lspinfo",
"TelescopePrompt",
"TelescopeResults",
"mason",
"nvdash",
"nvcheatsheet",
"",
},
buftype_exclude = { "terminal" },
show_trailing_blankline_indent = false,
show_first_indent_level = false,
show_current_context = true,
show_current_context_start = true,
} }
M.luasnip = function(opts) M.luasnip = function(opts)

View File

@ -6,7 +6,7 @@ local default_plugins = {
{ {
"NvChad/base46", "NvChad/base46",
branch = "v2.0", branch = "v3.0",
build = function() build = function()
require("base46").load_all_highlights() require("base46").load_all_highlights()
end, end,
@ -49,7 +49,6 @@ local default_plugins = {
{ {
"lukas-reineke/indent-blankline.nvim", "lukas-reineke/indent-blankline.nvim",
version = "2.20.7",
init = function() init = function()
require("core.utils").lazy_load "indent-blankline.nvim" require("core.utils").lazy_load "indent-blankline.nvim"
end, end,
@ -59,7 +58,10 @@ local default_plugins = {
config = function(_, opts) config = function(_, opts)
require("core.utils").load_mappings "blankline" require("core.utils").load_mappings "blankline"
dofile(vim.g.base46_cache .. "blankline") dofile(vim.g.base46_cache .. "blankline")
require("indent_blankline").setup(opts)
local hooks = require "ibl.hooks"
hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
require("ibl").setup(opts)
end, end,
}, },