From 1db5a6eda8494edf724ec6e16f3286d7d26643b9 Mon Sep 17 00:00:00 2001 From: siduck Date: Tue, 3 May 2022 00:07:51 +0530 Subject: [PATCH] re-write whole plugin added features to have local nvchad themes, override specific colors aka variables in nvchad themes --- lua/base16.lua | 254 +++--------------- lua/chadlights.lua | 21 ++ lua/hl_themes/aquarium.lua | 27 +- lua/hl_themes/blossom.lua | 27 +- lua/hl_themes/catppuccin.lua | 27 +- lua/hl_themes/chadracula.lua | 27 +- lua/hl_themes/chadtain.lua | 27 +- lua/hl_themes/classic-dark.lua | 35 --- lua/hl_themes/{doom-chad.lua => doomchad.lua} | 27 +- lua/hl_themes/everforest.lua | 27 +- lua/hl_themes/gruvbox.lua | 27 +- lua/hl_themes/gruvchad.lua | 27 +- lua/hl_themes/javacafe.lua | 27 +- lua/hl_themes/jellybeans.lua | 27 +- lua/hl_themes/kanagawa.lua | 89 +++--- lua/hl_themes/lfgruv.lua | 35 --- lua/hl_themes/monekai.lua | 89 +++--- lua/hl_themes/monokai.lua | 35 --- lua/hl_themes/mountain.lua | 27 +- lua/hl_themes/night-owl.lua | 35 --- lua/hl_themes/nightlamp.lua | 89 +++--- .../nightowl.lua} | 42 ++- lua/hl_themes/nord.lua | 27 +- .../{one-light.lua => one_light.lua} | 27 +- lua/hl_themes/onebright.lua | 35 --- lua/hl_themes/onedark-deep.lua | 35 --- lua/hl_themes/onedark.lua | 27 +- lua/hl_themes/onejelly.lua | 35 --- lua/hl_themes/onenord.lua | 27 +- lua/hl_themes/palenight.lua | 29 +- lua/hl_themes/paradise.lua | 35 --- lua/hl_themes/penokai.lua | 35 --- lua/hl_themes/solarized.lua | 27 +- lua/hl_themes/tokyodark.lua | 26 +- lua/hl_themes/tokyonight.lua | 25 +- ...{tomorrow-night.lua => tomorrow_night.lua} | 27 +- lua/hl_themes/wombat.lua | 27 +- lua/integrations/git.lua | 69 +++++ lua/integrations/mail.lua | 35 +++ lua/integrations/misc.lua | 189 +++++++++++++ lua/integrations/nvchad.lua | 197 ++++++++++++++ lua/integrations/syntax.lua | 114 ++++++++ lua/integrations/treesitter.lua | 168 ++++++++++++ lua/themes/aquarium-base16.lua | 20 -- lua/themes/blossom-base16.lua | 18 -- lua/themes/catppuccin-base16.lua | 18 -- lua/themes/chadracula-base16.lua | 18 -- lua/themes/chadtain-base16.lua | 18 -- lua/themes/classic-dark-base16.lua | 18 -- lua/themes/doom-chad-base16.lua | 18 -- lua/themes/everforest-base16.lua | 18 -- lua/themes/gruvbox-base16.lua | 18 -- lua/themes/gruvchad-base16.lua | 18 -- lua/themes/javacafe-base16.lua | 18 -- lua/themes/jellybeans-base16.lua | 18 -- lua/themes/kanagawa-base16.lua | 19 -- lua/themes/lfgruv-base16.lua | 19 -- lua/themes/monekai-base16.lua | 18 -- lua/themes/monokai-base16.lua | 18 -- lua/themes/mountain-base16.lua | 18 -- lua/themes/nightlamp-base16.lua | 19 -- lua/themes/nord-base16.lua | 18 -- lua/themes/one-light-base16.lua | 18 -- lua/themes/onebright-base16.lua | 18 -- lua/themes/onedark-base16.lua | 18 -- lua/themes/onedark-deep-base16.lua | 18 -- lua/themes/onejelly-base16.lua | 18 -- lua/themes/onenord-base16.lua | 18 -- lua/themes/palenight-base16.lua | 18 -- lua/themes/paradise-base16.lua | 19 -- lua/themes/penokai-base16.lua | 18 -- lua/themes/solarized-base16.lua | 18 -- lua/themes/tokyodark-base16.lua | 18 -- lua/themes/tokyonight-base16.lua | 18 -- lua/themes/tomorrow-night-base16.lua | 18 -- lua/themes/wombat-base16.lua | 18 -- 76 files changed, 1586 insertions(+), 1278 deletions(-) create mode 100644 lua/chadlights.lua delete mode 100644 lua/hl_themes/classic-dark.lua rename lua/hl_themes/{doom-chad.lua => doomchad.lua} (62%) delete mode 100644 lua/hl_themes/lfgruv.lua delete mode 100644 lua/hl_themes/monokai.lua delete mode 100644 lua/hl_themes/night-owl.lua rename lua/{themes/night-owl-base16.lua => hl_themes/nightowl.lua} (54%) rename lua/hl_themes/{one-light.lua => one_light.lua} (62%) delete mode 100644 lua/hl_themes/onebright.lua delete mode 100644 lua/hl_themes/onedark-deep.lua delete mode 100644 lua/hl_themes/onejelly.lua delete mode 100644 lua/hl_themes/paradise.lua delete mode 100644 lua/hl_themes/penokai.lua rename lua/hl_themes/{tomorrow-night.lua => tomorrow_night.lua} (61%) create mode 100644 lua/integrations/git.lua create mode 100644 lua/integrations/mail.lua create mode 100644 lua/integrations/misc.lua create mode 100644 lua/integrations/nvchad.lua create mode 100644 lua/integrations/syntax.lua create mode 100644 lua/integrations/treesitter.lua delete mode 100644 lua/themes/aquarium-base16.lua delete mode 100644 lua/themes/blossom-base16.lua delete mode 100644 lua/themes/catppuccin-base16.lua delete mode 100644 lua/themes/chadracula-base16.lua delete mode 100644 lua/themes/chadtain-base16.lua delete mode 100644 lua/themes/classic-dark-base16.lua delete mode 100644 lua/themes/doom-chad-base16.lua delete mode 100644 lua/themes/everforest-base16.lua delete mode 100644 lua/themes/gruvbox-base16.lua delete mode 100644 lua/themes/gruvchad-base16.lua delete mode 100644 lua/themes/javacafe-base16.lua delete mode 100644 lua/themes/jellybeans-base16.lua delete mode 100644 lua/themes/kanagawa-base16.lua delete mode 100644 lua/themes/lfgruv-base16.lua delete mode 100644 lua/themes/monekai-base16.lua delete mode 100644 lua/themes/monokai-base16.lua delete mode 100644 lua/themes/mountain-base16.lua delete mode 100644 lua/themes/nightlamp-base16.lua delete mode 100644 lua/themes/nord-base16.lua delete mode 100644 lua/themes/one-light-base16.lua delete mode 100644 lua/themes/onebright-base16.lua delete mode 100644 lua/themes/onedark-base16.lua delete mode 100644 lua/themes/onedark-deep-base16.lua delete mode 100644 lua/themes/onejelly-base16.lua delete mode 100644 lua/themes/onenord-base16.lua delete mode 100644 lua/themes/palenight-base16.lua delete mode 100644 lua/themes/paradise-base16.lua delete mode 100644 lua/themes/penokai-base16.lua delete mode 100644 lua/themes/solarized-base16.lua delete mode 100644 lua/themes/tokyodark-base16.lua delete mode 100644 lua/themes/tokyonight-base16.lua delete mode 100644 lua/themes/tomorrow-night-base16.lua delete mode 100644 lua/themes/wombat-base16.lua diff --git a/lua/base16.lua b/lua/base16.lua index 50b27d9..8c8d757 100644 --- a/lua/base16.lua +++ b/lua/base16.lua @@ -1,229 +1,47 @@ -local function highlight(group, guifg, guibg, sp, sp_color) - local hl = { - fg = guifg, - bg = guibg, - special = sp_color, - } - if sp ~= nil and sp ~= "none" then - hl[sp] = true - end - vim.api.nvim_set_hl(0, group, hl) -end +local M = {} --- Modified from https://github.com/chriskempson/base16-vim -local function apply_base16_theme(theme) - -- Neovim terminal colours - if vim.fn.has "nvim" then - vim.g.terminal_color_0 = "#" .. theme.base00 - vim.g.terminal_color_1 = "#" .. theme.base08 - vim.g.terminal_color_2 = "#" .. theme.base0B - vim.g.terminal_color_3 = "#" .. theme.base0A - vim.g.terminal_color_4 = "#" .. theme.base0D - vim.g.terminal_color_5 = "#" .. theme.base0E - vim.g.terminal_color_6 = "#" .. theme.base0C - vim.g.terminal_color_7 = "#" .. theme.base05 - vim.g.terminal_color_8 = "#" .. theme.base03 - vim.g.terminal_color_9 = "#" .. theme.base08 - vim.g.terminal_color_10 = "#" .. theme.base0B - vim.g.terminal_color_11 = "#" .. theme.base0A - vim.g.terminal_color_12 = "#" .. theme.base0D - vim.g.terminal_color_13 = "#" .. theme.base0E - vim.g.terminal_color_14 = "#" .. theme.base0C - vim.g.terminal_color_15 = "#" .. theme.base07 - if vim.o.background == "light" then - vim.g.terminal_color_background = "#" .. theme.base05 - vim.g.terminal_color_foreground = "#" .. theme.base0B - else - vim.g.terminal_color_background = "#" .. theme.base00 - vim.g.terminal_color_foreground = "#" .. theme.base0E - end - end +M.get_colors = function(type) + local name = require("core.utils").load_config().ui.theme + vim.g.nvchad_theme = name - -- TODO - -- nvim.command "hi clear" - -- nvim.command "syntax reset" + -- theme paths + local default_path = "hl_themes." .. name + local user_path = "custom.themes." .. name - -- Vim editor colors - highlight("Normal", theme.base05, theme.base00, nil, nil) - highlight("Bold", nil, nil, "bold", nil) - highlight("Debug", theme.base08, nil, nil, nil) - highlight("Directory", theme.base0D, nil, nil, nil) - highlight("Error", theme.base00, theme.base08, nil, nil) - highlight("ErrorMsg", theme.base08, theme.base00, nil, nil) - highlight("Exception", theme.base08, nil, nil, nil) - highlight("FoldColumn", theme.base0C, theme.base01, nil, nil) - highlight("Folded", theme.base03, theme.base01, nil, nil) - highlight("IncSearch", theme.base01, theme.base09, "none", nil) - highlight("Italic", nil, nil, "none", nil) - highlight("Macro", theme.base08, nil, nil, nil) - highlight("MatchParen", nil, theme.base03, nil, nil) - highlight("ModeMsg", theme.base0B, nil, nil, nil) - highlight("MoreMsg", theme.base0B, nil, nil, nil) - highlight("Question", theme.base0D, nil, nil, nil) - highlight("Search", theme.base01, theme.base0A, nil, nil) - highlight("Substitute", theme.base01, theme.base0A, "none", nil) - highlight("SpecialKey", theme.base03, nil, nil, nil) - highlight("TooLong", theme.base08, nil, nil, nil) - highlight("Underlined", theme.base08, nil, nil, nil) - highlight("Visual", nil, theme.base02, nil, nil) - highlight("VisualNOS", theme.base08, nil, nil, nil) - highlight("WarningMsg", theme.base08, nil, nil, nil) - highlight("WildMenu", theme.base08, theme.base0A, nil, nil) - highlight("Title", theme.base0D, nil, "none", nil) - highlight("Conceal", theme.base0D, theme.base00, nil, nil) - highlight("Cursor", theme.base00, theme.base05, nil, nil) - highlight("NonText", theme.base03, nil, nil, nil) - highlight("LineNr", theme.base03, "NONE", nil, nil) - highlight("SignColumn", theme.base03, "NONE", nil, nil) - highlight("StatusLine", theme.base04, "NONE", "none", nil) - highlight("StatusLineNC", theme.base03, "NONE", "none", nil) - highlight("VertSplit", theme.base02, "NONE", "none", nil) - highlight("ColorColumn", nil, theme.base01, "none", nil) - highlight("CursorColumn", nil, theme.base01, "none", nil) - highlight("CursorLine", nil, theme.base01, "none", nil) - highlight("CursorLineNr", theme.base04, "NONE", nil, nil) - highlight("QuickFixLine", nil, theme.base01, "none", nil) - highlight("PMenu", theme.base05, theme.base01, "none", nil) - highlight("PMenuSel", theme.base01, theme.base05, nil, nil) - highlight("TabLine", theme.base03, theme.base01, "none", nil) - highlight("TabLineFill", theme.base03, theme.base01, "none", nil) - highlight("TabLineSel", theme.base0B, theme.base01, "none", nil) + local present1, default_theme = pcall(require, default_path) + local present2, user_theme = pcall(require, user_path) - -- Standard syntax highlighting - highlight("Boolean", theme.base09, nil, nil, nil) - highlight("Character", theme.base08, nil, nil, nil) - highlight("Comment", theme.base03, nil, nil, nil) - highlight("Conditional", theme.base0E, nil, nil, nil) - highlight("Constant", theme.base08, nil, nil, nil) - highlight("Define", theme.base0E, nil, "none", nil) - highlight("Delimiter", theme.base0F, nil, nil, nil) - highlight("Float", theme.base09, nil, nil, nil) - highlight("Function", theme.base0D, nil, nil, nil) - highlight("Identifier", theme.base08, nil, "none", nil) - highlight("Include", theme.base0D, nil, nil, nil) - highlight("Keyword", theme.base0E, nil, nil, nil) - highlight("Label", theme.base0A, nil, nil, nil) - highlight("Number", theme.base09, nil, nil, nil) - highlight("Operator", theme.base05, nil, "none", nil) - highlight("PreProc", theme.base0A, nil, nil, nil) - highlight("Repeat", theme.base0A, nil, nil, nil) - highlight("Special", theme.base0C, nil, nil, nil) - highlight("SpecialChar", theme.base0F, nil, nil, nil) - highlight("Statement", theme.base08, nil, nil, nil) - highlight("StorageClass", theme.base0A, nil, nil, nil) - highlight("String", theme.base0B, nil, nil, nil) - highlight("Structure", theme.base0E, nil, nil, nil) - highlight("Tag", theme.base0A, nil, nil, nil) - highlight("Todo", theme.base0A, theme.base01, nil, nil) - highlight("Type", theme.base0A, nil, "none", nil) - highlight("Typedef", theme.base0A, nil, nil, nil) - - -- Diff highlighting - highlight("DiffAdd", theme.base0B, theme.base01, nil, nil) - highlight("DiffChange", theme.base03, theme.base01, nil, nil) - highlight("DiffDelete", theme.base08, theme.base01, nil, nil) - highlight("DiffText", theme.base0D, theme.base01, nil, nil) - highlight("DiffAdded", theme.base0B, theme.base00, nil, nil) - highlight("DiffFile", theme.base08, theme.base00, nil, nil) - highlight("DiffNewFile", theme.base0B, theme.base00, nil, nil) - highlight("DiffLine", theme.base0D, theme.base00, nil, nil) - highlight("DiffRemoved", theme.base08, theme.base00, nil, nil) + if present1 then + return default_theme[type] + elseif present2 then + return user_theme[type] + else + error "No such theme bruh >_< " + end +end - -- Git highlighting - highlight("gitcommitOverflow", theme.base08, nil, nil, nil) - highlight("gitcommitSummary", theme.base0B, nil, nil, nil) - highlight("gitcommitComment", theme.base03, nil, nil, nil) - highlight("gitcommitUntracked", theme.base03, nil, nil, nil) - highlight("gitcommitDiscarded", theme.base03, nil, nil, nil) - highlight("gitcommitSelected", theme.base03, nil, nil, nil) - highlight("gitcommitHeader", theme.base0E, nil, nil, nil) - highlight("gitcommitSelectedType", theme.base0D, nil, nil, nil) - highlight("gitcommitUnmergedType", theme.base0D, nil, nil, nil) - highlight("gitcommitDiscardedType", theme.base0D, nil, nil, nil) - highlight("gitcommitBranch", theme.base09, nil, "bold", nil) - highlight("gitcommitUntrackedFile", theme.base0A, nil, nil, nil) - highlight("gitcommitUnmergedFile", theme.base08, nil, "bold", nil) - highlight("gitcommitDiscardedFile", theme.base08, nil, "bold", nil) - highlight("gitcommitSelectedFile", theme.base0B, nil, "bold", nil) +M.merge_tb = function(table1, table2) + return vim.tbl_deep_extend("force", table1, table2) +end - -- Mail highlighting - highlight("mailQuoted1", theme.base0A, nil, nil, nil) - highlight("mailQuoted2", theme.base0B, nil, nil, nil) - highlight("mailQuoted3", theme.base0E, nil, nil, nil) - highlight("mailQuoted4", theme.base0C, nil, nil, nil) - highlight("mailQuoted5", theme.base0D, nil, nil, nil) - highlight("mailQuoted6", theme.base0A, nil, nil, nil) - highlight("mailURL", theme.base0D, nil, nil, nil) - highlight("mailEmail", theme.base0D, nil, nil, nil) +M.load_theme = function() + package.loaded["chadlights" or false] = nil + local highlights = require "chadlights" - -- Spelling highlighting - highlight("SpellBad", nil, nil, "undercurl", theme.base08) - highlight("SpellLocal", nil, nil, "undercurl", theme.base0C) - highlight("SpellCap", nil, nil, "undercurl", theme.base0D) - highlight("SpellRare", nil, nil, "undercurl", theme.base0E) + -- finally set all highlights :D + for hl, col in pairs(highlights) do + vim.api.nvim_set_hl(0, hl, col) + end +end - -- treesitter - highlight("TSAnnotation", theme.base0F, nil, "none", nil) - highlight("TSAttribute", theme.base0A, nil, "none", nil) - highlight("TSCharacter", theme.base08, nil, "none", nil) - highlight("TSConstBuiltin", theme.base09, nil, "none", nil) - highlight("TSConstMacro", theme.base08, nil, "none", nil) - highlight("TSError", theme.base08, nil, "none", nil) - highlight("TSException", theme.base08, nil, "none", nil) - highlight("TSFloat", theme.base09, nil, "none", nil) - highlight("TSFuncBuiltin", theme.base0D, nil, "none", nil) - highlight("TSFuncMacro", theme.base08, nil, "none", nil) - highlight("TSKeywordOperator", theme.base0E, nil, "none", nil) - highlight("TSMethod", theme.base0D, nil, "none", nil) - highlight("TSNamespace", theme.base08, nil, "none", nil) - highlight("TSNone", theme.base05, nil, "none", nil) - highlight("TSParameter", theme.base08, nil, "none", nil) - highlight("TSParameterReference", theme.base05, nil, "none", nil) - highlight("TSPunctDelimiter", theme.base0F, nil, "none", nil) - highlight("TSPunctSpecial", theme.base05, nil, "none", nil) - highlight("TSStringRegex", theme.base0C, nil, "none", nil) - highlight("TSStringEscape", theme.base0C, nil, "none", nil) - highlight("TSSymbol", theme.base0B, nil, "none", nil) - highlight("TSTagDelimiter", theme.base0F, nil, "none", nil) - highlight("TSText", theme.base05, nil, "none", nil) - highlight("TSStrong", nil, nil, "bold", nil) - highlight("TSEmphasis", theme.base09, nil, "none", nil) - highlight("TSStrike", theme.base00, nil, "strikethrough", nil) - highlight("TSLiteral", theme.base09, nil, "none", nil) - highlight("TSURI", theme.base09, nil, "underline", nil) - highlight("TSTypeBuiltin", theme.base0A, nil, "none", nil) - highlight("TSVariableBuiltin", theme.base09, nil, "none", nil) - highlight("TSDefinition", nil, nil, "underline", theme.base04) - highlight("TSDefinitionUsage", nil, nil, "underline", theme.base04) - highlight("TSCurrentScope", nil, nil, "bold", nil) +M.override_theme = function(default_theme, theme_name) + local changed_themes = require("core.utils").load_config().ui.changed_themes - -- TODO - -- nvim.command 'syntax on' + if changed_themes[theme_name] then + return M.merge_tb(default_theme, changed_themes[theme_name]) + else + return default_theme + end end -return setmetatable({ - themes = function(name) - name = "themes/" .. name .. "-base16" - local present, theme_array = pcall(require, name) - if present then - return theme_array - else - error("No such base16 theme: " .. name) - end - end, - apply_theme = apply_base16_theme, - theme_from_array = function(array) - assert(#array == 16, "base16.theme_from_array: The array length must be 16") - local result = {} - for i, value in ipairs(array) do - assert(#value == 6, "base16.theme_from_array: array values must be in 6 digit hex format, e.g. 'ffffff'") - local key = ("base%02X"):format(i - 1) - result[key] = value - end - return result - end, -}, { - __call = function(_, ...) - apply_base16_theme(...) - end, -}) +return M diff --git a/lua/chadlights.lua b/lua/chadlights.lua new file mode 100644 index 0000000..04bf099 --- /dev/null +++ b/lua/chadlights.lua @@ -0,0 +1,21 @@ +local merge_tb = require("base16").merge_tb + +local highlights = {} +local hl_dir = vim.fn.stdpath "data" .. "/site/pack/packer/opt/nvim-base16.lua/lua/integrations" + +-- push all file names in hl_dir to a table +local hl_files = require("plenary.scandir").scan_dir(hl_dir, {}) + +for _, file in ipairs(hl_files) do + local a = vim.fn.fnamemodify(file, ":t") + a = vim.fn.fnamemodify(a, ":r") + + local integration = require("integrations." .. a) + highlights = merge_tb(highlights, integration) +end + +-- override user highlights if there are any +local user_highlights = require("core.utils").load_config().ui.hl_override +highlights = merge_tb(highlights, user_highlights) + +return highlights diff --git a/lua/hl_themes/aquarium.lua b/lua/hl_themes/aquarium.lua index f125a00..94f59f4 100644 --- a/lua/hl_themes/aquarium.lua +++ b/lua/hl_themes/aquarium.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#ced4df", darker_black = "#1a1a24", black = "#20202A", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#b8dceb", } -return colors +M.base_16 = { + base00 = "#20202A", + base01 = "#2c2e3e", + base02 = "#3D4059", + base03 = "#313449", + base04 = "#63718b", + base05 = "#ced4df", + base06 = "#414560", + base07 = "#63718b", + base08 = "#ebb9b9", + base09 = "#e8cca7", + base0A = "#e6dfb8", + base0B = "#b1dba4", + base0C = "#b8dceb", + base0D = "#a3b8ef", + base0E = "#f6bbe7", + base0F = "#eAc1c1", +} + +M = require("base16").override_theme(M, "aquarium") + +return M diff --git a/lua/hl_themes/blossom.lua b/lua/hl_themes/blossom.lua index 0f06a10..f6f1e79 100644 --- a/lua/hl_themes/blossom.lua +++ b/lua/hl_themes/blossom.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#685c56", darker_black = "#e5dedb", black = "#ede6e3", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#817a77", } -return colors +M.base_16 = { + base00 = "#ede6e3", + base01 = "#dad3d0", + base02 = "#b6b0a6", + base03 = "#938d8a", + base04 = "#afabaa", + base05 = "#6c605a", + base06 = "#938680", + base07 = "#ede6e3", + base08 = "#978e81", + base09 = "#9c7b9c", + base0A = "#b6b0a6", + base0B = "#c99385", + base0C = "#ce9c85", + base0D = "#a09c80", + base0E = "#A3BE8C", + base0F = "#887c76", +} + +M = require("base16").override_theme(M, "blossom") + +return M diff --git a/lua/hl_themes/catppuccin.lua b/lua/hl_themes/catppuccin.lua index ec2490d..fe1825d 100644 --- a/lua/hl_themes/catppuccin.lua +++ b/lua/hl_themes/catppuccin.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#D9E0EE", darker_black = "#191828", black = "#1E1D2D", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#96CDFB", } -return colors +M.base_16 = { + base00 = "#1E1D2D", + base01 = "#282737", + base02 = "#2f2e3e", + base03 = "#383747", + base04 = "#414050", + base05 = "#bfc6d4", + base06 = "#ccd3e1", + base07 = "#D9E0EE", + base08 = "#DDB6F2", + base09 = "#89DCEB", + base0A = "#F8BD96", + base0B = "#ABE9B3", + base0C = "#F5C2E7", + base0D = "#96CDFB", + base0E = "#F28FAD", + base0F = "#E8A2AF", +} + +M = require("base16").override_theme(M, "catppuccin") + +return M diff --git a/lua/hl_themes/chadracula.lua b/lua/hl_themes/chadracula.lua index 5f50ec8..977af77 100644 --- a/lua/hl_themes/chadracula.lua +++ b/lua/hl_themes/chadracula.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#F8F8F2", darker_black = "#232531", black = "#282A36", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#BD93F9", } -return colors +M.base_16 = { + base00 = "#282a36", + base01 = "#3a3c4e", + base02 = "#44475a", + base03 = "#6272a4", + base04 = "#62d6e8", + base05 = "#e9e9f4", + base06 = "#6272a4", + base07 = "#ff95ef", + base08 = "#ffb86c", + base09 = "#bd93f9", + base0A = "#8be9fd", + base0B = "#ffffa5", + base0C = "#8be9fd", + base0D = "#69ff94", + base0E = "#ff92df", + base0F = "#f7f7fb", +} + +M = require("base16").override_theme(M, "chadracula") + +return M diff --git a/lua/hl_themes/chadtain.lua b/lua/hl_themes/chadtain.lua index 9bf5989..460f7a2 100644 --- a/lua/hl_themes/chadtain.lua +++ b/lua/hl_themes/chadtain.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#b0b0b0", darker_black = "#171d23", black = "#1a2026", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#6b8bab", } -return colors +M.base_16 = { + base00 = "#1a2026", + base01 = "#242a30", + base02 = "#292f35", + base03 = "#2e343a", + base04 = "#42484e", + base05 = "#d3d3d3", + base06 = "#d8d8d8", + base07 = "#b0b0b0", + base08 = "#c49ea0", + base09 = "#b89294", + base0A = "#ccc9aa", + base0B = "#8aac8b", + base0C = "#8aabac", + base0D = "#6b8bab", + base0E = "#8f8aac", + base0F = "#8b6567", +} + +M = require("base16").override_theme(M, "chadtain") + +return M diff --git a/lua/hl_themes/classic-dark.lua b/lua/hl_themes/classic-dark.lua deleted file mode 100644 index acebb6d..0000000 --- a/lua/hl_themes/classic-dark.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#d0D0D0", - darker_black = "#121212", - black = "#151515", -- nvim bg - black2 = "#181818", - one_bg = "#1f1f1f", - one_bg2 = "#282828", - one_bg3 = "#303030", - grey = "#3d3d3d", - grey_fg = "#474747", - grey_fg2 = "#515151", - light_grey = "#595959", - red = "#AC4142", - baby_pink = "#bb5051", - pink = "#bb5051", - line = "#242424", -- for lines like vertsplit - green = "#90A959", - vibrant_green = "#9fb868", - nord_blue = "#5d92a8", - blue = "#6A9FB5", - yellow = "#F4BF75", - sun = "#fcc77d", - purple = "#AA759F", - dark_purple = "#AA759F", - teal = "#75B5AA", - orange = "#F4BF75", - cyan = "#75B5AA", - statusline_bg = "#181818", - lightbg = "#262626", - lightbg2 = "#1f1f1f", - pmenu_bg = "#90A959", - folder_bg = "#6A9FB5", -} - -return colors diff --git a/lua/hl_themes/doom-chad.lua b/lua/hl_themes/doomchad.lua similarity index 62% rename from lua/hl_themes/doom-chad.lua rename to lua/hl_themes/doomchad.lua index 228ec30..8f2f789 100644 --- a/lua/hl_themes/doom-chad.lua +++ b/lua/hl_themes/doomchad.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#bbc2cf", darker_black = "#22262e", black = "#282c34", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#51afef", } -return colors +M.base_16 = { + base00 = "#282c34", + base01 = "#32363e", + base02 = "#3c4048", + base03 = "#4e525a", + base04 = "#5a5e66", + base05 = "#a7aebb", + base06 = "#b3bac7", + base07 = "#bbc2cf", + base08 = "#ff6c6b", + base09 = "#da8548", + base0A = "#ECBE7B", + base0B = "#98be65", + base0C = "#66c4ff", + base0D = "#48a6e6", + base0E = "#9c94d4", + base0F = "#c85a50", +} + +M = require("base16").override_theme(M, "doomchad") + +return M diff --git a/lua/hl_themes/everforest.lua b/lua/hl_themes/everforest.lua index 1ba9dcb..e15046a 100644 --- a/lua/hl_themes/everforest.lua +++ b/lua/hl_themes/everforest.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#D3C6AA", darker_black = "#272f35", black = "#2b3339", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#7393b3", } -return colors +M.base_16 = { + base00 = "#2b3339", + base01 = "#323c41", + base02 = "#3a4248", + base03 = "#868d80", + base04 = "#d3c6aa", + base05 = "#d3c6aa", + base06 = "#e9e8d2", + base07 = "#fff9e8", + base08 = "#7fbbb3", + base09 = "#d699b6", + base0A = "#83c092", + base0B = "#dbbc7f", + base0C = "#e69875", + base0D = "#a7c080", + base0E = "#e67e80", + base0F = "#d699b6", +} + +M = require("base16").override_theme(M, "everforest") + +return M diff --git a/lua/hl_themes/gruvbox.lua b/lua/hl_themes/gruvbox.lua index d1fb272..951e295 100644 --- a/lua/hl_themes/gruvbox.lua +++ b/lua/hl_themes/gruvbox.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#ebdbb2", darker_black = "#232323", black = "#282828", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#83a598", } -return colors +M.base_16 = { + base00 = "#282828", + base01 = "#3c3836", + base02 = "#504945", + base03 = "#665c54", + base04 = "#bdae93", + base05 = "#d5c4a1", + base06 = "#ebdbb2", + base07 = "#fbf1c7", + base08 = "#fb4934", + base09 = "#fe8019", + base0A = "#fabd2f", + base0B = "#b8bb26", + base0C = "#8ec07c", + base0D = "#83a598", + base0E = "#d3869b", + base0F = "#d65d0e", +} + +M = require("base16").override_theme(M, "gruvbox") + +return M diff --git a/lua/hl_themes/gruvchad.lua b/lua/hl_themes/gruvchad.lua index 1afa301..ad898bd 100644 --- a/lua/hl_themes/gruvchad.lua +++ b/lua/hl_themes/gruvchad.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#c7b89d", darker_black = "#1a1d1e", black = "#1e2122", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#6d8dad", } -return colors +M.base_16 = { + base0A = "#e0c080", + base04 = "#d4be98", + base07 = "#c7b89d", + base05 = "#c0b196", + base0E = "#d3869b", + base0D = "#7daea3", + base0C = "#86b17f", + base0B = "#a9b665", + base02 = "#36393a", + base0F = "#d65d0e", + base03 = "#404344", + base08 = "#ec6b64", + base01 = "#2c2f30", + base00 = "#1e2122", + base09 = "#e78a4e", + base06 = "#c3b499", +} + +M = require("base16").override_theme(M, "gruvchad") + +return M diff --git a/lua/hl_themes/javacafe.lua b/lua/hl_themes/javacafe.lua index ef7efea..733438c 100644 --- a/lua/hl_themes/javacafe.lua +++ b/lua/hl_themes/javacafe.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#b5bcc9", darker_black = "#10171e", black = "#131a21", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#99aee5", } -return colors +M.base_16 = { + base0A = "#f5d595", + base04 = "#4f565d", + base07 = "#b5bcc9", + base05 = "#ced4df", + base0E = "#c2a2e3", + base0D = "#a3b8ef", + base0C = "#abb9e0", + base0B = "#a5d4af", + base02 = "#31383f", + base0F = "#e88e9b", + base03 = "#40474e", + base08 = "#ef8891", + base01 = "#2c333a", + base00 = "#131a21", + base09 = "#EDA685", + base06 = "#d3d9e4", +} + +M = require("base16").override_theme(M, "javacafe") + +return M diff --git a/lua/hl_themes/jellybeans.lua b/lua/hl_themes/jellybeans.lua index 0161f63..84b51d3 100644 --- a/lua/hl_themes/jellybeans.lua +++ b/lua/hl_themes/jellybeans.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#e8e8d3", darker_black = "#101010", black = "#151515", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#8197bf", } -return colors +M.base_16 = { + base00 = "#151515", + base01 = "#2e2e2e", + base02 = "#3a3a3a", + base03 = "#424242", + base04 = "#474747", + base05 = "#d9d9c4", + base06 = "#dedec9", + base07 = "#f1f1e5", + base08 = "#dd785a", + base09 = "#c99f4a", + base0A = "#e1b655", + base0B = "#99ad6a", + base0C = "#7187af", + base0D = "#8fa5cd", + base0E = "#e18be1", + base0F = "#cf6a4c", +} + +M = require("base16").override_theme(M, "jellybeans") + +return M diff --git a/lua/hl_themes/kanagawa.lua b/lua/hl_themes/kanagawa.lua index a7112a9..cbe140c 100644 --- a/lua/hl_themes/kanagawa.lua +++ b/lua/hl_themes/kanagawa.lua @@ -1,35 +1,58 @@ -local colors = { - white = "#DCD7BA", - darker_black = "#191922", - black = "#1F1F28", -- nvim bg - black2 = "#25252e", - one_bg = "#272730", - one_bg2 = "#2f2f38", - one_bg3 = "#363646", - grey = "#43434c", - grey_fg = "#4c4c55", - grey_fg2 = "#53535c", - light_grey = "#5c5c65", - red = "#E46876", - baby_pink = "#D27E99", - pink = "#c8748f", - line = "#272730", -- for lines like vertsplit - green = "#98BB6C", - vibrant_green = "#a3c677", - nord_blue = "#7E9CD8", - blue = "#7FB4CA", - yellow = "#FF9E3B", - sun = "#FFA066", - purple = "#a48ec7", - dark_purple = "#957FB8", - teal = "#7AA89F", - orange = "#fa9b61", - cyan = "#A3D4D5", - statusline_bg = "#24242d", - lightbg = "#33333c", - lightbg2 = "#2b2b34", - pmenu_bg = "#a48ec7", - folder_bg = "#7E9CD8", +local M = {} + +M.base_30 = { + white = "#DCD7BA", + darker_black = "#191922", + black = "#1F1F28", -- nvim bg + black2 = "#25252e", + one_bg = "#272730", + one_bg2 = "#2f2f38", + one_bg3 = "#363646", + grey = "#43434c", + grey_fg = "#4c4c55", + grey_fg2 = "#53535c", + light_grey = "#5c5c65", + red = "#E46876", + baby_pink = "#D27E99", + pink = "#c8748f", + line = "#272730", -- for lines like vertsplit + green = "#98BB6C", + vibrant_green = "#a3c677", + nord_blue = "#7E9CD8", + blue = "#7FB4CA", + yellow = "#FF9E3B", + sun = "#FFA066", + purple = "#a48ec7", + dark_purple = "#957FB8", + teal = "#7AA89F", + orange = "#fa9b61", + cyan = "#A3D4D5", + statusline_bg = "#24242d", + lightbg = "#33333c", + lightbg2 = "#2b2b34", + pmenu_bg = "#a48ec7", + folder_bg = "#7E9CD8", +} + +M.base_16 = { + base00 = "#1f1f28", + base01 = "#2a2a37", + base02 = "#223249", + base03 = "#727169", + base04 = "#c8c093", + base05 = "#dcd7ba", + base06 = "#938aa9", + base07 = "#363646", + base08 = "#e46876", + base09 = "#ffa066", + base0A = "#dca561", + base0B = "#98bb6c", + base0C = "#7fb4ca", + base0D = "#7e9cd8", + base0E = "#957fb8", + base0F = "#d27e99", } -return colors +M = require("base16").override_theme(M, "kanagawa") + +return M diff --git a/lua/hl_themes/lfgruv.lua b/lua/hl_themes/lfgruv.lua deleted file mode 100644 index c5bed9f..0000000 --- a/lua/hl_themes/lfgruv.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#ebdbb2", - darker_black = "#232323", - black = "#282828", -- nvim bg - black2 = "#2e2e2e", - one_bg = "#353535", - one_bg2 = "#3f3f3f", - one_bg3 = "#444444", - grey = "#464646", - grey_fg = "#4e4e4e", - grey_fg2 = "#505050", - light_grey = "#565656", - red = "#b66467", - baby_pink = "#fbe6ea", - pink = "#e193ab", - line = "#2c2f30", -- for lines like vertsplit - green = "#8d987e", - vibrant_green = "#9cab51", - nord_blue = "#87a197", - blue = "#4d7d80", - yellow = "#dcbb8c", - sun = "#f1bf77", - purple = "#958793", - dark_purple = "#d3869b", - teal = "#6ec2bf", - orange = "#e78a4e", - cyan = "#8aa6a5", - statusline_bg = "#2c2c2c", - lightbg = "#353535", - lightbg2 = "#303030", - pmenu_bg = "#8aa6a5", - folder_bg = "#8aa6a5", -} - -return colors diff --git a/lua/hl_themes/monekai.lua b/lua/hl_themes/monekai.lua index 5ec8b4f..c9f1445 100644 --- a/lua/hl_themes/monekai.lua +++ b/lua/hl_themes/monekai.lua @@ -1,35 +1,58 @@ -local colors = { - white = "#bbc2cf", - darker_black = "#1f222b", - black = "#242730", -- nvim bg - black2 = "#292c35", - one_bg = "#2e313a", -- real bg of onedark - one_bg2 = "#373a43", - one_bg3 = "#3f424b", - grey = "#494c55", - grey_fg = "#52555e", - grey_fg2 = "#5b5e67", - light_grey = "#63666f", - red = "#e36d76", - baby_pink = "#f98385", - pink = "#f36d76", - line = "#30333c", -- for lines like vertsplit - green = "#96c367", - vibrant_green = "#99c366", - nord_blue = "#81A1C1", - blue = "#51afef", - yellow = "#d39467", - sun = "#fce668", - purple = "#c885d7", - dark_purple = "#b26fc1", - teal = "#34bfd0", - orange = "#d39467", - cyan = "#51afef", - statusline_bg = "#292c35", - lightbg = "#3d4049", - lightbg2 = "#2e313a", - pmenu_bg = "#99c366", - folder_bg = "#51afef", +local M = {} + +M.base_30 = { + white = "#bbc2cf", + darker_black = "#1f222b", + black = "#242730", -- nvim bg + black2 = "#292c35", + one_bg = "#2e313a", -- real bg of onedark + one_bg2 = "#373a43", + one_bg3 = "#3f424b", + grey = "#494c55", + grey_fg = "#52555e", + grey_fg2 = "#5b5e67", + light_grey = "#63666f", + red = "#e36d76", + baby_pink = "#f98385", + pink = "#f36d76", + line = "#30333c", -- for lines like vertsplit + green = "#96c367", + vibrant_green = "#99c366", + nord_blue = "#81A1C1", + blue = "#51afef", + yellow = "#d39467", + sun = "#fce668", + purple = "#c885d7", + dark_purple = "#b26fc1", + teal = "#34bfd0", + orange = "#d39467", + cyan = "#51afef", + statusline_bg = "#292c35", + lightbg = "#3d4049", + lightbg2 = "#2e313a", + pmenu_bg = "#99c366", + folder_bg = "#51afef", +} + +M.base_16 = { + base00 = "#242730", + base01 = "#2a2e38", + base02 = "#484854", + base03 = "#545862", + base04 = "#9ca0a4", + base05 = "#bbc2cf", + base06 = "#5d656b", + base07 = "#4d5550", + base08 = "#51afef", + base09 = "#e18ef3", + base0A = "#5ac9d6", + base0B = "#e6c181", + base0C = "#96c376", + base0D = "#96c376", + base0E = "#e36d76", + base0F = "#bbc2cf", } -return colors +M = require("base16").override_theme(M, "monekai") + +return M diff --git a/lua/hl_themes/monokai.lua b/lua/hl_themes/monokai.lua deleted file mode 100644 index afe47d0..0000000 --- a/lua/hl_themes/monokai.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#f8f8f2", - darker_black = "#21221c", - black = "#272822", -- nvim bg - black2 = "#2d2e28", - one_bg = "#31322c", -- real bg of onedark - one_bg2 = "#3a3b35", - one_bg3 = "#42433d", - grey = "#4f504a", - grey_fg = "#595a54", - grey_fg2 = "#63645e", - light_grey = "#6b6c66", - red = "#f92672", - baby_pink = "#ff3581", - pink = "#fd5ffe", - line = "#363731", -- for lines like vertsplit - green = "#a6e22e", - vibrant_green = "#bffb47", - nord_blue = "#59cce2", - blue = "#66d9ef", - yellow = "#e6db74", - sun = "#eee37c", - purple = "#ae81ff", - dark_purple = "#9f72f0", - teal = "#4dc0d6", - orange = "#fd971f", - cyan = "#a1efe4", - statusline_bg = "#2b2c26", - lightbg = "#383933", - lightbg2 = "#32332d", - pmenu_bg = "#A3BE8C", - folder_bg = "#61afef", -} - -return colors diff --git a/lua/hl_themes/mountain.lua b/lua/hl_themes/mountain.lua index c73168f..e914913 100644 --- a/lua/hl_themes/mountain.lua +++ b/lua/hl_themes/mountain.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#F0f0f0", darker_black = "#090909", black = "#0f0f0f", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#A39EC4", } -return colors +M.base_16 = { + base00 = "#0f0f0f", + base01 = "#151515", + base02 = "#191919", + base03 = "#222222", + base04 = "#535353", + base05 = "#f0f0f0", + base06 = "#d8d8d8", + base07 = "#414141", + base08 = "#ac8a8c", + base09 = "#d3d0ad", + base0A = "#ACA98A", + base0B = "#8aac8b", + base0C = "#9EC3C4", + base0D = "#8fb4b5", + base0E = "#C49EC4", + base0F = "#9d9a7b", +} + +M = require("base16").override_theme(M, "mountain") + +return M diff --git a/lua/hl_themes/night-owl.lua b/lua/hl_themes/night-owl.lua deleted file mode 100644 index 7c82438..0000000 --- a/lua/hl_themes/night-owl.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#d6deeb", - darker_black = "#001122", - black = "#011627", - black2 = "#061b2c", - one_bg = "#0b2031", -- real bg of onedark - one_bg2 = "#152a3b", - one_bg3 = "#1f3445", - grey = "#293e4f", - grey_fg = "#314657", - grey_fg2 = "#394e5f", - light_grey = "#8b9f9f", - red = "#f78c6c", - baby_pink = "#ff6cca", - pink = "#fa58b6", - line = "#091e2f", - green = "#addb67", - vibrant_green = "#22da6e", - blue = "#82aaff", - nord_blue = "#78a0f5", - yellow = "#ffcb8b", - sun = "#ffe9a9", - purple = "#c792ea", - dark_purple = "#a974cc", - teal = "#96CEB4", - orange = "#FFAD60", - cyan = "#93FFD8", - statusline_bg = "#051a2b", - lightbg = "#112637", - lightbg2 = "#0b2031", - pmenu_bg = "#addb67", - folder_bg = "#82aaff", -} - -return colors diff --git a/lua/hl_themes/nightlamp.lua b/lua/hl_themes/nightlamp.lua index 3c2e687..c7281e2 100644 --- a/lua/hl_themes/nightlamp.lua +++ b/lua/hl_themes/nightlamp.lua @@ -1,35 +1,58 @@ -local colors = { - white = "#f1ebd1", - darker_black = "#15161c", - black = "#18191f", --nvim bg - black2 = "#1e1f25", - one_bg = "#222329", - one_bg2 = "#28292f", - one_bg3 = "#2e2f35", - grey = "#38393f", - grey_fg = "#43444a", - grey_fg2 = "#48494f", - light_grey = "#505157", - red = "#a67476", - baby_pink = "#d6b3bd", - pink = "#c99aa7", - line = "#24252b", --for lines like vertsplit - green = "#8aa387", - vibrant_green = "#94ad91", - nord_blue = "#8d9bb3", - blue = "#5a6986", - yellow = "#ccb89c", - sun = "#deb88a", - purple = "#b8aad9", - dark_purple = "#a99bca", - teal = "#7aacaa", - orange = "#c8916d", - cyan = "#90a0a0", - statusline_bg = "#1d1e24", - lightbg = "#2b2c32", - lightbg2 = "#24252b", - pmenu_bg = "#8aa387", - folder_bg = "#90a0a0", +local M = {} + +M.base_30 = { + white = "#f1ebd1", + darker_black = "#15161c", + black = "#18191f", --nvim bg + black2 = "#1e1f25", + one_bg = "#222329", + one_bg2 = "#28292f", + one_bg3 = "#2e2f35", + grey = "#38393f", + grey_fg = "#43444a", + grey_fg2 = "#48494f", + light_grey = "#505157", + red = "#a67476", + baby_pink = "#d6b3bd", + pink = "#c99aa7", + line = "#24252b", --for lines like vertsplit + green = "#8aa387", + vibrant_green = "#94ad91", + nord_blue = "#8d9bb3", + blue = "#5a6986", + yellow = "#ccb89c", + sun = "#deb88a", + purple = "#b8aad9", + dark_purple = "#a99bca", + teal = "#7aacaa", + orange = "#c8916d", + cyan = "#90a0a0", + statusline_bg = "#1d1e24", + lightbg = "#2b2c32", + lightbg2 = "#24252b", + pmenu_bg = "#8aa387", + folder_bg = "#90a0a0", +} + +M.base_16 = { + base00 = "#18191f", + base01 = "#222329", + base02 = "#2c2d33", + base03 = "#3c3d43", + base04 = "#b5ac9b", + base05 = "#cbc0ab", + base06 = "#e0d6bd", + base07 = "#f1ebd1", + base08 = "#b8aad9", + base09 = "#b17f81", + base0A = "#d4ae80", + base0B = "#8aa387", + base0C = "#9ba292", + base0D = "#c495a2", + base0E = "#8896ae", + base0F = "#d0d0c7", } -return colors +M = require("base16").override_theme(M, "nightlamp") + +return M diff --git a/lua/themes/night-owl-base16.lua b/lua/hl_themes/nightowl.lua similarity index 54% rename from lua/themes/night-owl-base16.lua rename to lua/hl_themes/nightowl.lua index 08ac0b1..ad5a8af 100644 --- a/lua/themes/night-owl-base16.lua +++ b/lua/hl_themes/nightowl.lua @@ -1,4 +1,40 @@ -return { +local M = {} + +M.base_30 = { + white = "#d6deeb", + darker_black = "#001122", + black = "#011627", + black2 = "#061b2c", + one_bg = "#0b2031", -- real bg of onedark + one_bg2 = "#152a3b", + one_bg3 = "#1f3445", + grey = "#293e4f", + grey_fg = "#314657", + grey_fg2 = "#394e5f", + light_grey = "#8b9f9f", + red = "#f78c6c", + baby_pink = "#ff6cca", + pink = "#fa58b6", + line = "#091e2f", + green = "#addb67", + vibrant_green = "#22da6e", + blue = "#82aaff", + nord_blue = "#78a0f5", + yellow = "#ffcb8b", + sun = "#ffe9a9", + purple = "#c792ea", + dark_purple = "#a974cc", + teal = "#96CEB4", + orange = "#FFAD60", + cyan = "#93FFD8", + statusline_bg = "#051a2b", + lightbg = "#112637", + lightbg2 = "#0b2031", + pmenu_bg = "#addb67", + folder_bg = "#82aaff", +} + +M.base_16 = { base00 = "#011627", -- bg base01 = "#0c2132", -- lightbg base02 = "#172c3d", -- selection bg @@ -16,3 +52,7 @@ return { base0E = "#c792ea", -- Keywords, Storage, Selector, Markup Italic, Diff Changed base0F = "#d6deeb", -- Deprecated, Opening/Closing Embedded Language Tags, e.g. } + +M = require("base16").override_theme(M, "nightowl") + +return M diff --git a/lua/hl_themes/nord.lua b/lua/hl_themes/nord.lua index ce715b3..0e1d6af 100644 --- a/lua/hl_themes/nord.lua +++ b/lua/hl_themes/nord.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#abb2bf", darker_black = "#2a303c", black = "#2E3440", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#7797b7", } -return colors +M.base_16 = { + base00 = "#2E3440", + base01 = "#3B4252", + base02 = "#434C5E", + base03 = "#4C566A", + base04 = "#D8DEE9", + base05 = "#E5E9F0", + base06 = "#ECEFF4", + base07 = "#8FBCBB", + base08 = "#88C0D0", + base09 = "#81A1C1", + base0A = "#88C0D0", + base0B = "#A3BE8C", + base0C = "#81A1C1", + base0D = "#81A1C1", + base0E = "#81A1C1", + base0F = "#B48EAD", +} + +M = require("base16").override_theme(M, "nord") + +return M diff --git a/lua/hl_themes/one-light.lua b/lua/hl_themes/one_light.lua similarity index 62% rename from lua/hl_themes/one-light.lua rename to lua/hl_themes/one_light.lua index 683d69a..66894d2 100644 --- a/lua/hl_themes/one-light.lua +++ b/lua/hl_themes/one_light.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#54555b", darker_black = "#f5f5f5", black = "#fafafa", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#6C6C6C", } -return colors +M.base_16 = { + base00 = "#fafafa", + base01 = "#f0f0f1", + base02 = "#e5e5e6", + base03 = "#a0a1a7", + base04 = "#696c77", + base05 = "#383a42", + base06 = "#202227", + base07 = "#090a0b", + base08 = "#ca1243", + base09 = "#d75f00", + base0A = "#c18401", + base0B = "#50a14f", + base0C = "#0184bc", + base0D = "#4078f2", + base0E = "#a626a4", + base0F = "#986801", +} + +M = require("base16").override_theme(M, "one_light") + +return M diff --git a/lua/hl_themes/onebright.lua b/lua/hl_themes/onebright.lua deleted file mode 100644 index 894d14a..0000000 --- a/lua/hl_themes/onebright.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#abb2bf", - darker_black = "#1b1f27", - black = "#1e222a", - black2 = "#252931", - one_bg = "#282c34", - one_bg2 = "#353b45", - one_bg3 = "#30343c", - grey = "#42464e", - grey_fg = "#565c64", - grey_fg2 = "#6f737b", - light_grey = "#6f737b", - red = "#d47d85", - baby_pink = "#DE8C92", - pink = "#ff75a0", - line = "#2a2e36", - green = "#A3BE8C", - vibrant_green = "#7eca9c", - nord_blue = "#81A1C1", - blue = "#82aaff", - yellow = "#e7c787", - sun = "#EBCB8B", - purple = "#b4bbc8", - dark_purple = "#c882e7", - teal = "#519ABA", - orange = "#fca2aa", - cyan = "#a3b8ef", - statusline_bg = "#22262e", - lightbg = "#2d3139", - lightbg2 = "#262a32", - pmenu_bg = "#A3BE8C", - folder_bg = "#82aaff", -} - -return colors diff --git a/lua/hl_themes/onedark-deep.lua b/lua/hl_themes/onedark-deep.lua deleted file mode 100644 index 7d3bc26..0000000 --- a/lua/hl_themes/onedark-deep.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#6c7d9c", - darker_black = "#141b28", - black = "#1a212e", -- nvim bg - black2 = "#202734", - one_bg = "#242b38", -- real bg of onedark - one_bg2 = "#2d3441", - one_bg3 = "#353c49", - grey = "#455574", - grey_fg = "#4f5f7e", - grey_fg2 = "#596988", - light_grey = "#617190", - red = "#f65866", - baby_pink = "#e06c75", - pink = "#ff75a0", - line = "#29303d", -- for lines like vertsplit - green = "#8bcd5b", - vibrant_green = "#98c379", - nord_blue = "#52a0e0", - blue = "#41a7fc", - yellow = "#ebc275", - sun = "#e5c07b", - purple = "#c678dd", - dark_purple = "#c678dd", - teal = "#34bfd0", - orange = "#ea8912", - cyan = "#56b6c2", - statusline_bg = "#1e2532", - lightbg = "#2f333b", - lightbg2 = "#292d35", - pmenu_bg = "#98c379", - folder_bg = "#41a7fc", -} - -return colors diff --git a/lua/hl_themes/onedark.lua b/lua/hl_themes/onedark.lua index 2ff66aa..d83c780 100644 --- a/lua/hl_themes/onedark.lua +++ b/lua/hl_themes/onedark.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#abb2bf", darker_black = "#1b1f27", black = "#1e222a", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#61afef", } -return colors +M.base_16 = { + base00 = "#1e222a", + base01 = "#353b45", + base02 = "#3e4451", + base03 = "#545862", + base04 = "#565c64", + base05 = "#abb2bf", + base06 = "#b6bdca", + base07 = "#c8ccd4", + base08 = "#e06c75", + base09 = "#d19a66", + base0A = "#e5c07b", + base0B = "#98c379", + base0C = "#56b6c2", + base0D = "#61afef", + base0E = "#c678dd", + base0F = "#be5046", +} + +M = require("base16").override_theme(M, "onedark") + +return M diff --git a/lua/hl_themes/onejelly.lua b/lua/hl_themes/onejelly.lua deleted file mode 100644 index 0161f63..0000000 --- a/lua/hl_themes/onejelly.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#e8e8d3", - darker_black = "#101010", - black = "#151515", -- nvim bg - black2 = "#1c1c1c", - one_bg = "#252525", - one_bg2 = "#2e2e2e", - one_bg3 = "#3a3a3a", - grey = "#424242", - grey_fg = "#474747", - grey_fg2 = "#4c4c4c", - light_grey = "#525252", - red = "#cf6a4c", - baby_pink = "#da7557", - pink = "#f0a0c0", - line = "#232323", -- for lines like vertsplit - green = "#99ad6a", - vibrant_green = "#c2cea6", - nord_blue = "#768cb4", - blue = "#8197bf", - yellow = "#fad07a", - sun = "#ffb964", - purple = "#ea94ea", - dark_purple = "#e18be1", - teal = "#668799", - orange = "#e78a4e", - cyan = "#8fbfdc", - statusline_bg = "#191919", - lightbg = "#252525", - lightbg2 = "#1e1e1e", - pmenu_bg = "#8197bf", - folder_bg = "#8197bf", -} - -return colors diff --git a/lua/hl_themes/onenord.lua b/lua/hl_themes/onenord.lua index 2e3e6f2..091844f 100644 --- a/lua/hl_themes/onenord.lua +++ b/lua/hl_themes/onenord.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#D8DEE9", darker_black = "#252b37", black = "#2a303c", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#7797b7", } -return colors +M.base_16 = { + base0A = "#EBCB8B", + base04 = "#566074", + base07 = "#ced4df", + base05 = "#bfc5d0", + base0E = "#B48EAD", + base0D = "#81A1C1", + base0C = "#97b7d7", + base0B = "#A3BE8C", + base02 = "#434C5E", + base0F = "#d57780", + base03 = "#4C566A", + base08 = "#d57780", + base01 = "#3B4252", + base00 = "#2a303c", + base09 = "#e39a83", + base06 = "#c7cdd8", +} + +M = require("base16").override_theme(M, "onenord") + +return M diff --git a/lua/hl_themes/palenight.lua b/lua/hl_themes/palenight.lua index e71ac1c..3fef12e 100644 --- a/lua/hl_themes/palenight.lua +++ b/lua/hl_themes/palenight.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#9198B6", -- custom darker_black = "#232738", black = "#292D3E", -- nvim bg @@ -29,7 +31,28 @@ local colors = { lightbg = "#363a4b", lightbg2 = "#303445", pmenu_bg = "#89ffe6", -- custom - folder_bg = "#82aaff" + folder_bg = "#82aaff", +} + +M.base_16 = { + base00 = "#292d3e", + base01 = "#444267", + base02 = "#32374d", + base03 = "#676e95", + base04 = "#8796b0", + base05 = "#959dcb", + base06 = "#959dcb", + base07 = "#ffffff", + base08 = "#f07178", + base09 = "#f78c6c", + base0A = "#ffcb6b", + base0B = "#c3e88d", + base0C = "#89ddff", + base0D = "#82aaff", + base0E = "#c792ea", + base0F = "#ff5370", } -return colors +M = require("base16").override_theme(M, "palenight") + +return M diff --git a/lua/hl_themes/paradise.lua b/lua/hl_themes/paradise.lua deleted file mode 100644 index 29dec99..0000000 --- a/lua/hl_themes/paradise.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#e8e3e3", - darker_black = "#121212", - black = "#151515", -- nvim bg - black2 = "#1a1a1a", - one_bg = "#1f1f1f", - one_bg2 = "#282828", - one_bg3 = "#303030", - grey = "#3d3d3d", - grey_fg = "#474747", - grey_fg2 = "#515151", - light_grey = "#595959", - red = "#b66467", - baby_pink = "#BD7476", - pink = "#BA6C6F", - line = "#2c2f30", -- for lines like vertsplit - green = "#8c977d", - vibrant_green = "#929C84", - nord_blue = "#93A8BD", - blue = "#8da3b9", - yellow = "#d9bc8c", - sun = "#DBBF92", - purple = "#a988b0", - dark_purple = "#A181A7", - teal = "#90AAA7", - orange = "#CEB385", - cyan = "#8aa6a2", - statusline_bg = "#181818", - lightbg = "#252525", - lightbg2 = "#1f1f1f", - pmenu_bg = "#8aa6a2", - folder_bg = "#8da3b9", -} - -return colors diff --git a/lua/hl_themes/penokai.lua b/lua/hl_themes/penokai.lua deleted file mode 100644 index b3bd1ab..0000000 --- a/lua/hl_themes/penokai.lua +++ /dev/null @@ -1,35 +0,0 @@ -local colors = { - white = "#fff9e8", - darker_black = "#262b34", - black = "#2a2f38", -- nvim bg - black2 = "#323740", - one_bg = "#3a3f48", - one_bg2 = "#3c414a", - one_bg3 = "#40454e", - grey = "#4b5059", - grey_fg = "#50555e", - grey_fg2 = "#565b64", - light_grey = "#5c616a", - red = "#ff6578", - baby_pink = "#d699b6", - pink = "#ff75a0", - line = "#3a4248", -- for lines like vertsplit - green = "#9dd274", - vibrant_green = "#99d6a8", - nord_blue = "#78b4ac", - blue = "#6dc7e3", - yellow = "#eacb64", - sun = "#e0c15a", - purple = "#ba9cf3", - dark_purple = "#b092e9", - teal = "#69a59d", - orange = "#e69875", - cyan = "#95d1c9", - statusline_bg = "#2f343d", - lightbg = "#3a3f48", - lightbg2 = "#323740", - pmenu_bg = "#83c092", - folder_bg = "#7393b3", -} - -return colors diff --git a/lua/hl_themes/solarized.lua b/lua/hl_themes/solarized.lua index b3704a9..e81aaf3 100644 --- a/lua/hl_themes/solarized.lua +++ b/lua/hl_themes/solarized.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#839496", darker_black = "#002530", black = "#002b36", @@ -32,4 +34,25 @@ local colors = { folder_bg = "#61afef", } -return colors +M.base_16 = { + base00 = "#002b36", + base01 = "#073642", + base02 = "#586e75", + base03 = "#657b83", + base04 = "#839496", + base05 = "#93a1a1", + base06 = "#eee8d5", + base07 = "#fdf6e3", + base08 = "#dc322f", + base09 = "#cb4b16", + base0A = "#b58900", + base0B = "#859900", + base0C = "#2aa198", + base0D = "#268bd2", + base0E = "#6c71c4", + base0F = "#d33682", +} + +M = require("base16").override_theme(M, "solarized") + +return M diff --git a/lua/hl_themes/tokyodark.lua b/lua/hl_themes/tokyodark.lua index 99d37bd..3a3e2be 100644 --- a/lua/hl_themes/tokyodark.lua +++ b/lua/hl_themes/tokyodark.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#abb2bf", darker_black = "#0e0f1a", black = "#11121D", -- nvim bg @@ -32,5 +34,25 @@ local colors = { folder_bg = "#8094B4", } -return colors +M.base_16 = { + base00 = "#11121d", + base01 = "#1b1c27", + base02 = "#21222d", + base03 = "#282934", + base04 = "#30313c", + base05 = "#abb2bf", + base06 = "#b2b9c6", + base07 = "#b9c0cd", + base08 = "#ee6d85", + base09 = "#7199ee", + base0A = "#7199ee", + base0B = "#dfae67", + base0C = "#a485dd", + base0D = "#95c561", + base0E = "#a485dd", + base0F = "#f3627a", +} + +M = require("base16").override_theme(M, "tokyodark") +return M diff --git a/lua/hl_themes/tokyonight.lua b/lua/hl_themes/tokyonight.lua index b78983d..451c778 100644 --- a/lua/hl_themes/tokyonight.lua +++ b/lua/hl_themes/tokyonight.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#c0caf5", darker_black = "#16161e", black = "#1a1b26", -- nvim bg @@ -32,4 +34,23 @@ local colors = { folder_bg = "#7aa2f7", } -return colors +M.base_16 = { + base0A = "#e0af68", + base04 = "#565c64", + base07 = "#c0caf5", + base05 = "#a9b1d6", + base0E = "#9d7cd8", + base0D = "#7aa2f7", + base0C = "#2ac3de", + base0B = "#9ece6a", + base02 = "#3b4261", + base0F = "#9abdf5", + base03 = "#545c7e", + base08 = "#f7768e", + base01 = "#3b4261", + base00 = "#1A1B26", + base09 = "#ff9e64", + base06 = "#bbc5f0", +} + +return M diff --git a/lua/hl_themes/tomorrow-night.lua b/lua/hl_themes/tomorrow_night.lua similarity index 61% rename from lua/hl_themes/tomorrow-night.lua rename to lua/hl_themes/tomorrow_night.lua index 01c78b6..38428af 100644 --- a/lua/hl_themes/tomorrow-night.lua +++ b/lua/hl_themes/tomorrow_night.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#C5C8C2", darker_black = "#191b1d", black = "#1d1f21", -- nvim bg @@ -32,4 +34,25 @@ local colors = { folder_bg = "#6f8dab", } -return colors +M.base_16 = { + base0A = "#f0c674", + base04 = "#b4b7b4", + base07 = "#ffffff", + base05 = "#c5c8c6", + base0E = "#b294bb", + base0D = "#81a2be", + base0C = "#8abeb7", + base0B = "#b5bd68", + base02 = "#373b41", + base0F = "#a3685a", + base03 = "#969896", + base08 = "#cc6666", + base01 = "#282a2e", + base00 = "#1d1f21", + base09 = "#de935f", + base06 = "#e0e0e0", +} + +M = require("base16").override_theme(M, "tomorrow_night") + +return M diff --git a/lua/hl_themes/wombat.lua b/lua/hl_themes/wombat.lua index c394613..21cb0e1 100644 --- a/lua/hl_themes/wombat.lua +++ b/lua/hl_themes/wombat.lua @@ -1,4 +1,6 @@ -local colors = { +local M = {} + +M.base_30 = { white = "#c6c6c6", darker_black = "#030303", black = "#080808", @@ -32,4 +34,25 @@ local colors = { folder_bg = "#87afff", } -return colors +M.base_16 = { + base00 = "#080808", + base01 = "#1c1c1c", + base02 = "#292929", + base03 = "#87875f", + base04 = "#857b6f", + base05 = "#c6c6c6", + base06 = "#d2d2d2", + base07 = "#dedede", + base08 = "#c6c6c6", + base09 = "#d7875f", + base0A = "#d7ff87", + base0B = "#87d75f", + base0C = "#ffd7af", + base0D = "#d7ff87", + base0E = "#87afff", + base0F = "#dc8c64", +} + +M = require("base16").override_theme(M, "wombat") + +return M diff --git a/lua/integrations/git.lua b/lua/integrations/git.lua new file mode 100644 index 0000000..6f81579 --- /dev/null +++ b/lua/integrations/git.lua @@ -0,0 +1,69 @@ +local theme = require("base16").get_colors "base_16" + +return { + + -- git commits + gitcommitOverflow = { + fg = theme.base08, + }, + + gitcommitSummary = { + fg = theme.base08, + }, + + gitcommitComment = { + fg = theme.base03, + }, + + gitcommitUntracked = { + fg = theme.base03, + }, + + gitcommitDiscarded = { + fg = theme.base03, + }, + + gitcommitSelected = { + fg = theme.base03, + }, + + gitcommitHeader = { + fg = theme.base0E, + }, + + gitcommitSelectedType = { + fg = theme.base0D, + }, + + gitcommitUnmergedType = { + fg = theme.base0D, + }, + + gitcommitDiscardedType = { + fg = theme.base0D, + }, + + gitcommitBranch = { + fg = theme.base09, + bold = true, + }, + + gitcommitUntrackedFile = { + fg = theme.base0A, + }, + + gitcommitUnmergedFile = { + fg = theme.base08, + bold = true, + }, + + gitcommitDiscardedFile = { + fg = theme.base08, + bold = true, + }, + + gitcommitSelectedFile = { + fg = theme.base0B, + bold = true, + }, +} diff --git a/lua/integrations/mail.lua b/lua/integrations/mail.lua new file mode 100644 index 0000000..3469181 --- /dev/null +++ b/lua/integrations/mail.lua @@ -0,0 +1,35 @@ +local theme = require("base16").get_colors "base_16" + +return { + mailQuoted1 = { + fg = theme.base0A, + }, + + mailQuoted2 = { + fg = theme.base0B, + }, + + mailQuoted3 = { + fg = theme.base0E, + }, + + mailQuoted4 = { + fg = theme.base0C, + }, + + mailQuoted5 = { + fg = theme.base0D, + }, + + mailQuoted6 = { + fg = theme.base0A, + }, + + mailURL = { + fg = theme.base0D, + }, + + mailEmail = { + fg = theme.base0D, + }, +} diff --git a/lua/integrations/misc.lua b/lua/integrations/misc.lua new file mode 100644 index 0000000..61bf09b --- /dev/null +++ b/lua/integrations/misc.lua @@ -0,0 +1,189 @@ +local theme = require("base16").get_colors("base_16") + +return { + Normal = { + fg = theme.base05, + bg = theme.base00, + }, + + Bold = { + bold = true, + }, + + Debug = { + fg = theme.base08, + }, + + Directory = { + fg = theme.base0D, + }, + + Error = { + fg = theme.base00, + bg = theme.base08, + }, + + ErrorMsg = { + fg = theme.base08, + bg = theme.base00, + }, + + Exception = { + fg = theme.base08, + }, + + FoldColumn = { + fg = theme.base0C, + bg = theme.base01, + }, + + Folded = { + fg = theme.base03, + bg = theme.base01, + }, + + IncSearch = { + fg = theme.base01, + bg = theme.base09, + }, + + Italic = { + italic = true, + }, + + Macro = { + fg = theme.base08, + }, + + MatchParen = { + bg = theme.base03, + }, + + ModeMsg = { + fg = theme.base0B, + }, + + MoreMsg = { + fg = theme.base0B, + }, + + Question = { + fg = theme.base0D, + }, + + Search = { + fg = theme.base01, + bg = theme.base0A, + }, + + Substitute = { + fg = theme.base01, + bg = theme.base0A, + sp = "none", + }, + + SpecialKey = { + fg = theme.base03, + }, + + TooLong = { + fg = theme.base08, + }, + + UnderLined = { + fg = theme.base0B, + }, + + Visual = { + bg = theme.base02, + }, + + VisualNOS = { + fg = theme.base08, + }, + + WarningMsg = { + fg = theme.base08, + }, + + WildMenu = { + fg = theme.base08, + bg = theme.base0A, + }, + + Title = { + fg = theme.base0D, + sp = "none", + }, + + Conceal = { + fg = theme.base0D, + bg = theme.base0D, + }, + + Cursor = { + fg = theme.base00, + bg = theme.base05, + }, + + NonText = { + fg = theme.base03, + }, + + SignColumn = { + fg = theme.base03, + sp = "NONE", + }, + + ColorColumn = { + bg = theme.base01, + sp = "none", + }, + + CursorColumn = { + bg = theme.base01, + sp = "none", + }, + + CursorLine = { + bg = theme.base00, + sp = "none", + }, + + CursorLineNr = { + bg = theme.base00, + sp = "none", + }, + + QuickFixLine = { + bg = theme.base01, + sp = "none", + }, + + StatusLine = { + bg = "NONE", + sp = "none", + }, + + -- spell + + SpellBad = { + undercurl = true, + sp = theme.base08, + }, + + SpellLocal = { + undercurl = true, + sp = theme.base0C, + }, + + SpellCap = { + undercurl = true, + sp = theme.base0D, + }, + + SpellRare = { + undercurl = true, + sp = theme.base0E, + }, +} diff --git a/lua/integrations/nvchad.lua b/lua/integrations/nvchad.lua new file mode 100644 index 0000000..07ea8da --- /dev/null +++ b/lua/integrations/nvchad.lua @@ -0,0 +1,197 @@ +local colors = require("base16").get_colors "base_30" +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 + +-- highlight groups & colors +local defaults = { + + 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, + }, + + DiffAdded = { + fg = green, + }, + + DiffChange = { + fg = light_grey, + }, + + DiffChangeDelete = { + fg = red, + }, + + DiffModified = { + fg = orange, + }, + + DiffDelete = { + fg = red, + }, + + DiffRemoved = { + fg = red, + }, + + -- 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, + }, + + NvimTreeCursorLine = { + 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 + defaults[hl_groups[index]] = { + bg = "NONE", + } + end + + defaults.NvimTreeWinSeparator = { + fg = grey, + bg = "NONE", + } + + defaults.TelescopeResultsTitle = { + fg = black, + bg = blue, + } +end + +return defaults diff --git a/lua/integrations/syntax.lua b/lua/integrations/syntax.lua new file mode 100644 index 0000000..99d652b --- /dev/null +++ b/lua/integrations/syntax.lua @@ -0,0 +1,114 @@ +local theme = require("base16").get_colors "base_16" + +-- Standard syntax highlighting + +return { + Boolean = { + fg = theme.base09, + }, + + Character = { + fg = theme.base08, + }, + + Conditional = { + fg = theme.base0E, + }, + + Constant = { + fg = theme.base08, + }, + + Define = { + fg = theme.base0E, + sp = "none", + }, + + Delimiter = { + fg = theme.base0F, + }, + + Float = { + fg = theme.base09, + }, + + Function = { + fg = theme.base0D, + }, + + Identifier = { + fg = theme.base08, + sp = "none", + }, + + Include = { + fg = theme.base0D, + }, + + Keyword = { + fg = theme.base0E, + }, + + Label = { + fg = theme.base0A, + }, + + Number = { + fg = theme.base09, + }, + + Operator = { + fg = theme.base05, + sp = "none", + }, + + PreProc = { + fg = theme.base0A, + }, + + Repeat = { + fg = theme.base0A, + }, + + Special = { + fg = theme.base0C, + }, + + SpecialChar = { + fg = theme.base0F, + }, + + Statement = { + fg = theme.base08, + }, + + StorageClass = { + fg = theme.base0A, + }, + + String = { + fg = theme.base0B, + }, + + Structure = { + fg = theme.base0E, + }, + + Tag = { + fg = theme.base0A, + }, + + Todo = { + fg = theme.base0A, + bg = theme.base01, + }, + + Type = { + fg = theme.base0A, + sp = "none", + }, + + Typedef = { + fg = theme.base0A, + }, +} diff --git a/lua/integrations/treesitter.lua b/lua/integrations/treesitter.lua new file mode 100644 index 0000000..1411d99 --- /dev/null +++ b/lua/integrations/treesitter.lua @@ -0,0 +1,168 @@ +local theme = require("base16").get_colors "base_30" + +return { + TSAnnotation = { + fg = theme.base0F, + sp = "none", + }, + + TSAttribute = { + fg = theme.base0A, + sp = "none", + }, + + TSCharacter = { + fg = theme.base08, + sp = "none", + }, + + TSConstBuiltin = { + fg = theme.base09, + sp = "none", + }, + + TSConstMacro = { + fg = theme.base08, + sp = "none", + }, + + TSError = { + fg = theme.base08, + sp = "none", + }, + + TSException = { + fg = theme.base08, + sp = "none", + }, + + TSFloat = { + fg = theme.base09, + sp = "none", + }, + + TSFuncBuiltin = { + fg = theme.base0D, + sp = "none", + }, + + TSFuncMacro = { + fg = theme.base08, + sp = "none", + }, + + TSKeywordOperator = { + fg = theme.base0E, + sp = "none", + }, + + TSMethod = { + fg = theme.base0D, + sp = "none", + }, + + TSNamespace = { + fg = theme.base08, + sp = "none", + }, + + TSNone = { + fg = theme.base05, + sp = "none", + }, + + TSParameter = { + fg = theme.base08, + sp = "none", + }, + + TSParameterReference = { + fg = theme.base05, + sp = "none", + }, + + TSPunctDelimiter = { + fg = theme.base0F, + sp = "none", + }, + + TSPunctSpecial = { + fg = theme.base05, + sp = "none", + }, + + TSStringRegex = { + fg = theme.base0C, + sp = "none", + }, + + TSStringEscape = { + fg = theme.base0C, + sp = "none", + }, + + TSSymbol = { + fg = theme.base0B, + sp = "none", + }, + + TSTagDelimiter = { + fg = theme.base0F, + sp = "none", + }, + + TSText = { + fg = theme.base05, + sp = "none", + }, + + TSStrong = { + bold = true, + }, + + TSEmphasis = { + fg = theme.base09, + sp = "none", + }, + + TSStrike = { + fg = theme.base00, + sp = "none", + strikethrough = true, + }, + + TSLiteral = { + fg = theme.base09, + sp = "none", + }, + + TSURI = { + fg = theme.base09, + sp = "none", + underline = true, + }, + + TSTypeBuiltin = { + fg = theme.base0A, + sp = "none", + }, + + TSVariableBuiltin = { + fg = theme.base09, + sp = "none", + }, + + TSDefinition = { + sp = theme.base04, + underline = true, + }, + + TSDefinitionUsage = { + sp = theme.base04, + underline = true, + }, + + TSCurrentScope = { + bold = true, + }, +} diff --git a/lua/themes/aquarium-base16.lua b/lua/themes/aquarium-base16.lua deleted file mode 100644 index 95a63c6..0000000 --- a/lua/themes/aquarium-base16.lua +++ /dev/null @@ -1,20 +0,0 @@ -local colors = { - base00 = "#20202A", -- Default Background - base01 = "#2c2e3e", -- Lighter Background (Used for status bars, line number and folding marks) - base02 = "#3D4059", -- Selection Background - base03 = "#313449", -- Comments, Invisibles, Line Highlighting - base04 = "#63718b", -- Dark Foreground (Used for status bars) - base05 = "#ced4df", -- Default Foreground, Caret, Delimiters, Operators - base06 = "#414560", -- Light Foreground (Not often used) - base07 = "#63718b", -- Light Background (Not often used) - base08 = "#ebb9b9", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted (red) - base09 = "#e8cca7", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url (orange) - base0A = "#e6dfb8", -- Classes, Markup Bold, Search Text Background (yellow) - base0B = "#b1dba4", -- Strings, Inherited Class, Markup Code, Diff Inserted (green) - base0C = "#b8dceb", -- Support, Regular Expressions, Escape Characters, Markup Quotes (cyan) - base0D = "#a3b8ef", -- Functions, Methods, Attribute IDs, Headings (blue) - base0E = "#f6bbe7", -- Keywords, Storage, Selector, Markup Italic, Diff Changed (magenta) - base0F = "#eAc1c1", -- Deprecated, Opening/Closing Embedded Language Tags, e.g. `` (pink) -} - -return colors diff --git a/lua/themes/blossom-base16.lua b/lua/themes/blossom-base16.lua deleted file mode 100644 index 7485806..0000000 --- a/lua/themes/blossom-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ - return{ - base00 = "#ede6e3", - base01 = "#dad3d0", - base02 = "#b6b0a6", - base03 = "#938d8a", - base04 = "#afabaa", - base05 = "#6c605a", - base06 = "#938680", - base07 = "#ede6e3", - base08 = "#978e81", - base09 = "#9c7b9c", - base0A = "#b6b0a6", - base0B = "#c99385", - base0C = "#ce9c85", - base0D = "#a09c80", - base0E = "#A3BE8C", - base0F = "#887c76", - } diff --git a/lua/themes/catppuccin-base16.lua b/lua/themes/catppuccin-base16.lua deleted file mode 100644 index 4b6d749..0000000 --- a/lua/themes/catppuccin-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 ="#1E1D2D", - base01 ="#282737", - base02 ="#2f2e3e", - base03 ="#383747", - base04 ="#414050", - base05 ="#bfc6d4", - base06 ="#ccd3e1", - base07 ="#D9E0EE", - base08 ="#DDB6F2", - base09 ="#89DCEB", - base0A ="#F8BD96", - base0B ="#ABE9B3", - base0C ="#F5C2E7", - base0D ="#96CDFB", - base0E ="#F28FAD", - base0F ="#E8A2AF", -} diff --git a/lua/themes/chadracula-base16.lua b/lua/themes/chadracula-base16.lua deleted file mode 100644 index 9cf6ba6..0000000 --- a/lua/themes/chadracula-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#282a36", - base01 = "#3a3c4e", - base02 = "#44475a", - base03 = "#6272a4", - base04 = "#62d6e8", - base05 = "#e9e9f4", - base06 = "#6272a4", - base07 = "#ff95ef", - base08 = "#ffb86c", - base09 = "#bd93f9", - base0A = "#8be9fd", - base0B = "#ffffa5", - base0C = "#8be9fd", - base0D = "#69ff94", - base0E = "#ff92df", - base0F = "#f7f7fb", -} diff --git a/lua/themes/chadtain-base16.lua b/lua/themes/chadtain-base16.lua deleted file mode 100644 index 11e9bbd..0000000 --- a/lua/themes/chadtain-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#1a2026", - base01 = "#242a30", - base02 = "#292f35", - base03 = "#2e343a", - base04 = "#42484e", - base05 = "#d3d3d3", - base06 = "#d8d8d8", - base07 = "#b0b0b0", - base08 = "#c49ea0", - base09 = "#b89294", - base0A = "#ccc9aa", - base0B = "#8aac8b", - base0C = "#8aabac", - base0D = "#6b8bab", - base0E = "#8f8aac", - base0F = "#8b6567", -} diff --git a/lua/themes/classic-dark-base16.lua b/lua/themes/classic-dark-base16.lua deleted file mode 100644 index 4cddf92..0000000 --- a/lua/themes/classic-dark-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#151515", - base01 = "#1f1f1f", - base02 = "#282828", - base03 = "#1b1b1b", - base04 = "#d0d0d0", - base05 = "#d0d0d0", - base06 = "#e0e0e0", - base07 = "#1f1f1f", - base08 = "#AC4142", - base09 = "#F4BF75", - base0A = "#F4BF75", - base0B = "#90A959", - base0C = "#75B5AA", - base0D = "#6A9FB5", - base0E = "#AA759F", - base0F = "#F4BF75", -} diff --git a/lua/themes/doom-chad-base16.lua b/lua/themes/doom-chad-base16.lua deleted file mode 100644 index 185cc16..0000000 --- a/lua/themes/doom-chad-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#282c34", - base01 = "#32363e", - base02 = "#3c4048", - base03 = "#4e525a", - base04 = "#5a5e66", - base05 = "#a7aebb", - base06 = "#b3bac7", - base07 = "#bbc2cf", - base08 = "#ff6c6b", - base09 = "#da8548", - base0A = "#ECBE7B", - base0B = "#98be65", - base0C = "#66c4ff", - base0D = "#48a6e6", - base0E = "#9c94d4", - base0F = "#c85a50", -} diff --git a/lua/themes/everforest-base16.lua b/lua/themes/everforest-base16.lua deleted file mode 100644 index 8573670..0000000 --- a/lua/themes/everforest-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#2b3339", - base01 = "#323c41", - base02 = "#3a4248", - base03 = "#868d80", - base04 = "#d3c6aa", - base05 = "#d3c6aa", - base06 = "#e9e8d2", - base07 = "#fff9e8", - base08 = "#7fbbb3", - base09 = "#d699b6", - base0A = "#83c092", - base0B = "#dbbc7f", - base0C = "#e69875", - base0D = "#a7c080", - base0E = "#e67e80", - base0F = "#d699b6" -} diff --git a/lua/themes/gruvbox-base16.lua b/lua/themes/gruvbox-base16.lua deleted file mode 100644 index 314da91..0000000 --- a/lua/themes/gruvbox-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#282828", - base01 = "#3c3836", - base02 = "#504945", - base03 = "#665c54", - base04 = "#bdae93", - base05 = "#d5c4a1", - base06 = "#ebdbb2", - base07 = "#fbf1c7", - base08 = "#fb4934", - base09 = "#fe8019", - base0A = "#fabd2f", - base0B = "#b8bb26", - base0C = "#8ec07c", - base0D = "#83a598", - base0E = "#d3869b", - base0F = "#d65d0e", -} diff --git a/lua/themes/gruvchad-base16.lua b/lua/themes/gruvchad-base16.lua deleted file mode 100644 index 459d860..0000000 --- a/lua/themes/gruvchad-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base0A = "#e0c080", - base04 = "#d4be98", - base07 = "#c7b89d", - base05 = "#c0b196", - base0E = "#d3869b", - base0D = "#7daea3", - base0C = "#86b17f", - base0B = "#a9b665", - base02 = "#36393a", - base0F = "#d65d0e", - base03 = "#404344", - base08 = "#ec6b64", - base01 = "#2c2f30", - base00 = "#1e2122", - base09 = "#e78a4e", - base06 = "#c3b499" -} diff --git a/lua/themes/javacafe-base16.lua b/lua/themes/javacafe-base16.lua deleted file mode 100644 index 84e5b8e..0000000 --- a/lua/themes/javacafe-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base0A = "#f5d595", - base04 = "#4f565d", - base07 = "#b5bcc9", - base05 = "#ced4df", - base0E = "#c2a2e3", - base0D = "#a3b8ef", - base0C = "#abb9e0", - base0B = "#a5d4af", - base02 = "#31383f", - base0F = "#e88e9b", - base03 = "#40474e", - base08 = "#ef8891", - base01 = "#2c333a", - base00 = "#131a21", - base09 = "#EDA685", - base06 = "#d3d9e4" -} diff --git a/lua/themes/jellybeans-base16.lua b/lua/themes/jellybeans-base16.lua deleted file mode 100644 index 27d2fc8..0000000 --- a/lua/themes/jellybeans-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#151515", - base01 = "#1c1c1c", - base02 = "#404040", - base03 = "#888888", - base04 = "#ddddbf", - base05 = "#e8e8d3", - base06 = "#eeeede", - base07 = "#f1f1e5", - base08 = "#c6b6ee", - base09 = "#cf6a4c", - base0A = "#fad07a", - base0B = "#99ad6a", - base0C = "#fabb6e", - base0D = "#fabb6e", - base0E = "#8197bf", - base0F = "#fad07a", -} diff --git a/lua/themes/kanagawa-base16.lua b/lua/themes/kanagawa-base16.lua deleted file mode 100644 index a2e6058..0000000 --- a/lua/themes/kanagawa-base16.lua +++ /dev/null @@ -1,19 +0,0 @@ --- ",Originally by rebelot(https://github.com/rebelot), ported by montdor (https://github.com/montdor)", -return { - base00 = "#1f1f28", - base01 = "#2a2a37", - base02 = "#223249", - base03 = "#727169", - base04 = "#c8c093", - base05 = "#dcd7ba", - base06 = "#938aa9", - base07 = "#363646", - base08 = "#e46876", - base09 = "#ffa066", - base0A = "#dca561", - base0B = "#98bb6c", - base0C = "#7fb4ca", - base0D = "#7e9cd8", - base0E = "#957fb8", - base0F = "#d27e99", -} diff --git a/lua/themes/lfgruv-base16.lua b/lua/themes/lfgruv-base16.lua deleted file mode 100644 index 782e3aa..0000000 --- a/lua/themes/lfgruv-base16.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - base00 = "#282828", - base01 = "#3c3836", - base02 = "#504945", - base03 = "#665c54", - base04 = "#bdae93", - base05 = "#d5c4a1", - base06 = "#ebdbb2", - base07 = "#fbf1c7", - base08 = "#b66467", - base09 = "#958793", - base0A = "#dcbb8c", - base0B = "#8d987e", - base0C = "#8aa6a5", - base0D = "#8aa6a5", - base0E = "#b66467", - base0F = "#d3d3c4", -} - diff --git a/lua/themes/monekai-base16.lua b/lua/themes/monekai-base16.lua deleted file mode 100644 index 886a3a7..0000000 --- a/lua/themes/monekai-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#242730", - base01 = "#2a2e38", - base02 = "#484854", - base03 = "#545862", - base04 = "#9ca0a4", - base05 = "#bbc2cf", - base06 = "#5d656b", - base07 = "#4d5550", - base08 = "#51afef", - base09 = "#e18ef3", - base0A = "#5ac9d6", - base0B = "#e6c181", - base0C = "#96c376", - base0D = "#96c376", - base0E = "#e36d76", - base0F = "#bbc2cf", -} diff --git a/lua/themes/monokai-base16.lua b/lua/themes/monokai-base16.lua deleted file mode 100644 index b8c3fc3..0000000 --- a/lua/themes/monokai-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#272822", - base01 = "#383830", - base02 = "#49483e", - base03 = "#75715e", - base04 = "#a59f85", - base05 = "#f8f8f2", - base06 = "#f5f4f1", - base07 = "#f9f8f5", - base08 = "#f92672", - base09 = "#fd971f", - base0A = "#f4bf75", - base0B = "#a6e22e", - base0C = "#a1efe4", - base0D = "#66d9ef", - base0E = "#ae81ff", - base0F = "#cc6633" -} diff --git a/lua/themes/mountain-base16.lua b/lua/themes/mountain-base16.lua deleted file mode 100644 index b051cd9..0000000 --- a/lua/themes/mountain-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#0f0f0f", - base01 = "#151515", - base02 = "#191919", - base03 = "#222222", - base04 = "#535353", - base05 = "#f0f0f0", - base06 = "#d8d8d8", - base07 = "#414141", - base08 = "#ac8a8c", - base09 = "#d3d0ad", - base0A = "#ACA98A", - base0B = "#8aac8b", - base0C = "#9EC3C4", - base0D = "#8fb4b5", - base0E = "#C49EC4", - base0F = "#9d9a7b", -} diff --git a/lua/themes/nightlamp-base16.lua b/lua/themes/nightlamp-base16.lua deleted file mode 100644 index ead2471..0000000 --- a/lua/themes/nightlamp-base16.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - base00 = "#18191f", - base01 = "#222329", - base02 = "#2c2d33", - base03 = "#3c3d43", - base04 = "#b5ac9b", - base05 = "#cbc0ab", - base06 = "#e0d6bd", - base07 = "#f1ebd1", - base08 = "#b8aad9", - base09 = "#b17f81", - base0A = "#d4ae80", - base0B = "#8aa387", - base0C = "#9ba292", - base0D = "#c495a2", - base0E = "#8896ae", - base0F = "#d0d0c7", - } - \ No newline at end of file diff --git a/lua/themes/nord-base16.lua b/lua/themes/nord-base16.lua deleted file mode 100644 index 8d977cf..0000000 --- a/lua/themes/nord-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#2E3440", - base01 = "#3B4252", - base02 = "#434C5E", - base03 = "#4C566A", - base04 = "#D8DEE9", - base05 = "#E5E9F0", - base06 = "#ECEFF4", - base07 = "#8FBCBB", - base08 = "#88C0D0", - base09 = "#81A1C1", - base0A = "#88C0D0", - base0B = "#A3BE8C", - base0C = "#81A1C1", - base0D = "#81A1C1", - base0E = "#81A1C1", - base0F = "#B48EAD", -} diff --git a/lua/themes/one-light-base16.lua b/lua/themes/one-light-base16.lua deleted file mode 100644 index 973de20..0000000 --- a/lua/themes/one-light-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#fafafa", - base01 = "#f0f0f1", - base02 = "#e5e5e6", - base03 = "#a0a1a7", - base04 = "#696c77", - base05 = "#383a42", - base06 = "#202227", - base07 = "#090a0b", - base08 = "#ca1243", - base09 = "#d75f00", - base0A = "#c18401", - base0B = "#50a14f", - base0C = "#0184bc", - base0D = "#4078f2", - base0E = "#a626a4", - base0F = "#986801", -} diff --git a/lua/themes/onebright-base16.lua b/lua/themes/onebright-base16.lua deleted file mode 100644 index db6ff10..0000000 --- a/lua/themes/onebright-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#1e222a", - base01 = "#353b45", - base02 = "#3e4451", - base03 = "#4a4a4a", - base04 = "#b2ccd6", - base05 = "#eeffff", - base06 = "#eeffff", - base07 = "#ffffff", - base08 = "#f07178", - base09 = "#f78c6c", - base0A = "#ffcb6b", - base0B = "#c3e88d", - base0C = "#89ddff", - base0D = "#82aaff", - base0E = "#c792ea", - base0F = "#ff5370" -} diff --git a/lua/themes/onedark-base16.lua b/lua/themes/onedark-base16.lua deleted file mode 100644 index dca1876..0000000 --- a/lua/themes/onedark-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#1e222a", - base01 = "#353b45", - base02 = "#3e4451", - base03 = "#545862", - base04 = "#565c64", - base05 = "#abb2bf", - base06 = "#b6bdca", - base07 = "#c8ccd4", - base08 = "#e06c75", - base09 = "#d19a66", - base0A = "#e5c07b", - base0B = "#98c379", - base0C = "#56b6c2", - base0D = "#61afef", - base0E = "#c678dd", - base0F = "#be5046", -} diff --git a/lua/themes/onedark-deep-base16.lua b/lua/themes/onedark-deep-base16.lua deleted file mode 100644 index 3d49d1f..0000000 --- a/lua/themes/onedark-deep-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#1a212e", - base01 = "#1e2532", - base02 = "#21283b", - base03 = "#4f5f7e", - base04 = "#596988", - base05 = "#6c7d9c", - base06 = "#b6bdca", - base07 = "#c8ccd4", - base08 = "#f65866", - base09 = "#ea8912", - base0A = "#ebc275", - base0B = "#8bcd5b", - base0C = "#52a0e0", - base0D = "#41a7fc", - base0E = "#c678dd", - base0F = "#f65866", -} diff --git a/lua/themes/onejelly-base16.lua b/lua/themes/onejelly-base16.lua deleted file mode 100644 index 71de815..0000000 --- a/lua/themes/onejelly-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#151515", - base01 = "#2e2e2e", - base02 = "#3a3a3a", - base03 = "#424242", - base04 = "#474747", - base05 = "#d9d9c4", - base06 = "#dedec9", - base07 = "#f1f1e5", - base08 = "#dd785a", - base09 = "#c99f4a", - base0A = "#e1b655", - base0B = "#99ad6a", - base0C = "#7187af", - base0D = "#8fa5cd", - base0E = "#e18be1", - base0F = "#cf6a4c", -} diff --git a/lua/themes/onenord-base16.lua b/lua/themes/onenord-base16.lua deleted file mode 100644 index 24b5788..0000000 --- a/lua/themes/onenord-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base0A = "#EBCB8B", - base04 = "#566074", - base07 = "#ced4df", - base05 = "#bfc5d0", - base0E = "#B48EAD", - base0D = "#81A1C1", - base0C = "#97b7d7", - base0B = "#A3BE8C", - base02 = "#434C5E", - base0F = "#d57780", - base03 = "#4C566A", - base08 = "#d57780", - base01 = "#3B4252", - base00 = "#2a303c", - base09 = "#e39a83", - base06 = "#c7cdd8" -} diff --git a/lua/themes/palenight-base16.lua b/lua/themes/palenight-base16.lua deleted file mode 100644 index 948f90f..0000000 --- a/lua/themes/palenight-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#292d3e", - base01 = "#444267", - base02 = "#32374d", - base03 = "#676e95", - base04 = "#8796b0", - base05 = "#959dcb", - base06 = "#959dcb", - base07 = "#ffffff", - base08 = "#f07178", - base09 = "#f78c6c", - base0A = "#ffcb6b", - base0B = "#c3e88d", - base0C = "#89ddff", - base0D = "#82aaff", - base0E = "#c792ea", - base0F = "#ff5370" - } diff --git a/lua/themes/paradise-base16.lua b/lua/themes/paradise-base16.lua deleted file mode 100644 index ce65d3a..0000000 --- a/lua/themes/paradise-base16.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - base00 = "#151515", - base01 = "#1f1f1f", - base02 = "#282828", - base03 = "#3b3b3b", - base04 = "#e8e3e3", - base05 = "#e8e3e3", - base06 = "#e8e3e3", - base07 = "#e8e3e3", - base08 = "#b66467", - base09 = "#d9bc8c", - base0A = "#d9bc8c", - base0B = "#8c977d", - base0C = "#8aa6a2", - base0D = "#8da3b9", - base0E = "#a988b0", - base0F = "#d9bc8c", -} - diff --git a/lua/themes/penokai-base16.lua b/lua/themes/penokai-base16.lua deleted file mode 100644 index cd87541..0000000 --- a/lua/themes/penokai-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#2a2f38", - base01 = "#323c41", - base02 = "#3a4248", - base03 = "#868d80", - base04 = "#d3c6aa", - base05 = "#e1e3e4", - base06 = "#e1e3e4", - base07 = "#fff9e8", - base08 = "#6dc7e3", - base09 = "#d699b6", - base0A = "#83c092", - base0B = "#eacb64", - base0C = "#ff6578", - base0D = "#9dd274", - base0E = "#f69c5e", - base0F = "#ba9cf3" -} diff --git a/lua/themes/solarized-base16.lua b/lua/themes/solarized-base16.lua deleted file mode 100644 index 3da3203..0000000 --- a/lua/themes/solarized-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#002b36", - base01 = "#073642", - base02 = "#586e75", - base03 = "#657b83", - base04 = "#839496", - base05 = "#93a1a1", - base06 = "#eee8d5", - base07 = "#fdf6e3", - base08 = "#dc322f", - base09 = "#cb4b16", - base0A = "#b58900", - base0B = "#859900", - base0C = "#2aa198", - base0D = "#268bd2", - base0E = "#6c71c4", - base0F = "#d33682" -} diff --git a/lua/themes/tokyodark-base16.lua b/lua/themes/tokyodark-base16.lua deleted file mode 100644 index a544bda..0000000 --- a/lua/themes/tokyodark-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#11121d", - base01 = "#1b1c27", - base02 = "#21222d", - base03 = "#282934", - base04 = "#30313c", - base05 = "#abb2bf", - base06 = "#b2b9c6", - base07 = "#b9c0cd", - base08 = "#ee6d85", - base09 = "#7199ee", - base0A = "#7199ee", - base0B = "#dfae67", - base0C = "#a485dd", - base0D = "#95c561", - base0E = "#a485dd", - base0F = "#f3627a", -} diff --git a/lua/themes/tokyonight-base16.lua b/lua/themes/tokyonight-base16.lua deleted file mode 100644 index 77a916c..0000000 --- a/lua/themes/tokyonight-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base0A = "#e0af68", - base04 = "#565c64", - base07 = "#c0caf5", - base05 = "#a9b1d6", - base0E = "#9d7cd8", - base0D = "#7aa2f7", - base0C = "#2ac3de", - base0B = "#9ece6a", - base02 = "#3b4261", - base0F = "#9abdf5", - base03 = "#545c7e", - base08 = "#f7768e", - base01 = "#3b4261", - base00 = "#1A1B26", - base09 = "#ff9e64", - base06 = "#bbc5f0" -} diff --git a/lua/themes/tomorrow-night-base16.lua b/lua/themes/tomorrow-night-base16.lua deleted file mode 100644 index 068e09d..0000000 --- a/lua/themes/tomorrow-night-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base0A = "#f0c674", - base04 = "#b4b7b4", - base07 = "#ffffff", - base05 = "#c5c8c6", - base0E = "#b294bb", - base0D = "#81a2be", - base0C = "#8abeb7", - base0B = "#b5bd68", - base02 = "#373b41", - base0F = "#a3685a", - base03 = "#969896", - base08 = "#cc6666", - base01 = "#282a2e", - base00 = "#1d1f21", - base09 = "#de935f", - base06 = "#e0e0e0" -} diff --git a/lua/themes/wombat-base16.lua b/lua/themes/wombat-base16.lua deleted file mode 100644 index 0cbf7f4..0000000 --- a/lua/themes/wombat-base16.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - base00 = "#080808", - base01 = "#1c1c1c", - base02 = "#292929", - base03 = "#87875f", - base04 = "#857b6f", - base05 = "#c6c6c6", - base06 = "#d2d2d2", - base07 = "#dedede", - base08 = "#c6c6c6", - base09 = "#d7875f", - base0A = "#d7ff87", - base0B = "#87d75f", - base0C = "#ffd7af", - base0D = "#d7ff87", - base0E = "#87afff", - base0F = "#dc8c64", -}