WIP: update-upstream #4

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

View File

@ -27,11 +27,9 @@ autocmd("BufWritePost", {
local config = require "nvconfig" local config = require "nvconfig"
-- statusline -- statusline
if config.ui.statusline.theme ~= "custom" then require("plenary.reload").reload_module "nvchad.stl.utils"
require("plenary.reload").reload_module("nvchad.stl.utils") require("plenary.reload").reload_module("nvchad.stl." .. config.ui.statusline.theme)
require("plenary.reload").reload_module("nvchad.stl." .. config.ui.statusline.theme) vim.opt.statusline = "%!v:lua.require('nvchad.stl." .. config.ui.statusline.theme .. "')()"
vim.opt.statusline = "%!v:lua.require('nvchad.stl." .. config.ui.statusline.theme .. "')()"
end
-- tabufline -- tabufline
if config.ui.tabufline.enabled then if config.ui.tabufline.enabled then

View File

@ -2,7 +2,7 @@ local M = {}
local map = vim.keymap.set local map = vim.keymap.set
local conf = require("nvconfig").ui.lsp local conf = require("nvconfig").ui.lsp
-- export on_attach & capabilities for custom lspconfigs -- export on_attach & capabilities
M.on_attach = function(client, bufnr) M.on_attach = function(client, bufnr)
local function opts(desc) local function opts(desc)
return { buffer = bufnr, desc = desc } return { buffer = bufnr, desc = desc }

View File

@ -1,7 +1,6 @@
local options = { local options = {
filters = { filters = {
dotfiles = false, dotfiles = false,
exclude = { vim.fn.stdpath "config" .. "/lua/custom" },
}, },
disable_netrw = true, disable_netrw = true,
hijack_netrw = true, hijack_netrw = true,
@ -19,7 +18,7 @@ local options = {
preserve_window_proportions = true, preserve_window_proportions = true,
}, },
git = { git = {
enable = false, enable = true,
ignore = true, ignore = true,
}, },
filesystem_watchers = { filesystem_watchers = {
@ -32,7 +31,7 @@ local options = {
}, },
renderer = { renderer = {
root_folder_label = false, root_folder_label = false,
highlight_git = false, highlight_git = true,
highlight_opened_files = "none", highlight_opened_files = "none",
indent_markers = { indent_markers = {
@ -44,7 +43,7 @@ local options = {
file = true, file = true,
folder = true, folder = true,
folder_arrow = true, folder_arrow = true,
git = false, git = true,
}, },
glyphs = { glyphs = {