WIP: update-upstream #4

Closed
cscherrNT wants to merge 69 commits from update-upstream into master
3 changed files with 23 additions and 8 deletions
Showing only changes of commit cc3289639b - Show all commits

View File

@ -14,9 +14,6 @@ M.ui = {
theme = "onedark", -- default theme
transparency = false,
-- https://github.com/NvChad/base46/tree/v2.0/lua/base46/extended_integrations
extended_integrations = {}, -- these aren't compiled by default, ex: "alpha", "notify"
-- cmp themeing
cmp = {
icons = true,
@ -92,4 +89,25 @@ M.lazy_nvim = require "plugins.configs.lazy_nvim" -- config for lazy.nvim startu
M.mappings = require "core.mappings"
M.base46 = {
integrations = {
"blankline",
"cmp",
"defaults",
"devicons",
"git",
"lsp",
"mason",
"nvchad_updater",
"nvcheatsheet",
"nvdash",
"nvimtree",
"statusline",
"syntax",
"tbline",
"telescope",
"whichkey",
},
}
return M

View File

@ -86,9 +86,6 @@ autocmd("BufWritePost", {
local config = require "nvconfig"
vim.g.nvchad_theme = config.ui.theme
vim.g.transparency = config.ui.transparency
-- statusline
if config.ui.statusline.theme ~= "custom" then
require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme)

View File

@ -3,8 +3,8 @@ local M = {}
-- export on_attach & capabilities for custom lspconfigs
M.on_attach = function(client, bufnr)
local utils = require "core.utils"
local conf = require "nvconfig"
local conf = require("nvconfig").ui.lsp
-- semanticTokens
if not conf.semantic_tokens and client.supports_method "textDocument/semanticTokens" then
client.server_capabilities.semanticTokensProvider = nil