diff --git a/lua/core/default_config.lua b/lua/core/default_config.lua index bd9e0379..6e5e70b2 100644 --- a/lua/core/default_config.lua +++ b/lua/core/default_config.lua @@ -14,11 +14,9 @@ M.ui = { -- hl = highlights hl_add = {}, hl_override = {}, - changed_themes = {}, theme_toggle = { "onedark", "one_light" }, theme = "onedark", -- default theme - transparency = false, -- cmp themeing diff --git a/lua/core/options.lua b/lua/core/options.lua index b2620138..ee8671c0 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -49,13 +49,7 @@ opt.whichwrap:append "<>[]hl" g.mapleader = " " -local default_providers = { - "node", - "perl", - "python3", - "ruby", -} - -for _, provider in ipairs(default_providers) do +-- disable some default providers +for _, provider in ipairs { "node", "perl", "python3", "ruby" } do vim.g["loaded_" .. provider .. "_provider"] = 0 end diff --git a/lua/core/utils.lua b/lua/core/utils.lua index b9f70ae8..bc20de67 100644 --- a/lua/core/utils.lua +++ b/lua/core/utils.lua @@ -3,7 +3,6 @@ local merge_tb = vim.tbl_deep_extend M.load_config = function() local config = require "core.default_config" - local chadrc_path = vim.api.nvim_get_runtime_file("lua/custom/chadrc.lua", false)[1] if chadrc_path then @@ -57,6 +56,7 @@ M.load_mappings = function(section, mapping_opt) if section_values.plugin then return end + section_values.plugin = nil for mode, mode_values in pairs(section_values) do diff --git a/lua/plugins/configs/lazy_nvim.lua b/lua/plugins/configs/lazy_nvim.lua index 4e357fd3..dbb3abc7 100644 --- a/lua/plugins/configs/lazy_nvim.lua +++ b/lua/plugins/configs/lazy_nvim.lua @@ -1,12 +1,6 @@ return { - defaults = { - lazy = true, - }, - - install = { - -- try to load one of these colorschemes when starting an installation during startup - colorscheme = { "nvchad" }, - }, + defaults = { lazy = true }, + install = { colorscheme = { "nvchad" } }, ui = { icons = { diff --git a/lua/plugins/configs/nvterm.lua b/lua/plugins/configs/nvterm.lua deleted file mode 100644 index cdcaa59c..00000000 --- a/lua/plugins/configs/nvterm.lua +++ /dev/null @@ -1,27 +0,0 @@ -require "base46.term" - -local options = { - terminals = { - list = {}, - type_opts = { - float = { - relative = "editor", - row = 0.3, - col = 0.25, - width = 0.5, - height = 0.4, - border = "single", - }, - horizontal = { location = "rightbelow", split_ratio = 0.3 }, - vertical = { location = "rightbelow", split_ratio = 0.5 }, - }, - }, - behavior = { - close_on_exit = true, - auto_insert = true, - }, - enable_new_mappings = true, -} - -options = require("core.utils").load_override(options, "NvChad/nvterm") -require("nvterm").setup(options) diff --git a/lua/plugins/configs/treesitter.lua b/lua/plugins/configs/treesitter.lua index da8cf3cd..782f36df 100644 --- a/lua/plugins/configs/treesitter.lua +++ b/lua/plugins/configs/treesitter.lua @@ -1,18 +1,14 @@ dofile(vim.g.base46_cache .. "syntax") local options = { - ensure_installed = { - "lua", - }, + ensure_installed = { "lua" }, highlight = { enable = true, use_languagetree = true, }, - indent = { - enable = true, - }, + indent = { enable = true }, } -- check for any override diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 19fcee09..0c33db9d 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -20,7 +20,9 @@ local plugins = { ["NvChad/nvterm"] = { config = function() - require "plugins.configs.nvterm" + require "base46.term" + local options = require("core.utils").load_override({}, "NvChad/nvterm") + require("nvterm").setup(options) end, init = function() require("core.utils").load_mappings "nvterm"