From 02d545cd42ccb4d8bcb6120c18f8d8d27958a1e0 Mon Sep 17 00:00:00 2001 From: siduck Date: Tue, 3 May 2022 00:13:38 +0530 Subject: [PATCH] breaking change: moved highlight stuff to base16 repo | rewrote whole base16 repo Just run :PackerSync, check https://nvchad.github.io/config/Custom%20config#local-themes and the section below it for newly added features --- lua/colors/highlights.lua | 203 ----------------------------- lua/colors/init.lua | 52 -------- lua/core/default_config.lua | 1 + lua/core/utils.lua | 39 ------ lua/plugins/configs/bufferline.lua | 2 +- lua/plugins/configs/icons.lua | 2 +- lua/plugins/configs/lspconfig.lua | 6 +- lua/plugins/configs/nvimtree.lua | 2 +- lua/plugins/configs/statusline.lua | 3 +- lua/plugins/init.lua | 6 +- 10 files changed, 12 insertions(+), 304 deletions(-) delete mode 100644 lua/colors/highlights.lua delete mode 100644 lua/colors/init.lua diff --git a/lua/colors/highlights.lua b/lua/colors/highlights.lua deleted file mode 100644 index 9a86167..0000000 --- a/lua/colors/highlights.lua +++ /dev/null @@ -1,203 +0,0 @@ -local cmd = vim.cmd - -local colors = require("colors").get() -local ui = require("core.utils").load_config().ui - -local black = colors.black -local black2 = colors.black2 -local blue = colors.blue -local darker_black = colors.darker_black -local folder_bg = colors.folder_bg -local green = colors.green -local grey = colors.grey -local grey_fg = colors.grey_fg -local light_grey = colors.light_grey -local line = colors.line -local nord_blue = colors.nord_blue -local one_bg = colors.one_bg -local one_bg2 = colors.one_bg2 -local pmenu_bg = colors.pmenu_bg -local purple = colors.purple -local red = colors.red -local white = colors.white -local yellow = colors.yellow -local orange = colors.orange - --- Disable cursor line -cmd "hi clear CursorLine" - --- highlight groups & colors -local hl_cols = { - - Comment = { fg = grey_fg }, - - -- line numbers - CursorLineNr = { fg = white }, - LineNr = { fg = grey }, - - -- those ugly ~'s - EndOfBuffer = { fg = black }, - - -- floating windows - FloatBorder = { fg = blue }, - NormalFloat = { bg = darker_black }, - - -- Pmenu i.e completion menu - Pmenu = { bg = one_bg }, - PmenuSbar = { bg = one_bg2 }, - PmenuSel = { bg = pmenu_bg, fg = black }, - PmenuThumb = { bg = nord_blue }, - - -- nvim cmp - CmpItemAbbr = { fg = white }, - CmpItemAbbrMatch = { fg = white }, - CmpItemKind = { fg = white }, - CmpItemMenu = { fg = white }, - - NvimInternalError = { fg = red }, - WinSeparator = { fg = one_bg2 }, - - -- Dashboard i.e alpha.nvim - AlphaHeader = { fg = grey_fg }, - AlphaButtons = { fg = light_grey }, - - -- Gitsigns.nvim - DiffAdd = { - fg = blue, - bg = "NONE", - }, - - DiffChange = { - fg = light_grey, - bg = "NONE", - }, - - DiffChangeDelete = { - fg = red, - bg = "NONE", - }, - - DiffModified = { - fg = orange, - bg = "NONE", - }, - - DiffDelete = { - fg = red, - bg = "NONE", - }, - - -- Indent blankline - IndentBlanklineChar = { fg = line }, - IndentBlanklineSpaceChar = { fg = line }, - - -- Lsp Diagnostics - DiagnosticHint = { fg = purple }, - DiagnosticError = { fg = red }, - DiagnosticWarn = { fg = yellow }, - DiagnosticInformation = { fg = green }, - - -- NvimTree - NvimTreeEmptyFolderName = { fg = folder_bg }, - NvimTreeEndOfBuffer = { fg = darker_black }, - NvimTreeFolderIcon = { fg = folder_bg }, - NvimTreeFolderName = { fg = folder_bg }, - NvimTreeGitDirty = { fg = red }, - NvimTreeIndentMarker = { fg = one_bg2 }, - NvimTreeNormal = { bg = darker_black }, - NvimTreeNormalNC = { bg = darker_black }, - NvimTreeOpenedFolderName = { fg = folder_bg }, - - NvimTreeWinSeparator = { - fg = darker_black, - bg = darker_black, - }, - - NvimTreeWindowPicker = { - fg = red, - bg = black2, - }, - - -- Telescope - TelescopeBorder = { - fg = darker_black, - bg = darker_black, - }, - - TelescopePromptBorder = { - fg = black2, - bg = black2, - }, - - TelescopePromptNormal = { - fg = white, - bg = black2, - }, - - TelescopePromptPrefix = { - fg = red, - bg = black2, - }, - - TelescopeNormal = { bg = darker_black }, - - TelescopePreviewTitle = { - fg = black, - bg = green, - }, - - TelescopePromptTitle = { - fg = black, - bg = red, - }, - - TelescopeResultsTitle = { - fg = darker_black, - bg = darker_black, - }, - - TelescopeSelection = { bg = black2 }, -} - -if ui.transparency then - local hl_groups = { - "NormalFloat", - "Normal", - "Folded", - "NvimTreeNormal", - "NvimTreeNormalNC", - "TelescopeNormal", - "TelescopePrompt", - "TelescopeResults", - "TelescopeBorder", - "TelescopePromptBorder", - "TelescopePromptNormal", - "TelescopePromptPrefix", - } - - for index, _ in ipairs(hl_groups) do - hl_cols[hl_groups[index]] = { - bg = "NONE", - } - end - - hl_cols.NvimTreeWinSeparator = { - fg = grey, - bg = "NONE", - } - - hl_cols.TelescopeResultsTitle = { - fg = black, - bg = blue, - } -end - -local utils = require "core.utils" -local user_highlights = utils.load_config().ui.hl_override - --- override user highlights if there are any -hl_cols = vim.tbl_deep_extend("force", hl_cols, user_highlights) - -for hl, col in pairs(hl_cols) do - vim.api.nvim_set_hl(0, hl, col) -end diff --git a/lua/colors/init.lua b/lua/colors/init.lua deleted file mode 100644 index a41533b..0000000 --- a/lua/colors/init.lua +++ /dev/null @@ -1,52 +0,0 @@ -local colors = require("core.utils").load_config().ui.colors -local override = require("core.utils").load_config().ui.hl_override - -local M = {} - --- if theme given, load given theme if given, otherwise nvchad_theme -M.init = function(theme) - if not theme then - theme = require("core.utils").load_config().ui.theme - end - - -- set the global theme, used at various places like theme switcher, highlights - vim.g.nvchad_theme = theme - - local present, base16 = pcall(require, "base16") - - if present then - -- first load the base16 theme - local ok, array = pcall(base16.themes, theme) - - if ok then - base16(array, true) - -- unload to force reload - package.loaded["colors.highlights" or false] = nil - -- then load the highlights - require "colors.highlights" - else - pcall(vim.cmd, "colo " .. theme) - end - else - pcall(vim.cmd, "colo " .. theme) - end - - if #override ~= 0 then - package.loaded[override] = nil - require(override) - end -end - --- returns a table of colors for given or current theme -M.get = function(theme) - if #colors ~= 0 then - return require(colors) - else - if not theme then - theme = vim.g.nvchad_theme - end - return require("hl_themes." .. theme) - end -end - -return M diff --git a/lua/core/default_config.lua b/lua/core/default_config.lua index 242caf2..ad91ead 100644 --- a/lua/core/default_config.lua +++ b/lua/core/default_config.lua @@ -19,6 +19,7 @@ M.options = { M.ui = { hl_override = {}, + changed_themes = {}, colors = "", -- path of your file that contains colors theme = "onedark", -- default theme transparency = false, diff --git a/lua/core/utils.lua b/lua/core/utils.lua index 33b095f..c36510f 100644 --- a/lua/core/utils.lua +++ b/lua/core/utils.lua @@ -1,7 +1,5 @@ local M = {} -local cmd = vim.cmd - M.close_buffer = function(force) if vim.bo.buftype == "terminal" then vim.api.nvim_win_hide(0) @@ -69,43 +67,6 @@ M.packer_lazy_load = function(plugin, timer) end end --- Highlights functions - --- Define bg color --- @param group Group --- @param color Color - -M.bg = function(group, col) - cmd("hi " .. group .. " guibg=" .. col) -end - --- Define fg color --- @param group Group --- @param color Color -M.fg = function(group, col) - cmd("hi " .. group .. " guifg=" .. col) -end - --- Define bg and fg color --- @param group Group --- @param fgcol Fg Color --- @param bgcol Bg Color -M.fg_bg = function(group, fgcol, bgcol) - cmd("hi " .. group .. " guifg=" .. fgcol .. " guibg=" .. bgcol) -end - -M.load_ifExists = function(module) - if #module ~= 0 then - if type(module) == "string" then - require(module) - - -- file[1] = module & file[2] = function - elseif type(module) == "table" then - require(module[1])[module[2]]() - end - end -end - -- remove plugins defined in chadrc M.remove_default_plugins = function(plugins) local removals = require("core.utils").load_config().plugins.remove or {} diff --git a/lua/plugins/configs/bufferline.lua b/lua/plugins/configs/bufferline.lua index 3c127bc..2b80332 100644 --- a/lua/plugins/configs/bufferline.lua +++ b/lua/plugins/configs/bufferline.lua @@ -3,7 +3,7 @@ if not present then return end -local colors = require("colors").get() +local colors = require("base16").get_colors("base_30") local options = { options = { diff --git a/lua/plugins/configs/icons.lua b/lua/plugins/configs/icons.lua index 479008d..78db7d3 100644 --- a/lua/plugins/configs/icons.lua +++ b/lua/plugins/configs/icons.lua @@ -4,7 +4,7 @@ if not present then return end -local colors = require("colors").get() +local colors = require("base16").get_colors("base_30") local options = { override = { diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua index 4c375ed..8222cde 100644 --- a/lua/plugins/configs/lspconfig.lua +++ b/lua/plugins/configs/lspconfig.lua @@ -2,11 +2,7 @@ local M = {} require("plugins.configs.others").lsp_handlers() -function M.on_attach(client, bufnr) - local function buf_set_option(...) - vim.api.nvim_buf_set_option(bufnr, ...) - end - +function M.on_attach(client, _) client.resolved_capabilities.document_formatting = false client.resolved_capabilities.document_range_formatting = false diff --git a/lua/plugins/configs/nvimtree.lua b/lua/plugins/configs/nvimtree.lua index 2276248..b242a56 100644 --- a/lua/plugins/configs/nvimtree.lua +++ b/lua/plugins/configs/nvimtree.lua @@ -34,7 +34,7 @@ g.nvim_tree_icons = { default = "", empty = "", empty_open = "", - open = "", + open = " ", symlink = "", symlink_open = "", }, diff --git a/lua/plugins/configs/statusline.lua b/lua/plugins/configs/statusline.lua index 2d2cbf8..7f01fba 100644 --- a/lua/plugins/configs/statusline.lua +++ b/lua/plugins/configs/statusline.lua @@ -4,7 +4,8 @@ if not present then return end -local colors = require("colors").get() +local colors = require("base16").get_colors("base_30") + local lsp = require "feline.providers.lsp" local lsp_severity = vim.diagnostic.severity diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 14e2f3a..cd4330f 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -18,7 +18,11 @@ local plugins = { ["NvChad/nvim-base16.lua"] = { after = "packer.nvim", config = function() - require("colors").init() + local ok, base16 = pcall(require, "base16") + + if ok then + base16.load_theme() + end end, },