From 34602cfadf21db367e4e0c81a22133adc28ae149 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Thu, 4 Jul 2024 10:14:45 +0200 Subject: [PATCH] holy hell nvchad is a cancer --- .github/README.md | 1 - README.md | 1 - init.lua | 1 - lua/core/bootstrap.lua | 9 --------- lua/core/default_config.lua | 2 -- lua/core/init.lua | 1 - lua/custom/chadrc.lua | 5 ++--- lua/custom/mappings.lua | 2 -- lua/custom/plugins.lua | 3 +-- lua/plugins/configs/cmp.lua | 1 - lua/plugins/configs/lspconfig.lua | 1 - lua/plugins/configs/telescope.lua | 2 +- lua/plugins/init.lua | 11 ----------- 13 files changed, 4 insertions(+), 36 deletions(-) diff --git a/.github/README.md b/.github/README.md index 8f3ec47..55c76fc 100644 --- a/.github/README.md +++ b/.github/README.md @@ -86,7 +86,6 @@ A fuzzy file finder, picker, sorter, previewer and much more: ## Plugins list -- Many beautiful themes, theme toggler by our [base46 plugin](https://github.com/NvChad/base46) - Inbuilt terminal toggling & management with [Nvterm](https://github.com/NvChad/nvterm) - Lightweight & performant ui plugin with [NvChad UI](https://github.com/NvChad/ui) It provides statusline modules, tabufline ( tabs + buffer manager) , beautiful cheatsheets, NvChad updater, hide & unhide terminal buffers, theme switcher and much more! - File navigation with [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua) diff --git a/README.md b/README.md index 6df115a..4ae672d 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,6 @@ A fuzzy file finder, picker, sorter, previewer and much more: ## Plugins list -- Many beautiful themes, theme toggler by our [base46 plugin](https://github.com/NvChad/base46) - Inbuilt terminal toggling & management with [Nvterm](https://github.com/NvChad/nvterm) - Lightweight & performant ui plugin with [NvChad UI](https://github.com/NvChad/ui) It provides statusline modules, tabufline ( tabs + buffer manager) , beautiful cheatsheets, NvChad updater, hide & unhide terminal buffers, theme switcher and much more! - File navigation with [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua) diff --git a/init.lua b/init.lua index 21f0b6f..64fca35 100644 --- a/init.lua +++ b/init.lua @@ -16,6 +16,5 @@ if not vim.loop.fs_stat(lazypath) then require("core.bootstrap").lazy(lazypath) end -dofile(vim.g.base46_cache .. "defaults") vim.opt.rtp:prepend(lazypath) require "plugins" diff --git a/lua/core/bootstrap.lua b/lua/core/bootstrap.lua index a5d5c68..0b4ffa3 100644 --- a/lua/core/bootstrap.lua +++ b/lua/core/bootstrap.lua @@ -12,16 +12,10 @@ local function shell_call(args) end M.lazy = function(install_path) - ------------- base46 --------------- - local lazy_path = fn.stdpath "data" .. "/lazy/base46" - M.echo " Compiling base46 theme to bytecode ..." - local base46_repo = "https://github.com/NvChad/base46" - shell_call { "git", "clone", "--depth", "1", "-b", "v2.0", base46_repo, lazy_path } vim.opt.rtp:prepend(lazy_path) - require("base46").compile() --------- lazy.nvim --------------- M.echo " Installing lazy.nvim & plugins ..." @@ -31,9 +25,6 @@ M.lazy = function(install_path) -- install plugins require "plugins" - - -- mason packages & show post_bootstrap screen - require "nvchad.post_install"() end M.gen_chadrc_template = function() diff --git a/lua/core/default_config.lua b/lua/core/default_config.lua index 639916a..a2722b1 100644 --- a/lua/core/default_config.lua +++ b/lua/core/default_config.lua @@ -5,7 +5,6 @@ M.options = { } M.ui = { - ------------------------------- base46 ------------------------------------- -- hl = highlights hl_add = {}, hl_override = {}, @@ -15,7 +14,6 @@ M.ui = { transparency = false, lsp_semantic_tokens = false, -- needs nvim v0.9, just adds highlight groups for lsp semantic tokens - -- 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 diff --git a/lua/core/init.lua b/lua/core/init.lua index ce8db46..2aaadaa 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -4,7 +4,6 @@ local config = require("core.utils").load_config() -------------------------------------- globals ----------------------------------------- g.nvchad_theme = config.ui.theme -g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" g.toggle_theme_icon = "  " g.transparency = config.ui.transparency diff --git a/lua/custom/chadrc.lua b/lua/custom/chadrc.lua index ba6b286..c6a4274 100644 --- a/lua/custom/chadrc.lua +++ b/lua/custom/chadrc.lua @@ -5,8 +5,8 @@ local M = {} local highlights = require "custom.highlights" M.ui = { - theme = "oceanic-next", - theme_toggle = { "oceanic-next", "ayu_light" }, + theme = "bearded-arc", + theme_toggle = { "bearded-arc", "ayu_light" }, hl_override = highlights.override, hl_add = highlights.add, @@ -59,7 +59,6 @@ local get_info = function() " Toggle Theme", "th", function() - require("base46").toggle_theme() end, }, { " Mappings", "ch", "NvCheatsheet" }, diff --git a/lua/custom/mappings.lua b/lua/custom/mappings.lua index 9d35e04..60350e2 100644 --- a/lua/custom/mappings.lua +++ b/lua/custom/mappings.lua @@ -489,13 +489,11 @@ M.ui = { }, ["th"] = { function() - require("base46").toggle_theme() end, "toggle theme", }, ["te"] = { function() - require("base46").toggle_transparency() end, "toggle transparency", }, diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index 46fa878..c1bc06e 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -940,7 +940,7 @@ local plugins = { }, { "NvChad/ui", - enabled = true, + enabled = false, branch = "v2.0", lazy = false, }, @@ -949,7 +949,6 @@ local plugins = { lazy = false, dependencies = { "nvim-tree/nvim-web-devicons", - "NvChad/ui", -- load after nvchad ui }, config = function() -- TODO: add lsp module for lualine diff --git a/lua/plugins/configs/cmp.lua b/lua/plugins/configs/cmp.lua index 444da73..d99f594 100644 --- a/lua/plugins/configs/cmp.lua +++ b/lua/plugins/configs/cmp.lua @@ -1,6 +1,5 @@ local cmp = require "cmp" -dofile(vim.g.base46_cache .. "cmp") local cmp_ui = require("core.utils").load_config().ui.cmp local cmp_style = cmp_ui.style diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua index f824aa0..dbbeae3 100644 --- a/lua/plugins/configs/lspconfig.lua +++ b/lua/plugins/configs/lspconfig.lua @@ -1,4 +1,3 @@ -dofile(vim.g.base46_cache .. "lsp") require "nvchad.lsp" local M = {} diff --git a/lua/plugins/configs/telescope.lua b/lua/plugins/configs/telescope.lua index 784fb19..ffbb506 100644 --- a/lua/plugins/configs/telescope.lua +++ b/lua/plugins/configs/telescope.lua @@ -49,7 +49,7 @@ local options = { }, }, - extensions_list = { "themes", "terms" }, + extensions_list = { }, } return options diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 8f458ec..79b32a4 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -20,11 +20,7 @@ local default_plugins = { { "nvim-tree/nvim-web-devicons", - opts = function() - return { override = require "nvchad.icons.devicons" } - end, config = function(_, opts) - dofile(vim.g.base46_cache .. "devicons") require("nvim-web-devicons").setup(opts) end, }, @@ -40,7 +36,6 @@ local default_plugins = { end, config = function(_, opts) require("core.utils").load_mappings "blankline" - dofile(vim.g.base46_cache .. "blankline") require("indent_blankline").setup(opts) end, }, @@ -56,7 +51,6 @@ local default_plugins = { return require "plugins.configs.treesitter" end, config = function(_, opts) - dofile(vim.g.base46_cache .. "syntax") require("nvim-treesitter.configs").setup(opts) end, }, @@ -89,7 +83,6 @@ local default_plugins = { return require("plugins.configs.others").gitsigns end, config = function(_, opts) - dofile(vim.g.base46_cache .. "git") require("gitsigns").setup(opts) end, }, @@ -102,7 +95,6 @@ local default_plugins = { return require "plugins.configs.mason" end, config = function(_, opts) - dofile(vim.g.base46_cache .. "mason") require("mason").setup(opts) -- custom nvchad cmd to install all mason binaries listed @@ -203,7 +195,6 @@ local default_plugins = { return require "plugins.configs.nvimtree" end, config = function(_, opts) - dofile(vim.g.base46_cache .. "nvimtree") require("nvim-tree").setup(opts) end, }, @@ -219,7 +210,6 @@ local default_plugins = { return require "plugins.configs.telescope" end, config = function(_, opts) - dofile(vim.g.base46_cache .. "telescope") local telescope = require "telescope" telescope.setup(opts) @@ -239,7 +229,6 @@ local default_plugins = { end, cmd = "WhichKey", config = function(_, opts) - dofile(vim.g.base46_cache .. "whichkey") require("which-key").setup(opts) end, },