WIP: update-upstream #4

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

View File

@ -12,7 +12,7 @@ autocmd("FileType", {
autocmd("BufWritePost", {
pattern = vim.tbl_map(function(path)
return vim.fs.normalize(vim.loop.fs_realpath(path))
end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/custom/**/*.lua", true, true, true)),
end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/**/*.lua", true, true, true)),
group = vim.api.nvim_create_augroup("ReloadNvChad", {}),
callback = function(opts)

View File

@ -1,5 +1,5 @@
local options = {
ensure_installed = { "lua-language-server" }, -- not an option from mason.nvim
ensure_installed = { "lua-language-server", 'stylua' }, -- not an option from mason.nvim
PATH = "skip",

View File

@ -10,7 +10,7 @@ return {
{
"NvChad/ui",
branch = "v3.0",
branch = "starter",
lazy = false,
config = function()
require "nvchad"

View File

@ -25,15 +25,15 @@ M.ui = {
-- default/round/block/arrow separators work only for default statusline theme
-- round and block will work for minimal theme only
separator_style = "default",
overriden_modules = nil,
order=nil,
},
-- lazyload it when there are 1+ buffers
tabufline = {
show_numbers = false,
enabled = true,
lazyload = true,
overriden_modules = nil,
order= {'treeOffset', 'buffers' , 'tabs', 'btns'},
modules = nil,
},
-- nvdash (dashboard)
@ -86,8 +86,6 @@ M.ui = {
},
}
M.plugins = "" -- path i.e "custom.plugins", so make custom/plugins.lua file
M.base46 = {
integrations = {
"blankline",
@ -110,10 +108,6 @@ M.base46 = {
},
}
local chadrc_exists, chadrc = pcall(require, "custom.chadrc")
if chadrc_exists then
M = vim.tbl_deep_extend("force", M, chadrc)
end
M = vim.tbl_deep_extend("force", M, require('chadrc'))
return M