diff --git a/.gitignore b/.gitignore index 69b142e..81f943e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .tests/ +.envrc diff --git a/README.md b/README.md index 7539ce9..3857b09 100644 --- a/README.md +++ b/README.md @@ -172,10 +172,10 @@ Heres the default config table -- } -- }, -- remaps.highlights = { - -- rose_pine = { - -- base = { + -- rose_pine = function(cp) -- cp is theme color palette + -- return { base = { -- Normal = { bg = "#000000" } - -- }, + -- }, } -- } -- }, -- @@ -199,6 +199,12 @@ Heres the default config table telescope = true, }, enable_installer = false, -- enable installer module + + time = {}, -- Time based colorscheme switch + -- time = { + -- ["rose_pine"] = { "13-14", "15-16" }, -- syntax ["colorscheme"] = { "start-end", "start2-end2" }, + -- Apply rose_pine from 1300 to 1400 hours and then from 1500 to 1600 hours, for rest of the day use the colorscheme in 'colorscheme' variable + -- }, } ``` diff --git a/colors/themer_catppuccin-frappe.lua b/colors/themer_catppuccin-frappe.lua new file mode 100644 index 0000000..46f4d1e --- /dev/null +++ b/colors/themer_catppuccin-frappe.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "catppuccin-frappe" }) diff --git a/colors/themer_catppuccin-latte.lua b/colors/themer_catppuccin-latte.lua new file mode 100644 index 0000000..c3ebf26 --- /dev/null +++ b/colors/themer_catppuccin-latte.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "catppuccin-latte" }) diff --git a/colors/themer_catppuccin-macchiato.lua b/colors/themer_catppuccin-macchiato.lua new file mode 100644 index 0000000..805133d --- /dev/null +++ b/colors/themer_catppuccin-macchiato.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "catppuccin-macchiato" }) diff --git a/colors/themer_catppuccin-mocha.lua b/colors/themer_catppuccin-mocha.lua new file mode 100644 index 0000000..f04b71e --- /dev/null +++ b/colors/themer_catppuccin-mocha.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "catppuccin-mocha" }) diff --git a/colors/themer_dayfox.lua b/colors/themer_dayfox.lua new file mode 100644 index 0000000..e78917c --- /dev/null +++ b/colors/themer_dayfox.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "dayfox" }) diff --git a/colors/themer_gruvbox-light-medium.lua b/colors/themer_gruvbox-light-medium.lua new file mode 100644 index 0000000..bc052f3 --- /dev/null +++ b/colors/themer_gruvbox-light-medium.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "gruvbox-light-medium" }) diff --git a/colors/themer_gruvchad.lua b/colors/themer_gruvchad.lua new file mode 100644 index 0000000..67fd5ce --- /dev/null +++ b/colors/themer_gruvchad.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "gruvchad" }) diff --git a/colors/themer_horizon-dark.lua b/colors/themer_horizon-dark.lua new file mode 100644 index 0000000..e822b95 --- /dev/null +++ b/colors/themer_horizon-dark.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "horizon-dark" }) diff --git a/colors/themer_nightfox.lua b/colors/themer_nightfox.lua new file mode 100644 index 0000000..72471e5 --- /dev/null +++ b/colors/themer_nightfox.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "nightfox" }) diff --git a/colors/themer_untitled.lua b/colors/themer_untitled.lua new file mode 100644 index 0000000..6af12e1 --- /dev/null +++ b/colors/themer_untitled.lua @@ -0,0 +1 @@ +require("themer").setup({ colorscheme = "untitled" }) diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..902882d --- /dev/null +++ b/flake.lock @@ -0,0 +1,188 @@ +{ + "nodes": { + "devshell": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1655976588, + "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=", + "owner": "numtide", + "repo": "devshell", + "rev": "899ca4629020592a13a46783587f6e674179d1db", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "master", + "repo": "devshell", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1656065134, + "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "master", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "neovim-flake": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nvim-nightly", + "nixpkgs" + ] + }, + "locked": { + "dir": "contrib", + "lastModified": 1656521629, + "narHash": "sha256-U+y79drJlCJymPwlYbNtNSqPR3aPyb36bhd7+gVT220=", + "owner": "neovim", + "repo": "neovim", + "rev": "6f6286e4f90da25a7d1b6bcc96b79b0ccbaf5c26", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1643381941, + "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1656500841, + "narHash": "sha256-13IRoh3uu29S4IfoVO6Sb0UPwzDhSqXoBKKQ4ssEzF0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "be6da3774db3746e6ae94bf412dd3707e35b2800", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1656461576, + "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nvim-nightly": { + "inputs": { + "flake-compat": "flake-compat", + "neovim-flake": "neovim-flake", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1656577069, + "narHash": "sha256-rd5Z34t9ZnAWu/6dfcTImCJGIvYCkOxYWGvSDxPZV7o=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "07ffc512ce0c8581da47dc4a35057ecbdaef6216", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "root": { + "inputs": { + "devshell": "devshell", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", + "nvim-nightly": "nvim-nightly" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..6f7c8ea --- /dev/null +++ b/flake.nix @@ -0,0 +1,24 @@ +{ + description = "Dev Shell For Meteroite"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; + flake-utils.url = "github:numtide/flake-utils/master"; + devshell.url = "github:numtide/devshell/master"; + nvim-nightly.url = "github:nix-community/neovim-nightly-overlay"; + }; + outputs = { self, nixpkgs, flake-utils, nvim-nightly, devshell }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ devshell.overlay nvim-nightly.overlay ]; + }; + + in { + devShell = pkgs.devshell.mkShell { + name = "themer-dev-shell"; + packages = with pkgs; [ neovim-nightly stylua selene sumneko-lua-language-server alejandra rnix-lsp luajit ]; + }; + }); +} diff --git a/lua/telescope/_extensions/themes.lua b/lua/telescope/_extensions/themes.lua index a7fbd74..06a873e 100644 --- a/lua/telescope/_extensions/themes.lua +++ b/lua/telescope/_extensions/themes.lua @@ -1,14 +1,12 @@ -local has_telescope, telescope = pcall(require, "telescope") -if not has_telescope then - vim.notify("Themer: The themes picker needs nvim-telescope/telescope.nvim", vim.log.levels.ERROR) -end +local telescope = require("telescope") local actions = require("telescope.actions") local action_state = require("telescope.actions.state") local pickers = require("telescope.pickers") local finders = require("telescope.finders") +local config = require("themer.config").options local function get_theme() - local disable_themes = require("themer.config")("get").disable_telescope_themes + local disable_themes = config.disable_telescope_themes -- local themes = {} -- local theme_dir = debug.getinfo(2, "S").source:sub(2) -- theme_dir = theme_dir:gsub("lua/telescope/_extensions/themes.lua", "") @@ -78,7 +76,7 @@ local function themer(opts) }), previewer = false, attach_mappings = function(prompt_bufnr, map) - for type, value in pairs(require("themer.config")("get").telescope_mappings) do + for type, value in pairs(config.telescope_mappings) do for bind, method in pairs(value) do map(type, bind, function() if method == "enter" then diff --git a/lua/themer/config.lua b/lua/themer/config.lua index 76b891d..bf71353 100644 --- a/lua/themer/config.lua +++ b/lua/themer/config.lua @@ -1,4 +1,6 @@ -local options = { +local config = {} + +config.options = { colorscheme = nil, -- default colorscheme transparent = false, term_colors = true, @@ -60,11 +62,11 @@ local options = { -- } -- }, -- remaps.highlights = { - -- rose_pine = { - -- base = { - -- Normal = { bg = "#000000" } - -- }, - -- } + -- rose_pine = function(cp) -- cp is the color palette + -- return { base = { + -- Normal = { bg = cp.fg } + -- },} + -- end, -- }, -- -- Also you can do remaps.highlights.globals for global highlight remaps @@ -85,6 +87,7 @@ local options = { gitsigns = true, lsp = true, telescope = true, + nvim_tree = true, }, -- Default telescope picker mappings @@ -104,35 +107,34 @@ local options = { }, enable_installer = false, -- toggle to enable installer + + time = { enable = false }, -- Time based colorscheme switch + -- time = { + -- ["rose_pine"] = { "13-14", "15-16" }, -- syntax ["colorscheme"] = { "start-end", "start2-end2" }, + -- Apply rose_pine from 1300 to 1400 hours and then from 1500 to 1600 hours, for rest of the day use the colorscheme in 'colorscheme' variable + -- }, } ---- [[ ---- internal: iterate given options over the default config (for internal purposes) ---- user: iterate given options over the default config and loads the colorscheme ---- get: returns the options ---- ]] ---- @param type string --- @param opts table -local setup = function(type, opts) - if type == "get" then - return options - elseif type == "internal" then - options = vim.tbl_deep_extend("force", options, opts or {}) - elseif type == "user" then - options = vim.tbl_deep_extend("force", options, opts or {}) - if options.colorscheme then - require("themer.modules.core")(options.colorscheme) - end - -- Load installed themes - if options.enable_installer then - if require("themer.utils.fs").exists(vim.fn.stdpath("data") .. "/themer") ~= true then - os.execute("mkdir " .. vim.fn.stdpath("data") .. "/themer") - end - vim.cmd([[command! -nargs=0 ThemerInstall :lua require("themer.modules.installer").fuzzy_install()]]) - vim.cmd([[command! -nargs=0 ThemerUnInstall :lua require("themer.modules.installer").fuzzy_uninstall()]]) - require("themer.modules.installer.load_installed").load_installed_themes() - end +config.setup = function(opts) + config.options = vim.tbl_deep_extend("force", config.options, opts or {}) + + -- time module + if config.options.time.enable then + config.options.colorscheme = require("themer.modules.time")(config.options.colorscheme, config.options.time) + end + + -- load colorscheme + if config.options.colorscheme then + require("themer.modules.core")(config.options.colorscheme) + end + + -- Load installed themes + if config.options.enable_installer then + vim.defer_fn(function() + require("themer.modules.installer.utils").load_installer() + end, 10) end end -return setup +return config diff --git a/lua/themer/init.lua b/lua/themer/init.lua index 786faca..de24bf6 100644 --- a/lua/themer/init.lua +++ b/lua/themer/init.lua @@ -4,7 +4,7 @@ local init = {} ---@param opts table init.setup = function(opts) opts = opts or {} - require("themer.config")("user", opts) + require("themer.config").setup(opts) end return init diff --git a/lua/themer/modules/core/api.lua b/lua/themer/modules/core/api.lua index 62d91fd..e142a7e 100644 --- a/lua/themer/modules/core/api.lua +++ b/lua/themer/modules/core/api.lua @@ -4,8 +4,9 @@ local api = {} ---@param cs string api.get_cp = function(cs) local ok, csc = pcall(require, "themer.modules.themes." .. cs) - local remaps = require("themer.config")("get").remaps.palette[cs] or {} - local remaps_global = require("themer.config")("get").remaps.palette.globals or {} + local config = require("themer.config").options + local remaps = config.remaps.palette[cs] or {} + local remaps_global = config.remaps.palette.globals or {} if not ok then vim.notify( @@ -21,6 +22,10 @@ If this is a bug, report it at https://github.com/narutoxy/themer.lua]], return false end + -- Expensive as fuck + -- TODO: look for better way + require("themer.utils.str").deep_replace(csc, "#0", csc.fg or "#ffffff") + if not (next(remaps or remaps_global) == nil) then return vim.tbl_deep_extend("force", csc, remaps_global, remaps) else diff --git a/lua/themer/modules/core/init.lua b/lua/themer/modules/core/init.lua index c1ac84d..e9abe52 100644 --- a/lua/themer/modules/core/init.lua +++ b/lua/themer/modules/core/init.lua @@ -8,7 +8,11 @@ local load = function(cs) color_palette = require("themer.modules.core.api").get_cp(cs) end if color_palette then - require("themer.modules.core.utils").load_mapper_higs(require("themer.modules.core.mapper")(color_palette, cs), cs) + require("themer.modules.core.utils").load_mapper_higs( + require("themer.modules.core.mapper")(color_palette, cs), + cs, + color_palette + ) end end diff --git a/lua/themer/modules/core/mapper.lua b/lua/themer/modules/core/mapper.lua index 40b8ca3..44041ec 100644 --- a/lua/themer/modules/core/mapper.lua +++ b/lua/themer/modules/core/mapper.lua @@ -1,4 +1,4 @@ -local config = require("themer.config")("get") +local config = require("themer.config").options ---@return table a cleaned styles ---@param cp table @@ -6,8 +6,8 @@ local config = require("themer.config")("get") local function remap_styles(cp) local groups = { heading = { - h1 = { style = "bold", fg = cp.heading.h1 or cp.fg }, - h2 = { style = "bold", fg = cp.heading.h2 or cp.fg }, + h1 = { bold = true, fg = cp.heading.h1 or cp.fg }, + h2 = { bold = true, fg = cp.heading.h2 or cp.fg }, }, ["function"] = { fg = cp.syntax["function"] }, functionBuiltIn = { fg = cp.built_in["function"] }, @@ -27,7 +27,7 @@ local function remap_styles(cp) comment = { fg = cp.syntax.comment or cp.dimmed.subtle }, punctuation = { fg = cp.syntax.punctuation }, constructor = { fg = cp.syntax.constructor or cp.syntax.punctuation }, - operator = { fg = cp.syntax.operator or cp.sytax.punctuation }, + operator = { fg = cp.syntax.operator or cp.syntax.punctuation }, constant = { fg = cp.syntax.constant }, constantBuiltIn = { fg = cp.built_in.constant }, todo = cp.syntax.todo, @@ -35,20 +35,20 @@ local function remap_styles(cp) conditional = { fg = cp.syntax.conditional }, number = { fg = cp.syntax.number }, statement = { fg = cp.syntax.statement or cp.accent }, - uri = { fg = cp.uri, style = "underline" }, + uri = { fg = cp.uri, underline = true }, diagnostic = { underline = { - error = { fg = cp.diagnostic.error, style = "undercurl" }, - warn = { fg = cp.diagnostic.warn, style = "undercurl" }, - info = { fg = cp.diagnostic.info, style = "undercurl" }, - hint = { fg = cp.diagnostic.hint, style = "undercurl" }, + error = { fg = cp.diagnostic.error, undercurl = true }, + warn = { fg = cp.diagnostic.warn, undercurl = true }, + info = { fg = cp.diagnostic.info, undercurl = true }, + hint = { fg = cp.diagnostic.hint, undercurl = true }, }, virtual_text = { - error = { fg = cp.diagnostic.error, style = "italic" }, - warn = { fg = cp.diagnostic.warn, style = "italic" }, - info = { fg = cp.diagnostic.info, style = "italic" }, - hint = { fg = cp.diagnostic.hint, style = "italic" }, + error = { fg = cp.diagnostic.error, italic = true }, + warn = { fg = cp.diagnostic.warn, italic = true }, + info = { fg = cp.diagnostic.info, italic = true }, + hint = { fg = cp.diagnostic.hint, italic = true }, }, }, } @@ -64,6 +64,8 @@ local function get_base(cp) cp.bg.base = config.transparent and "NONE" or cp.bg.base cp.bg.alt = config.transparent and "NONE" or cp.bg.alt + cp.diff.delete = cp.diff.delete or cp.diff.remove + cp.gitsigns = cp.gitsigns or cp.diff local groups = remap_styles(cp) @@ -73,7 +75,7 @@ local function get_base(cp) ThemerAccent = { fg = cp.accent }, ThemerAccentFloat = { fg = cp.accent, bg = cp.bg.alt }, ThemerFloat = { bg = cp.bg.alt }, - ThemerMatch = { fg = cp.match, style = "bold" }, + ThemerMatch = { fg = cp.match, bold = true }, ThemerNormal = { fg = cp.fg, bg = cp.bg.base }, ThemerNormalFloat = { fg = cp.fg, bg = cp.bg.alt }, ThemerSelected = { bg = cp.bg.selected }, @@ -85,7 +87,7 @@ local function get_base(cp) DiffAdd = { bg = cp.diff.add, fg = "NONE" }, DiffChange = { bg = cp.diff.change, fg = "NONE" }, DiffText = { bg = cp.diff.text or cp.fg, fg = "NONE" }, - DiffDelete = { bg = cp.diff.remove or cp.diff.delete, fg = "NONE" }, + DiffDelete = { bg = cp.diff.remove, fg = "NONE" }, GitSignsAdd = { fg = cp.gitsigns.add, bg = "NONE" }, GitSignsDelete = { fg = cp.gitsigns.delete or cp.gitsigns.remove, bg = "NONE" }, GitSignsChange = { fg = cp.gitsigns.change, bg = "NONE" }, @@ -148,9 +150,9 @@ local function get_base(cp) local base = { ColorColumn = { link = "ThemerFloat" }, Conceal = { bg = cp.conceal or "NONE" }, - Cursor = { style = "reverse" }, + Cursor = { reverse = true }, CursorColumn = { link = "ThemerFloat" }, - CursorIM = { style = "reverse" }, + CursorIM = { reverse = true }, CursorLine = { link = "ThemerSelected" }, CursorLineNr = { fg = cp.cursorlinenr or cp.fg }, DarkenedPanel = { link = "ThemerFloat" }, @@ -180,11 +182,12 @@ local function get_base(cp) -- QuickFixLine = {}, Search = { link = "ThemerSearchResult" }, SpecialKey = { link = "NonText" }, - -- SpellBad = { style = "undercurl", sp = cp.red }, - -- SpellCap = { style = "undercurl", sp = cp.subtle }, - -- SpellLocal = { style = "undercurl", sp = cp.subtle }, - -- SpellRare = { style = "undercurl", sp = cp.subtle }, + -- SpellBad = { undercurl = true, sp = cp.red }, + -- SpellCap = { undercurl = true, sp = cp.subtle }, + -- SpellLocal = { undercurl = true, sp = cp.subtle }, + -- SpellRare = { undercurl = true, sp = cp.subtle }, SignColumn = { link = "ThemerNormal" }, + FoldColumn = { link = "ThemerNormal" }, StatusLine = { link = "ThemerNormalFloat" }, StatusLineNC = { link = "ThemerSubtleFloat" }, -- StatusLineTerm = {}, @@ -220,7 +223,7 @@ local function get_base(cp) String = { link = "ThemerString" }, Type = { link = "ThemerType" }, Typedef = { link = "ThemerType" }, - Underlined = { fg = cp.accent, style = "underline" }, + Underlined = { fg = cp.accent, underline = true }, -- Neovim @@ -239,11 +242,13 @@ local function get_base(cp) local availablePlugins = { cmp = { + CmpScrollBar = { fg = cp.pum.sbar }, + CmpScrollThumb = { fg = cp.pum.thumb }, CmpDocumentation = { fg = cp.fg }, CmpDocumentationBorder = { link = "ThemerBorder" }, CmpItemAbbr = { fg = cp.fg }, - CmpItemAbbrDeprecated = { fg = cp.fg, bg = "NONE", style = "strikethrough" }, + CmpItemAbbrDeprecated = { fg = cp.fg, bg = "NONE", strikethrough = true }, CmpItemAbbrMatch = { link = "ThemerMatch" }, CmpItemAbbrMatchFuzzy = { link = "ThemerMatch" }, @@ -278,11 +283,11 @@ local function get_base(cp) }, indentline = { - IndentBlanklineChar = { fg = cp.dimmed.subtle, style = "nocombine" }, - IndentBlanklineContextChar = { fg = cp.accent, style = "nocombine" }, + IndentBlanklineChar = { fg = cp.dimmed.subtle, nocombine = true }, + IndentBlanklineContextChar = { fg = cp.accent, nocombine = true }, IndentBlanklineSpaceChar = { link = "IndentBlanklineChar" }, IndentBlanklineSpaceCharBlankline = { link = "IndentBlanklineChar" }, - IndentBlanklineContextStart = { style = "underline", sp = cp.accent }, + IndentBlanklineContextStart = { underline = true, sp = cp.accent }, }, lsp = { @@ -369,7 +374,7 @@ local function get_base(cp) -- TSSymbol = {}, TSTag = { fg = cp.syntax.tag or cp.statement }, TSTagDelimiter = { link = "ThemerSubtle" }, - TSText = { link = "ThemerText" }, + TSText = { link = "ThemerNormal" }, TSTitle = { link = "ThemerHeadingH1" }, TSType = { link = "ThemerType" }, TSTypeBuiltin = { link = "ThemerTypeBuiltIn" }, @@ -381,6 +386,18 @@ local function get_base(cp) commentTSNote = { link = "ThemerTodo" }, commentTSWarning = { link = "DiagnosticWarn" }, }, + + nvim_tree = { + NvimTreeEmptyFolderName = { link = "ThemerDimmedFloat" }, + NvimTreeFolderIcon = { link = "ThemerSubtleFloat" }, + NvimTreeFolderName = { link = "ThemerNormalFloat" }, + NvimTreeImageFile = { link = "ThemerNormalFloat" }, + NvimTreeNormal = { link = "ThemerNormalFloat" }, + NvimTreeOpenedFile = { link = "ThemerSelected" }, + NvimTreeOpenedFolderName = { link = "ThemerAccentFloat" }, + NvimTreeSpecialFile = { link = "NvimTreeNormal" }, + NvimTreeWindowPicker = { link = "ThemerNormalFloat" }, + }, } ----------------------------- @@ -430,13 +447,7 @@ end --- @return table local function get_hig_groups(cp, cs) local hig_groups = get_base(cp) - hig_groups = vim.tbl_deep_extend( - "force", - hig_groups or {}, - cp.remaps or {}, - config.remaps.highlights.globals or {}, - config.remaps.highlights[cs] or {} - ) + hig_groups = vim.tbl_deep_extend("force", hig_groups or {}, cp.remaps or {}) return hig_groups end diff --git a/lua/themer/modules/core/utils.lua b/lua/themer/modules/core/utils.lua index 7c90e73..03ad720 100644 --- a/lua/themer/modules/core/utils.lua +++ b/lua/themer/modules/core/utils.lua @@ -1,33 +1,36 @@ local utils = {} local g = vim.g -local config = require("themer.config")("get") +local config = require("themer.config").options local exec = vim.api.nvim_command --- highlight using :highlight --- @param group string ---- @param color table -utils.highlight_legacy = function(group, color) - local parts = { group } - parts[#parts + 1] = color.fg and "guifg=" .. color.fg or nil - parts[#parts + 1] = color.bg and "guibg=" .. color.bg or nil - parts[#parts + 1] = color.sp and "guisp=" .. color.sp or nil - parts[#parts + 1] = color.style and "gui=" .. color.style or nil - if #parts == 1 and color.link then - exec("highlight! link " .. group .. " " .. color.link) - elseif #parts ~= 1 then - exec("highlight " .. table.concat(parts, " ")) - end +--- @param val table +utils.highlight = function(group, val) + val.fg = #(val.fg or "") ~= 7 and "NONE" or val.fg + val.bg = #(val.bg or "") ~= 7 and "NONE" or val.bg + vim.api.nvim_set_hl(0, group, val) end --- Highlight on basis of given group and color --- @param tbl table local function syntax(tbl) for hl_group, hl_value in pairs(tbl) do - utils.highlight_legacy(hl_group, hl_value) + utils.highlight(hl_group, hl_value) end end +--- Execute function if it exists +--- @param fn any function +--- @param ... any args +local function exec_if_exists(fn, ...) + if fn then + return fn(...) + end + return false +end + --- set properties --- @param tbl table local function properties(tbl) @@ -60,7 +63,7 @@ end --- load a given theme --- @param theme table -utils.load_mapper_higs = function(theme, cs) +utils.load_mapper_higs = function(theme, cs, cp) exec("hi clear") if vim.fn.exists("syntax_on") then exec("syntax reset") @@ -87,7 +90,12 @@ utils.load_mapper_higs = function(theme, cs) end end - exec("do ColorScheme") + vim.cmd([[doautocmd ColorScheme]]) + + vim.defer_fn(function() + syntax(exec_if_exists(config.remaps.highlights.globals, cp) or {}) + syntax(exec_if_exists(config.remaps.highlights[cs], cp) or {}) + end, 100) vim.g.colors_name = cs end diff --git a/lua/themer/modules/import/init.lua b/lua/themer/modules/import/init.lua index a43688e..5bf3f60 100644 --- a/lua/themer/modules/import/init.lua +++ b/lua/themer/modules/import/init.lua @@ -80,33 +80,33 @@ local generate_cp = function() border = color_from_hl("FloatBorder", "foreground"), syntax = { statement = color_from_hl("Statement", "foreground"), - ["function"] = color_from_hl("TSFunction", "foreground"), - variable = color_from_hl("TSVariable", "foreground"), + ["function"] = color_from_hl("@function", "foreground"), + variable = color_from_hl("@variable", "foreground"), include = color_from_hl("Include", "foreground"), - keyword = color_from_hl("TSKeyword", "foreground"), + keyword = color_from_hl("@keyword", "foreground"), struct = color_from_hl("Structure", "foreground"), - string = color_from_hl("TSString", "foreground"), - tag = color_from_hl("TSTag", "foreground"), - field = color_from_hl("TSField", "foreground"), - parameter = color_from_hl("TSParameter", "foreground"), - property = color_from_hl("TSProperty", "foreground"), - punctuation = color_from_hl("TSPunctBracket", "foreground"), - constructor = color_from_hl("TSConstructor", "foreground"), - operator = color_from_hl("TSOperator", "foreground"), + string = color_from_hl("@string", "foreground"), + tag = color_from_hl("@tag", "foreground"), + field = color_from_hl("@field", "foreground"), + parameter = color_from_hl("@parameter", "foreground"), + property = color_from_hl("@property", "foreground"), + punctuation = color_from_hl("@punctuation.bracket", "foreground"), + constructor = color_from_hl("@constructor", "foreground"), + operator = color_from_hl("@operator", "foreground"), preproc = color_from_hl("PreProc", "foreground"), - constant = color_from_hl("TSConstant", "foreground"), + constant = color_from_hl("@constant", "foreground"), todo = { fg = color_from_hl("Todo", "foreground"), bg = color_from_hl("Todo", "background") }, number = color_from_hl("Number", "foreground"), - comment = color_from_hl("TSComment", "foreground"), - type = color_from_hl("TSType", "foreground"), - conditional = color_from_hl("TSConditional", "foreground"), + comment = color_from_hl("@comment", "foreground"), + type = color_from_hl("@type", "foreground"), + conditional = color_from_hl("@conditional", "foreground"), }, built_in = { - ["function"] = color_from_hl("TSFuncBuiltin", "foreground"), - type = color_from_hl("TSTypeBuiltin", "foreground"), - variable = color_from_hl("TSVariableBuiltin", "foreground"), - keyword = color_from_hl("TSKeywordFunction", "foreground"), - constant = color_from_hl("TSConstBuiltin", "foreground"), + ["function"] = color_from_hl("@function.builtin", "foreground"), + type = color_from_hl("@type.builtin", "foreground"), + variable = color_from_hl("@variable.builtin", "foreground"), + keyword = color_from_hl("@keyword.function", "foreground"), + constant = color_from_hl("@constant.builtin", "foreground"), }, diagnostic = { error = color_from_hl("DiagnosticError", "foreground"), @@ -115,7 +115,7 @@ local generate_cp = function() hint = color_from_hl("DiagnosticHint", "foreground"), }, inc_search = { bg = color_from_hl("IncSearch", "background"), fg = color_from_hl("IncSearch", "foreground") }, - uri = color_from_hl("TSURI", "foreground"), + uri = color_from_hl("@text.uri", "foreground"), pum = { fg = color_from_hl("Pmenu", "foreground"), bg = color_from_hl("Pmenu", "background"), diff --git a/lua/themer/modules/installer/utils.lua b/lua/themer/modules/installer/utils.lua index 8872446..035509c 100644 --- a/lua/themer/modules/installer/utils.lua +++ b/lua/themer/modules/installer/utils.lua @@ -54,4 +54,13 @@ M.installed_themes = function() return vim.fn.readdir(data_path) end +M.load_installer = function() + if require("themer.utils.fs").exists(vim.fn.stdpath("data") .. "/themer") ~= true then + os.execute("mkdir " .. vim.fn.stdpath("data") .. "/themer") + end + vim.cmd([[command! -nargs=0 ThemerInstall :lua require("themer.modules.installer").fuzzy_install()]]) + vim.cmd([[command! -nargs=0 ThemerUnInstall :lua require("themer.modules.installer").fuzzy_uninstall()]]) + require("themer.modules.installer.load_installed").load_installed_themes() +end + return M diff --git a/lua/themer/modules/themes/astron.lua b/lua/themer/modules/themes/astron.lua index 305b16f..0cf090d 100644 --- a/lua/themer/modules/themes/astron.lua +++ b/lua/themer/modules/themes/astron.lua @@ -1,54 +1,90 @@ --- Generated by Themer return { - ["inc_search"] = { ["bg"] = "#5c6370", ["fg"] = "#40d9ff" }, - ["uri"] = "#abb2bf", - ["border"] = "#0", - ["diagnostic"] = { ["error"] = "#ec5f67", ["info"] = "#c9c9c9", ["warn"] = "#ff9640", ["hint"] = "#ebae34" }, - ["bg"] = { ["base"] = "#15171c", ["alt"] = "#1f1f25", ["selected"] = "#252931" }, - ["accent"] = "#61afef", - ["search_result"] = { ["fg"] = "#282c34", ["telescope"] = "#e5c07b", ["bg"] = "#e5c07b" }, + ["search_result"] = { + ["bg"] = "#e5c07b", + ["fg"] = "#282c34", + ["telescope"] = "#e5c07b", + }, ["cursorlinenr"] = "#abb2bf", - ["gitsigns"] = { ["add"] = "#98c379", ["change"] = "#ff9640", ["remove"] = "#ec5f67" }, - ["heading"] = { ["h1"] = "#56b6c2", ["h2"] = "#0" }, + ["gitsigns"] = { + ["change"] = "#ff9640", + ["remove"] = "#ec5f67", + ["add"] = "#98c379", + }, + ["diff"] = { + ["text"] = "#e5c07b", + ["remove"] = "#e06c75", + ["add"] = "#98c379", + ["change"] = "#abb2bf", + }, + ["match"] = "#569cd6", + ["dimmed"] = { + ["subtle"] = "#5c6370", + ["inactive"] = "#4b5263", + }, + ["inc_search"] = { + ["bg"] = "#5c6370", + ["fg"] = "#40d9ff", + }, + ["bg"] = { + ["base"] = "#15171c", + ["alt"] = "#1f1f25", + ["selected"] = "#252931", + }, ["pum"] = { - ["fg"] = "#abb2bf", - ["sel"] = { ["bg"] = "#2c323c", ["fg"] = "#0" }, - ["bg"] = "#1f1f25", ["sbar"] = "#282c34", ["thumb"] = "#abb2bf", + ["bg"] = "#1f1f25", + ["sel"] = { + ["bg"] = "#2c323c", + ["fg"] = "#abb2bf", + }, + ["fg"] = "#abb2bf", + }, + ["border"] = "#abb2bf", + ["diagnostic"] = { + ["warn"] = "#ff9640", + ["hint"] = "#ebae34", + ["error"] = "#ec5f67", + ["info"] = "#c9c9c9", }, - ["fg"] = "#abb2bf", ["syntax"] = { + ["constant"] = "#e5c07b", + ["struct"] = "#e5c07b", + ["punctuation"] = "#abb2bf", + ["preproc"] = "#e5c07b", + ["todo"] = { + ["fg"] = "#c678dd", + ["bg"] = "#abb2bf", + }, + ["tag"] = "#e06c75", + ["statement"] = "#c678dd", + ["string"] = "#98c379", ["comment"] = "#777d86", + ["function"] = "#61afef", ["field"] = "#e06c75", - ["string"] = "#98c379", + ["number"] = "#d19a66", ["keyword"] = "#c678dd", + ["type"] = "#61afef", ["operator"] = "#56b6c2", ["include"] = "#c678dd", ["variable"] = "#e06c75", ["constructor"] = "#e5c07b", ["property"] = "#e5c07b", - ["type"] = "#61afef", ["parameter"] = "#e06c75", ["conditional"] = "#c678dd", - ["number"] = "#d19a66", - ["constant"] = "#e5c07b", - ["struct"] = "#e5c07b", - ["punctuation"] = "#abb2bf", - ["preproc"] = "#e5c07b", - ["function"] = "#61afef", - ["todo"] = { ["fg"] = "#c678dd", ["bg"] = "#0" }, - ["tag"] = "#e06c75", - ["statement"] = "#c678dd", }, - ["dimmed"] = { ["inactive"] = "#4b5263", ["subtle"] = "#5c6370" }, - ["diff"] = { ["text"] = "#e5c07b", ["add"] = "#98c379", ["change"] = "#0", ["remove"] = "#e06c75" }, - ["match"] = "#569cd6", + ["fg"] = "#abb2bf", ["built_in"] = { ["constant"] = "#d19a66", - ["type"] = "#61afef", ["variable"] = "#e5c07b", - ["keyword"] = "#c678dd", ["function"] = "#61afef", + ["type"] = "#61afef", + ["keyword"] = "#c678dd", + }, + ["uri"] = "#abb2bf", + ["accent"] = "#61afef", + ["heading"] = { + ["h1"] = "#56b6c2", + ["h2"] = "#abb2bf", }, } diff --git a/lua/themer/modules/themes/ayu.lua b/lua/themer/modules/themes/ayu.lua index 7a127ad..8f20a34 100644 --- a/lua/themer/modules/themes/ayu.lua +++ b/lua/themer/modules/themes/ayu.lua @@ -1,59 +1,92 @@ --- Generated by Themer return { - ["bg"] = { ["selected"] = "#f3f3f3", ["base"] = "#fafafa", ["alt"] = "#f0eee4" }, - ["syntax"] = { - ["field"] = "#36a3d9", - ["function"] = "#f29718", - ["operator"] = "#e7c547", - ["constructor"] = "#e6b673", - ["constant"] = "#a37acc", - ["statement"] = "#ff7733", - ["todo"] = { ["bg"] = "#0", ["fg"] = "#f07178" }, - ["variable"] = "#0", - ["tag"] = "#ff7733", - ["string"] = "#86b300", - ["conditional"] = "#ff7733", - ["include"] = "#e6b673", - ["punctuation"] = "#e6b673", - ["struct"] = "#e6b673", - ["preproc"] = "#e6b673", - ["number"] = "#a37acc", + ["search_result"] = { + ["telescope"] = "#5c6773", + ["bg"] = "#a37acc", + ["fg"] = "#fafafa", + }, + ["cursorlinenr"] = "#ff6a00", + ["diff"] = { + ["text"] = "#ffffff", + ["remove"] = "#8b8b", + ["add"] = "#ffffff", + ["change"] = "#ffffff", + }, + ["match"] = "#5c6773", + ["built_in"] = { + ["function"] = "#e6b673", + ["variable"] = "#e6b673", + ["constant"] = "#e6b673", ["type"] = "#36a3d9", - ["property"] = "#36a3d9", - ["parameter"] = "#36a3d9", ["keyword"] = "#ff7733", - ["comment"] = "#abb0b6", }, - ["border"] = "#fafafa", - ["search_result"] = { ["bg"] = "#a37acc", ["fg"] = "#fafafa", ["telescope"] = "#0" }, + ["heading"] = { + ["h2"] = "#5c6773", + ["h1"] = "#5c6773", + }, + ["bg"] = { + ["selected"] = "#f3f3f3", + ["alt"] = "#f0eee4", + ["base"] = "#fafafa", + }, ["pum"] = { ["sbar"] = "#808080", + ["thumb"] = "#ffffff", ["bg"] = "#f0eee4", + ["sel"] = { + ["bg"] = "#f0eee4", + ["fg"] = "#5c6773", + }, ["fg"] = "#5c6773", - ["sel"] = { ["bg"] = "#f0eee4", ["fg"] = "#5c6773" }, - ["thumb"] = "#ffffff", }, - ["accent"] = "#e6b673", - ["match"] = "#0", - ["cursorlinenr"] = "#ff6a00", - ["blue"] = "#36A3D9", - ["magenta"] = "#A37ACC", ["orange"] = "#FF6A00", - ["built_in"] = { - ["variable"] = "#e6b673", - ["type"] = "#36a3d9", - ["function"] = "#e6b673", + ["diagnostic"] = { + ["warn"] = "#ffa500", + ["info"] = "#add8e6", + ["hint"] = "#d3d3d3", + ["error"] = "#ff0000", + }, + ["syntax"] = { + ["constant"] = "#a37acc", + ["struct"] = "#e6b673", + ["punctuation"] = "#e6b673", + ["preproc"] = "#e6b673", + ["todo"] = { + ["bg"] = "#5c6773", + ["fg"] = "#f07178", + }, + ["tag"] = "#ff7733", + ["statement"] = "#ff7733", + ["string"] = "#86b300", + ["comment"] = "#abb0b6", ["keyword"] = "#ff7733", - ["constant"] = "#e6b673", + ["field"] = "#36a3d9", + ["number"] = "#a37acc", + ["type"] = "#36a3d9", + ["function"] = "#f29718", + ["operator"] = "#e7c547", + ["include"] = "#e6b673", + ["variable"] = "#5c6773", + ["constructor"] = "#e6b673", + ["property"] = "#36a3d9", + ["parameter"] = "#36a3d9", + ["conditional"] = "#ff7733", }, ["yellow"] = "#FF6A00", - ["diagnostic"] = { ["warn"] = "#ffa500", ["hint"] = "#d3d3d3", ["error"] = "#ff0000", ["info"] = "#add8e6" }, ["cyan"] = "#4CBF99", - ["heading"] = { ["h2"] = "#0", ["h1"] = "#0" }, - ["uri"] = "#36a3d9", - ["inc_search"] = { ["bg"] = "#0", ["fg"] = "#0" }, - ["diff"] = { ["text"] = "#ffffff", ["remove"] = "#8b8b", ["add"] = "#ffffff", ["change"] = "#ffffff" }, + ["dimmed"] = { + ["subtle"] = "#828c99", + ["inactive"] = "#d9d8d7", + }, + ["flavour"] = "light", ["green"] = "#86B300", + ["blue"] = "#36A3D9", ["fg"] = "#5c6773", - ["dimmed"] = { ["inactive"] = "#d9d8d7", ["subtle"] = "#828c99" }, + ["magenta"] = "#A37ACC", + ["inc_search"] = { + ["bg"] = "#5c6773", + ["fg"] = "#5c6773", + }, + ["uri"] = "#36a3d9", + ["accent"] = "#e6b673", + ["border"] = "#fafafa", } diff --git a/lua/themer/modules/themes/ayu_dark.lua b/lua/themer/modules/themes/ayu_dark.lua index 18b2a4e..6959adc 100644 --- a/lua/themer/modules/themes/ayu_dark.lua +++ b/lua/themer/modules/themes/ayu_dark.lua @@ -1,59 +1,91 @@ --- Generated by Themer return { - ["orange"] = "#F29718", + ["search_result"] = { + ["telescope"] = "#e6e1cf", + ["bg"] = "#ffee99", + ["fg"] = "#f1419", + }, + ["cursorlinenr"] = "#f29718", + ["diff"] = { + ["text"] = "#14191f", + ["remove"] = "#8b8b", + ["add"] = "#14191f", + ["change"] = "#14191f", + }, + ["match"] = "#e6e1cf", ["built_in"] = { - ["type"] = "#36a3d9", ["function"] = "#e6b673", + ["variable"] = "#e6b673", + ["type"] = "#36a3d9", ["constant"] = "#e6b673", ["keyword"] = "#ff7733", - ["variable"] = "#e6b673", }, - ["yellow"] = "#F29718", - ["heading"] = { ["h1"] = "#0", ["h2"] = "#0" }, - ["cyan"] = "#95E6CB", - ["green"] = "#B8CC52", - ["blue"] = "#36A3D9", - ["magenta"] = "#FFEE99", - ["dimmed"] = { ["subtle"] = "#3e4b59", ["inactive"] = "#2d3640" }, - ["pum"] = { - ["bg"] = "#253340", - ["fg"] = "#e6e1cf", - ["thumb"] = "#ffffff", - ["sbar"] = "#808080", - ["sel"] = { ["fg"] = "#e6e1cf", ["bg"] = "#253340" }, + ["heading"] = { + ["h1"] = "#e6e1cf", + ["h2"] = "#e6e1cf", + }, + ["bg"] = { + ["base"] = "#e6e1cff1419", + ["alt"] = "#253340", + ["selected"] = "#151a1e", }, ["uri"] = "#36a3d9", - ["match"] = "#0", - ["accent"] = "#e6b673", - ["diagnostic"] = { ["warn"] = "#ffa500", ["hint"] = "#d3d3d3", ["info"] = "#add8e6", ["error"] = "#ff0000" }, - ["search_result"] = { ["bg"] = "#ffee99", ["fg"] = "#f1419", ["telescope"] = "#0" }, - ["bg"] = { ["base"] = "#0f1419", ["selected"] = "#151a1e", ["alt"] = "#253340" }, - ["fg"] = "#e6e1cf", + ["orange"] = "#F29718", + ["diagnostic"] = { + ["warn"] = "#ffa500", + ["error"] = "#ff0000", + ["hint"] = "#d3d3d3", + ["info"] = "#add8e6", + }, ["syntax"] = { + ["constant"] = "#ffee99", ["struct"] = "#e6b673", - ["parameter"] = "#36a3d9", - ["function"] = "#ffb454", - ["comment"] = "#5c6773", + ["punctuation"] = "#e6b673", ["preproc"] = "#e6b673", - ["keyword"] = "#ff7733", + ["todo"] = { + ["fg"] = "#f07178", + ["bg"] = "#e6e1cf", + }, ["tag"] = "#ff7733", - ["operator"] = "#e7c547", - ["conditional"] = "#ff7733", - ["type"] = "#36a3d9", - ["property"] = "#36a3d9", - ["include"] = "#e6b673", - ["number"] = "#ffee99", - ["string"] = "#b8cc52", - ["todo"] = { ["fg"] = "#f07178", ["bg"] = "#0" }, - ["constant"] = "#ffee99", ["statement"] = "#ff7733", + ["string"] = "#b8cc52", + ["comment"] = "#5c6773", + ["function"] = "#ffb454", ["field"] = "#36a3d9", + ["number"] = "#ffee99", + ["keyword"] = "#ff7733", + ["type"] = "#36a3d9", + ["operator"] = "#e7c547", + ["include"] = "#e6b673", + ["variable"] = "#e6e1cf", ["constructor"] = "#e6b673", - ["punctuation"] = "#e6b673", - ["variable"] = "#0", + ["property"] = "#36a3d9", + ["parameter"] = "#36a3d9", + ["conditional"] = "#ff7733", }, - ["diff"] = { ["text"] = "#14191f", ["remove"] = "#8b8b", ["change"] = "#14191f", ["add"] = "#14191f" }, + ["yellow"] = "#F29718", + ["cyan"] = "#95E6CB", + ["green"] = "#B8CC52", + ["inc_search"] = { + ["fg"] = "#e6e1cf", + ["bg"] = "#e6e1cf", + }, + ["blue"] = "#36A3D9", + ["fg"] = "#e6e1cf", + ["magenta"] = "#FFEE99", ["border"] = "#f1419", - ["inc_search"] = { ["fg"] = "#0", ["bg"] = "#0" }, - ["cursorlinenr"] = "#f29718", + ["pum"] = { + ["sbar"] = "#808080", + ["thumb"] = "#ffffff", + ["bg"] = "#253340", + ["sel"] = { + ["fg"] = "#e6e1cf", + ["bg"] = "#253340", + }, + ["fg"] = "#e6e1cf", + }, + ["accent"] = "#e6b673", + ["dimmed"] = { + ["inactive"] = "#2d3640", + ["subtle"] = "#3e4b59", + }, } diff --git a/lua/themer/modules/themes/ayu_mirage.lua b/lua/themer/modules/themes/ayu_mirage.lua index d9a84d6..bc83213 100644 --- a/lua/themer/modules/themes/ayu_mirage.lua +++ b/lua/themer/modules/themes/ayu_mirage.lua @@ -1,59 +1,91 @@ --- Generated by Themer return { - ["blue"] = "#5CCFE6", - ["magenta"] = "#D4BFFF", - ["dimmed"] = { ["inactive"] = "#3d4751", ["subtle"] = "#607080" }, - ["bg"] = { ["alt"] = "#343f4c", ["base"] = "#212733", ["selected"] = "#242b38" }, + ["search_result"] = { + ["bg"] = "#d4bfff", + ["fg"] = "#212733", + ["telescope"] = "#d9d7ce", + }, ["cursorlinenr"] = "#ffcc66", - ["search_result"] = { ["fg"] = "#212733", ["telescope"] = "#0", ["bg"] = "#d4bfff" }, - ["inc_search"] = { ["bg"] = "#0", ["fg"] = "#0" }, - ["accent"] = "#ffc44c", - ["uri"] = "#5ccfe6", - ["pum"] = { - ["sel"] = { ["bg"] = "#343f4c", ["fg"] = "#d9d7ce" }, - ["fg"] = "#d9d7ce", - ["bg"] = "#343f4c", - ["thumb"] = "#ffffff", - ["sbar"] = "#808080", + ["diff"] = { + ["text"] = "#272d38", + ["remove"] = "#8b8b", + ["add"] = "#272d38", + ["change"] = "#272d38", }, - ["fg"] = "#d9d7ce", - ["diagnostic"] = { ["hint"] = "#d3d3d3", ["warn"] = "#ffa500", ["error"] = "#ff0000", ["info"] = "#add8e6" }, + ["match"] = "#d9d7ce", ["built_in"] = { - ["keyword"] = "#ffae57", ["constant"] = "#ffc44c", - ["type"] = "#5ccfe6", ["variable"] = "#ffc44c", ["function"] = "#ffc44c", + ["keyword"] = "#ffae57", + ["type"] = "#5ccfe6", + }, + ["heading"] = { + ["h2"] = "#d9d7ce", + ["h1"] = "#d9d7ce", + }, + ["bg"] = { + ["base"] = "#212733", + ["alt"] = "#343f4c", + ["selected"] = "#242b38", + }, + ["pum"] = { + ["sbar"] = "#808080", + ["thumb"] = "#ffffff", + ["bg"] = "#343f4c", + ["sel"] = { + ["bg"] = "#343f4c", + ["fg"] = "#d9d7ce", + }, + ["fg"] = "#d9d7ce", + }, + ["orange"] = "#FFCC66", + ["diagnostic"] = { + ["warn"] = "#ffa500", + ["info"] = "#add8e6", + ["hint"] = "#d3d3d3", + ["error"] = "#ff0000", }, ["syntax"] = { + ["constant"] = "#d4bfff", + ["struct"] = "#ffc44c", + ["punctuation"] = "#ffc44c", ["preproc"] = "#ffc44c", - ["field"] = "#5ccfe6", - ["include"] = "#ffc44c", - ["property"] = "#5ccfe6", + ["todo"] = { + ["fg"] = "#f07178", + ["bg"] = "#d9d7ce", + }, ["tag"] = "#ffae57", ["statement"] = "#ffae57", - ["todo"] = { ["fg"] = "#f07178", ["bg"] = "#0" }, - ["punctuation"] = "#ffc44c", ["string"] = "#bbe67e", - ["conditional"] = "#ffae57", - ["struct"] = "#ffc44c", - ["operator"] = "#80d4ff", ["comment"] = "#5c6773", - ["keyword"] = "#ffae57", - ["constant"] = "#d4bfff", + ["function"] = "#ffd57f", + ["field"] = "#5ccfe6", ["number"] = "#d4bfff", + ["keyword"] = "#ffae57", ["type"] = "#5ccfe6", - ["variable"] = "#0", - ["function"] = "#ffd57f", - ["parameter"] = "#5ccfe6", + ["operator"] = "#80d4ff", + ["include"] = "#ffc44c", + ["variable"] = "#d9d7ce", ["constructor"] = "#ffc44c", + ["property"] = "#5ccfe6", + ["parameter"] = "#5ccfe6", + ["conditional"] = "#ffae57", }, - ["match"] = "#0", - ["heading"] = { ["h2"] = "#0", ["h1"] = "#0" }, ["yellow"] = "#FFCC66", - ["diff"] = { ["text"] = "#272d38", ["remove"] = "#8b8b", ["change"] = "#272d38", ["add"] = "#272d38" }, ["cyan"] = "#95E6CB", - ["orange"] = "#FFCC66", ["green"] = "#BBE67E", ["border"] = "#212733", + ["blue"] = "#5CCFE6", + ["fg"] = "#d9d7ce", + ["magenta"] = "#D4BFFF", + ["inc_search"] = { + ["bg"] = "#d9d7ce", + ["fg"] = "#d9d7ce", + }, + ["uri"] = "#5ccfe6", + ["accent"] = "#ffc44c", + ["dimmed"] = { + ["subtle"] = "#607080", + ["inactive"] = "#3d4751", + }, } diff --git a/lua/themer/modules/themes/boo.lua b/lua/themer/modules/themes/boo.lua index e840864..8670881 100644 --- a/lua/themer/modules/themes/boo.lua +++ b/lua/themer/modules/themes/boo.lua @@ -1,58 +1,91 @@ return { - ["cyan"] = "#519ABA", - ["uri"] = "#e4dcec", + ["search_result"] = { + ["bg"] = "#202727", + ["fg"] = "#e1d9ea", + ["telescope"] = "#654a96", + }, ["cursorlinenr"] = "#625566", - ["magenta"] = "#c882e7", - ["fg"] = "#e1d9ea", - ["green"] = "#A3BE8C", - ["accent"] = "#654a96", - ["search_result"] = { ["fg"] = "#0", ["telescope"] = "#654a96", ["bg"] = "#202727" }, - ["diff"] = { ["remove"] = "#cd749c", ["add"] = "#63b0b0", ["text"] = "#9898ae", ["change"] = "#5786bc" }, - ["heading"] = { ["h1"] = "#0", ["h2"] = "#0" }, - ["blue"] = "#61afef", - ["yellow"] = "#e7c787", + ["diff"] = { + ["text"] = "#9898ae", + ["remove"] = "#cd749c", + ["add"] = "#63b0b0", + ["change"] = "#5786bc", + }, + ["match"] = "#e1d9ea", + ["built_in"] = { + ["function"] = "#748a90", + ["variable"] = "#32547b", + ["constant"] = "#4291ad", + ["type"] = "#3a7272", + ["keyword"] = "#654a96", + }, + ["heading"] = { + ["h1"] = "#e1d9ea", + ["h2"] = "#e1d9ea", + }, + ["bg"] = { + ["base"] = "#131316", + ["alt"] = "#d0d0d", + ["selected"] = "#222827", + }, + ["uri"] = "#e4dcec", + ["border"] = "#222827", + ["diagnostic"] = { + ["warn"] = "#a9d1df", + ["error"] = "#c988df", + ["hint"] = "#5d4663", + ["info"] = "#e4dcec", + }, ["syntax"] = { - ["type"] = "#63b0b0", - ["todo"] = { ["fg"] = "#3f3442", ["bg"] = "#0" }, - ["function"] = "#6eacb8", - ["conditional"] = "#53757e", + ["constant"] = "#7d6c82", + ["struct"] = "#63b0b0", + ["punctuation"] = "#4b4b4e", + ["preproc"] = "#63b0b0", + ["todo"] = { + ["fg"] = "#3f3442", + ["bg"] = "#e1d9ea", + }, + ["tag"] = "#85c1c1", ["statement"] = "#63b0b0", + ["string"] = "#72d4d4", + ["comment"] = "#9898ae", + ["operator"] = "#656568", ["field"] = "#5d6f74", - ["variable"] = "#a7d3d3", - ["struct"] = "#63b0b0", ["number"] = "#d9d6cf", + ["type"] = "#63b0b0", ["keyword"] = "#5c4489", - ["tag"] = "#85c1c1", + ["function"] = "#6eacb8", ["include"] = "#63b0b0", - ["parameter"] = "#a9d1df", - ["preproc"] = "#63b0b0", - ["property"] = "#738d8d", - ["comment"] = "#9898ae", - ["string"] = "#72d4d4", - ["punctuation"] = "#4b4b4e", + ["variable"] = "#a7d3d3", ["constructor"] = "#63b0b0", - ["operator"] = "#656568", - ["constant"] = "#7d6c82", + ["property"] = "#738d8d", + ["parameter"] = "#a9d1df", + ["conditional"] = "#53757e", }, - ["border"] = "#222827", - ["diagnostic"] = { ["hint"] = "#5d4663", ["warn"] = "#a9d1df", ["info"] = "#e4dcec", ["error"] = "#c988df" }, - ["built_in"] = { - ["type"] = "#3a7272", - ["variable"] = "#32547b", - ["function"] = "#748a90", - ["keyword"] = "#654a96", - ["constant"] = "#4291ad", + ["yellow"] = "#e7c787", + ["cyan"] = "#519ABA", + ["green"] = "#A3BE8C", + ["orange"] = "#e7c787", + ["blue"] = "#61afef", + ["fg"] = "#e1d9ea", + ["magenta"] = "#c882e7", + ["dimmed"] = { + ["inactive"] = "#29292e", + ["subtle"] = "#654a96", }, - ["inc_search"] = { ["bg"] = "#60d0d", ["fg"] = "#63b0b0" }, ["pum"] = { ["sbar"] = "#222827", - ["fg"] = "#9c75dd", ["thumb"] = "#9898ae", + ["fg"] = "#9c75dd", + ["sel"] = { + ["bg"] = "#e1d9ea", + ["fg"] = "#e1d9ea", + }, ["bg"] = "#120f12", - ["sel"] = { ["bg"] = "#0", ["fg"] = "#0" }, }, - ["dimmed"] = { ["subtle"] = "#654a96", ["inactive"] = "#29292e" }, - ["match"] = "#0", - ["bg"] = { ["base"] = "#131316", ["alt"] = "#d0d0d", ["selected"] = "#222827" }, - ["orange"] = "#e7c787", + ["accent"] = "#654a96", + ["inc_search"] = { + ["bg"] = "#60d0d", + ["fg"] = "#63b0b0", + }, } diff --git a/lua/themer/modules/themes/catppuccin-frappe.lua b/lua/themer/modules/themes/catppuccin-frappe.lua new file mode 100644 index 0000000..c91f35d --- /dev/null +++ b/lua/themer/modules/themes/catppuccin-frappe.lua @@ -0,0 +1,96 @@ +return { + ["search_result"] = { + ["bg"] = "#506373", + ["telescope"] = "#8caaee", + ["fg"] = "#c6d0f5", + }, + ["cursorlinenr"] = "#babbf1", + ["diff"] = { + ["change"] = "#363c52", + ["remove"] = "#514251", + ["add"] = "#455052", + ["text"] = "#414964", + }, + ["match"] = "#c6d0f5", + ["built_in"] = { + ["function"] = "#ef9f76", + ["variable"] = "#e78284", + ["keyword"] = "#ca9ee6", + ["constant"] = "#ef9f76", + ["type"] = "#e5c890", + }, + ["inc_search"] = { + ["bg"] = "#8fc1cc", + ["fg"] = "#292c3c", + }, + ["bg"] = { + ["base"] = "#303446", + ["alt"] = "#c6d0f5", + ["selected"] = "#3b3f52", + }, + ["pum"] = { + ["sbar"] = "#51576d", + ["thumb"] = "#737994", + ["bg"] = "#414559", + ["sel"] = { + ["bg"] = "#51576d", + ["fg"] = "#c6d0f5", + }, + ["fg"] = "#949cbb", + }, + ["border"] = "#8caaee", + ["diagnostic"] = { + ["warn"] = "#e5c890", + ["hint"] = "#81c8be", + ["info"] = "#99d1db", + ["error"] = "#e78284", + }, + ["syntax"] = { + ["constant"] = "#ef9f76", + ["struct"] = "#e5c890", + ["punctuation"] = "#949cbb", + ["preproc"] = "#f4b8e4", + ["todo"] = { + ["fg"] = "#303446", + ["bg"] = "#e5c890", + }, + ["tag"] = "#ca9ee6", + ["statement"] = "#ca9ee6", + ["string"] = "#a6d189", + ["comment"] = "#626880", + ["operator"] = "#99d1db", + ["field"] = "#81c8be", + ["number"] = "#ef9f76", + ["keyword"] = "#ca9ee6", + ["type"] = "#e5c890", + ["function"] = "#8caaee", + ["include"] = "#f4b8e4", + ["variable"] = "#c6d0f5", + ["constructor"] = "#85c1dc", + ["property"] = "#81c8be", + ["parameter"] = "#ea999c", + ["conditional"] = "#ca9ee6", + }, + ["yellow"] = "#f6c177", + ["cyan"] = "#ebbcba", + ["dimmed"] = { + ["subtle"] = "#51576d", + ["inactive"] = "#737994", + }, + ["green"] = "#31748f", + ["gitsigns"] = { + ["change"] = "#e5c890", + ["remove"] = "#e78284", + ["add"] = "#a6d189", + }, + ["blue"] = "#9ccfd8", + ["fg"] = "#c6d0f5", + ["magenta"] = "#c4a7e7", + ["orange"] = "#f6c177", + ["uri"] = "#f2d5cf", + ["accent"] = "#f4b8e4", + ["heading"] = { + ["h2"] = "#c6d0f5", + ["h1"] = "#f4b8e4", + }, +} diff --git a/lua/themer/modules/themes/catppuccin-latte.lua b/lua/themer/modules/themes/catppuccin-latte.lua new file mode 100644 index 0000000..5f552f5 --- /dev/null +++ b/lua/themer/modules/themes/catppuccin-latte.lua @@ -0,0 +1,96 @@ +return { + ["search_result"] = { + ["bg"] = "#a8daf0", + ["telescope"] = "#1e66f5", + ["fg"] = "#4c4f69", + }, + ["cursorlinenr"] = "#7287fd", + ["diff"] = { + ["text"] = "#c9d8f5", + ["remove"] = "#eac8d3", + ["add"] = "#d0e2d1", + ["change"] = "#e0e7f5", + }, + ["match"] = "#4c4f69", + ["built_in"] = { + ["function"] = "#fe640b", + ["variable"] = "#d20f39", + ["keyword"] = "#8839ef", + ["constant"] = "#fe640b", + ["type"] = "#df8e1d", + }, + ["heading"] = { + ["h1"] = "#ea76cb", + ["h2"] = "#4c4f69", + }, + ["bg"] = { + ["base"] = "#eff1f5", + ["alt"] = "#4c4f69", + ["selected"] = "#e9ebf1", + }, + ["pum"] = { + ["sbar"] = "#bcc0cc", + ["thumb"] = "#9ca0b0", + ["fg"] = "#7c7f93", + ["sel"] = { + ["fg"] = "#4c4f69", + ["bg"] = "#bcc0cc", + }, + ["bg"] = "#ccd0da", + }, + ["orange"] = "#f6c177", + ["diagnostic"] = { + ["warn"] = "#df8e1d", + ["error"] = "#d20f39", + ["info"] = "#4a5e5", + ["hint"] = "#179299", + }, + ["syntax"] = { + ["constant"] = "#fe640b", + ["struct"] = "#df8e1d", + ["punctuation"] = "#7c7f93", + ["preproc"] = "#ea76cb", + ["todo"] = { + ["fg"] = "#eff1f5", + ["bg"] = "#df8e1d", + }, + ["tag"] = "#8839ef", + ["statement"] = "#8839ef", + ["string"] = "#40a02b", + ["comment"] = "#acb0be", + ["operator"] = "#4a5e5", + ["field"] = "#179299", + ["number"] = "#fe640b", + ["keyword"] = "#8839ef", + ["type"] = "#df8e1d", + ["function"] = "#1e66f5", + ["include"] = "#ea76cb", + ["variable"] = "#4c4f69", + ["constructor"] = "#209fb5", + ["property"] = "#179299", + ["parameter"] = "#e64553", + ["conditional"] = "#8839ef", + }, + ["yellow"] = "#f6c177", + ["cyan"] = "#ebbcba", + ["dimmed"] = { + ["inactive"] = "#9ca0b0", + ["subtle"] = "#bcc0cc", + }, + ["green"] = "#31748f", + ["gitsigns"] = { + ["change"] = "#df8e1d", + ["remove"] = "#d20f39", + ["add"] = "#40a02b", + }, + ["blue"] = "#9ccfd8", + ["fg"] = "#4c4f69", + ["magenta"] = "#c4a7e7", + ["border"] = "#1e66f5", + ["uri"] = "#dc8a78", + ["accent"] = "#ea76cb", + ["inc_search"] = { + ["fg"] = "#e6e9ef", + ["bg"] = "#1bade7", + }, +} diff --git a/lua/themer/modules/themes/catppuccin-macchiato.lua b/lua/themer/modules/themes/catppuccin-macchiato.lua new file mode 100644 index 0000000..96925b2 --- /dev/null +++ b/lua/themer/modules/themes/catppuccin-macchiato.lua @@ -0,0 +1,96 @@ +return { + ["search_result"] = { + ["fg"] = "#cad3f5", + ["telescope"] = "#8aadf4", + ["bg"] = "#455c6d", + }, + ["cursorlinenr"] = "#b7bdf8", + ["diff"] = { + ["text"] = "#363f5b", + ["remove"] = "#48384b", + ["add"] = "#3b474a", + ["change"] = "#2b3047", + }, + ["match"] = "#cad3f5", + ["built_in"] = { + ["function"] = "#f5a97f", + ["variable"] = "#ed8796", + ["constant"] = "#f5a97f", + ["type"] = "#eed49f", + ["keyword"] = "#c6a0f6", + }, + ["inc_search"] = { + ["fg"] = "#1e2030", + ["bg"] = "#86c5d2", + }, + ["bg"] = { + ["selected"] = "#303347", + ["alt"] = "#cad3f5", + ["base"] = "#24273a", + }, + ["uri"] = "#f4dbd6", + ["border"] = "#8aadf4", + ["diagnostic"] = { + ["warn"] = "#eed49f", + ["error"] = "#ed8796", + ["hint"] = "#8bd5ca", + ["info"] = "#91d7e3", + }, + ["syntax"] = { + ["constant"] = "#f5a97f", + ["struct"] = "#eed49f", + ["punctuation"] = "#939ab7", + ["preproc"] = "#f5bde6", + ["todo"] = { + ["bg"] = "#eed49f", + ["fg"] = "#24273a", + }, + ["tag"] = "#c6a0f6", + ["statement"] = "#c6a0f6", + ["string"] = "#a6da95", + ["comment"] = "#5b6078", + ["operator"] = "#91d7e3", + ["field"] = "#8bd5ca", + ["number"] = "#f5a97f", + ["keyword"] = "#c6a0f6", + ["type"] = "#eed49f", + ["function"] = "#8aadf4", + ["include"] = "#f5bde6", + ["variable"] = "#cad3f5", + ["constructor"] = "#7dc4e4", + ["property"] = "#8bd5ca", + ["parameter"] = "#ee99a0", + ["conditional"] = "#c6a0f6", + }, + ["yellow"] = "#f6c177", + ["cyan"] = "#ebbcba", + ["orange"] = "#f6c177", + ["green"] = "#31748f", + ["gitsigns"] = { + ["change"] = "#eed49f", + ["remove"] = "#ed8796", + ["add"] = "#a6da95", + }, + ["blue"] = "#9ccfd8", + ["fg"] = "#cad3f5", + ["magenta"] = "#c4a7e7", + ["dimmed"] = { + ["inactive"] = "#6e738d", + ["subtle"] = "#494d64", + }, + ["pum"] = { + ["sbar"] = "#494d64", + ["thumb"] = "#6e738d", + ["fg"] = "#939ab7", + ["sel"] = { + ["fg"] = "#cad3f5", + ["bg"] = "#494d64", + }, + ["bg"] = "#363a4f", + }, + ["accent"] = "#f5bde6", + ["heading"] = { + ["h1"] = "#f5bde6", + ["h2"] = "#cad3f5", + }, +} diff --git a/lua/themer/modules/themes/catppuccin-mocha.lua b/lua/themer/modules/themes/catppuccin-mocha.lua new file mode 100644 index 0000000..cba202b --- /dev/null +++ b/lua/themer/modules/themes/catppuccin-mocha.lua @@ -0,0 +1,96 @@ +return { + ["search_result"] = { + ["telescope"] = "#89b4fa", + ["fg"] = "#cdd6f4", + ["bg"] = "#3e5767", + }, + ["cursorlinenr"] = "#b4befe", + ["diff"] = { + ["change"] = "#25293c", + ["remove"] = "#443244", + ["add"] = "#364143", + ["text"] = "#313953", + }, + ["match"] = "#cdd6f4", + ["built_in"] = { + ["function"] = "#f5c2e7", + ["variable"] = "#f2cdcd", + ["constant"] = "#f5c2e7", + ["type"] = "#89b4fa", + ["keyword"] = "#f5c2e7", + }, + ["inc_search"] = { + ["bg"] = "#7ec9d8", + ["fg"] = "#181825", + }, + ["bg"] = { + ["selected"] = "#2a2b3c", + ["alt"] = "#cdd6f4", + ["base"] = "#1e1e2e", + }, + ["uri"] = "#cdd6f4", + ["border"] = "#89b4fa", + ["diagnostic"] = { + ["warn"] = "#f9e2af", + ["error"] = "#f38ba8", + ["hint"] = "#94e2d5", + ["info"] = "#89dceb", + }, + ["syntax"] = { + ["constant"] = "#fab387", + ["struct"] = "#f9e2af", + ["punctuation"] = "#f5c2e7", + ["preproc"] = "#f5c2e7", + ["todo"] = { + ["fg"] = "#1e1e2e", + ["bg"] = "#f9e2af", + }, + ["tag"] = "#f5c2e7", + ["statement"] = "#cba6f7", + ["string"] = "#a6e3a1", + ["comment"] = "#585b70", + ["function"] = "#89b4fa", + ["field"] = "#f2cdcd", + ["number"] = "#fab387", + ["keyword"] = "#f5c2e7", + ["type"] = "#89b4fa", + ["operator"] = "#89dceb", + ["include"] = "#f5c2e7", + ["variable"] = "#f2cdcd", + ["constructor"] = "#f5c2e7", + ["property"] = "#f2cdcd", + ["parameter"] = "#f2cdcd", + ["conditional"] = "#f38ba8", + }, + ["yellow"] = "#f6c177", + ["cyan"] = "#ebbcba", + ["heading"] = { + ["h2"] = "#cdd6f4", + ["h1"] = "#f5c2e7", + }, + ["green"] = "#31748f", + ["gitsigns"] = { + ["change"] = "#f9e2af", + ["remove"] = "#f38ba8", + ["add"] = "#a6e3a1", + }, + ["blue"] = "#9ccfd8", + ["fg"] = "#cdd6f4", + ["magenta"] = "#c4a7e7", + ["orange"] = "#f6c177", + ["pum"] = { + ["sbar"] = "#45475a", + ["thumb"] = "#6c7086", + ["bg"] = "#313244", + ["sel"] = { + ["bg"] = "#45475a", + ["fg"] = "#cdd6f4", + }, + ["fg"] = "#9399b2", + }, + ["accent"] = "#f5c2e7", + ["dimmed"] = { + ["subtle"] = "#45475a", + ["inactive"] = "#6c7086", + }, +} diff --git a/lua/themer/modules/themes/catppuccin.lua b/lua/themer/modules/themes/catppuccin.lua index 330e14b..a9bbd20 100644 --- a/lua/themer/modules/themes/catppuccin.lua +++ b/lua/themer/modules/themes/catppuccin.lua @@ -1,59 +1,96 @@ return { - ["accent"] = "#f5c2e7", - ["gitsigns"] = { ["add"] = "#abe9b3", ["change"] = "#fae3b0", ["remove"] = "#f28fad" }, - ["cyan"] = "#B5E8E0", - ["uri"] = "#f5e0dc", - ["green"] = "#ABE9B3", - ["blue"] = "#96CDFB", - ["magenta"] = "#DDB6F2", + ["search_result"] = { + ["telescope"] = "#96cdfb", + ["fg"] = "#f5c2e7", + ["bg"] = "#575268", + }, + ["cursorlinenr"] = "#abe9b3", + ["diff"] = { + ["text"] = "#1e1e2e", + ["remove"] = "#1e1e2e", + ["add"] = "#1e1e2e", + ["change"] = "#1e1e2e", + }, ["match"] = "#d9e0ee", - ["orange"] = "#FAE3B0", - ["fg"] = "#d9e0ee", - ["yellow"] = "#FAE3B0", - ["diagnostic"] = { ["error"] = "#f28fad", ["info"] = "#89dceb", ["hint"] = "#f5e0dc", ["warn"] = "#fae3b0" }, + ["built_in"] = { + ["constant"] = "#c9cbff", + ["variable"] = "#b5e8e0", + ["function"] = "#f8bd96", + ["keyword"] = "#e8a2af", + ["type"] = "#fae3b0", + }, + ["heading"] = { + ["h2"] = "#d9e0ee", + ["h1"] = "#f5c2e7", + }, + ["bg"] = { + ["base"] = "#1e1e2e", + ["alt"] = "#1a1826", + ["selected"] = "#302d41", + }, ["pum"] = { - ["thumb"] = "#6e6c7e", ["sbar"] = "#575268", + ["thumb"] = "#6e6c7e", ["bg"] = "#302d41", - ["sel"] = { ["fg"] = "#d9e0ee", ["bg"] = "#575268" }, + ["sel"] = { + ["fg"] = "#d9e0ee", + ["bg"] = "#575268", + }, ["fg"] = "#c3bac6", }, - ["inc_search"] = { ["fg"] = "#575268", ["bg"] = "#f5c2e7" }, - ["heading"] = { ["h2"] = "#0", ["h1"] = "#f5c2e7" }, - ["built_in"] = { - ["constant"] = "#c9cbff", - ["keyword"] = "#e8a2af", - ["type"] = "#fae3b0", - ["variable"] = "#b5e8e0", - ["function"] = "#f8bd96", + ["orange"] = "#FAE3B0", + ["diagnostic"] = { + ["warn"] = "#fae3b0", + ["hint"] = "#f5e0dc", + ["error"] = "#f28fad", + ["info"] = "#89dceb", }, ["syntax"] = { + ["constant"] = "#f8bd96", + ["struct"] = "#fae3b0", + ["punctuation"] = "#988ba2", + ["preproc"] = "#f5c2e7", + ["todo"] = { + ["bg"] = "#fae3b0", + ["fg"] = "#1e1e2e", + }, ["tag"] = "#f8bd96", + ["statement"] = "#ddb6f2", + ["string"] = "#abe9b3", + ["comment"] = "#6e6c7e", + ["operator"] = "#89dceb", + ["field"] = "#f5e0dc", ["number"] = "#f8bd96", ["type"] = "#fae3b0", - ["field"] = "#f5e0dc", + ["keyword"] = "#f28fad", ["function"] = "#96cdfb", - ["statement"] = "#ddb6f2", - ["conditional"] = "#ddb6f2", - ["todo"] = { ["bg"] = "#fae3b0", ["fg"] = "#1e1e2e" }, - ["constant"] = "#f8bd96", + ["include"] = "#f5c2e7", + ["variable"] = "#d9e0ee", ["constructor"] = "#c9cbff", - ["punctuation"] = "#988ba2", ["property"] = "#fae3b0", - ["preproc"] = "#f5c2e7", - ["struct"] = "#fae3b0", - ["keyword"] = "#f28fad", - ["variable"] = "#d9e0ee", - ["include"] = "#f5c2e7", - ["comment"] = "#6e6c7e", - ["string"] = "#abe9b3", ["parameter"] = "#f5e0dc", - ["operator"] = "#89dceb", + ["conditional"] = "#ddb6f2", }, - ["cursorlinenr"] = "#abe9b3", - ["dimmed"] = { ["inactive"] = "#6e6c7e", ["subtle"] = "#575268" }, + ["yellow"] = "#FAE3B0", + ["cyan"] = "#B5E8E0", ["border"] = "#96cdfb", - ["bg"] = { ["alt"] = "#1a1826", ["base"] = "#1e1e2e", ["selected"] = "#302d41" }, - ["diff"] = { ["add"] = "#1e1e2e", ["text"] = "#1e1e2e", ["change"] = "#1e1e2e", ["remove"] = "#1e1e2e" }, - ["search_result"] = { ["fg"] = "#f5c2e7", ["bg"] = "#575268", ["telescope"] = "#96cdfb" }, + ["green"] = "#ABE9B3", + ["gitsigns"] = { + ["change"] = "#fae3b0", + ["remove"] = "#f28fad", + ["add"] = "#abe9b3", + }, + ["blue"] = "#96CDFB", + ["fg"] = "#d9e0ee", + ["magenta"] = "#DDB6F2", + ["dimmed"] = { + ["subtle"] = "#575268", + ["inactive"] = "#6e6c7e", + }, + ["uri"] = "#f5e0dc", + ["accent"] = "#f5c2e7", + ["inc_search"] = { + ["fg"] = "#575268", + ["bg"] = "#f5c2e7", + }, } diff --git a/lua/themer/modules/themes/dayfox.lua b/lua/themer/modules/themes/dayfox.lua new file mode 100644 index 0000000..9f4fb7e --- /dev/null +++ b/lua/themer/modules/themes/dayfox.lua @@ -0,0 +1,97 @@ +return { + ["search_result"] = { + ["fg"] = "#1d344f", + ["telescope"] = "#6080b0", + ["bg"] = "#c4d6dc", + }, + ["flavour"] = "light", + ["cursorlinenr"] = "#3f5269", + ["diff"] = { + ["text"] = "#b3c0d3", + ["remove"] = "#e3d5d9", + ["add"] = "#d5dbd8", + ["change"] = "#d5dae1", + }, + ["match"] = "#6080b0", + ["dimmed"] = { + ["inactive"] = "#7f848e", + ["subtle"] = "#aaacb3", + }, + ["inc_search"] = { + ["bg"] = "#6ca7bd", + ["fg"] = "#cdd1d5", + }, + ["bg"] = { + ["selected"] = "#d3d3d3", + ["alt"] = "#d8d8d8", + ["base"] = "#eaeaea", + }, + ["uri"] = "#e3786c", + ["orange"] = "#CA884A", + ["diagnostic"] = { + ["warn"] = "#ba793e", + ["hint"] = "#6ca7bd", + ["info"] = "#6080b0", + ["error"] = "#b95d76", + }, + ["syntax"] = { + ["constant"] = "#e3786c", + ["struct"] = "#ba793e", + ["punctuation"] = "#3f5269", + ["preproc"] = "#d685af", + ["todo"] = { + ["bg"] = "#ba793e", + ["fg"] = "#eaeaea", + }, + ["tag"] = "#806589", + ["statement"] = "#806589", + ["string"] = "#618774", + ["comment"] = "#7f848e", + ["keyword"] = "#8e6f98", + ["field"] = "#6080b0", + ["number"] = "#d76558", + ["type"] = "#ba793e", + ["operator"] = "#3f5269", + ["function"] = "#6080b0", + ["include"] = "#d685af", + ["variable"] = "#1d344f", + ["constructor"] = "#8e6f98", + ["property"] = "#618774", + ["parameter"] = "#d76558", + ["conditional"] = "#806589", + }, + ["yellow"] = "#BA793E", + ["cyan"] = "#6CA7BD", + ["pum"] = { + ["sbar"] = "#e6e6e6", + ["thumb"] = "#aaacb3", + ["fg"] = "#3f5269", + ["sel"] = { + ["bg"] = "#d3d3d3", + ["fg"] = "#6ca7bd", + }, + ["bg"] = "#d8d8d8", + }, + ["green"] = "#618774", + ["gitsigns"] = { + ["change"] = "#536c9e", + ["remove"] = "#b2555b", + ["add"] = "#266d6a", + }, + ["blue"] = "#6080b0", + ["fg"] = "#1d344f", + ["magenta"] = "#8e6f98", + ["border"] = "#6080b0", + ["built_in"] = { + ["function"] = "#6ca7bd", + ["variable"] = "#b95d76", + ["keyword"] = "#8e6f98", + ["constant"] = "#d76558", + ["type"] = "#6ca7bd", + }, + ["accent"] = "#6080b0", + ["heading"] = { + ["h1"] = "#8e6f98", + ["h2"] = "#1d344f", + }, +} diff --git a/lua/themer/modules/themes/doom_one.lua b/lua/themer/modules/themes/doom_one.lua index f1a738b..cd94eb6 100644 --- a/lua/themer/modules/themes/doom_one.lua +++ b/lua/themer/modules/themes/doom_one.lua @@ -1,90 +1,90 @@ return { - accent = "#a9a1e1", - bg = { - alt = "#21252a", - base = "#282c34", - selected = "#21252a", + ["search_result"] = { + ["telescope"] = "#bbc2cf", + ["bg"] = "#2257a0", + ["fg"] = "#bbc2cf", }, - blue = "#7E9CD8", - border = "#3f444a", - built_in = { - constant = "#a9a1e1", - ["function"] = "#ffa8ff", - keyword = "#51afef", - type = "#ecbe7b", - variable = "#8b93e6", + ["cursorlinenr"] = "#bbc2cf", + ["diff"] = { + ["change"] = "#42534f", + ["remove"] = "#7e7278", + ["add"] = "#42534f", + ["text"] = "#384643", }, - cursorlinenr = "#bbc2cf", - cyan = "#6A9589", - diagnostic = { - error = "#ff0000", - hint = "#d3d3d3", - info = "#add8e6", - warn = "#ffa500", + ["match"] = "#bbc2cf", + ["built_in"] = { + ["function"] = "#ffa8ff", + ["variable"] = "#8b93e6", + ["keyword"] = "#51afef", + ["constant"] = "#a9a1e1", + ["type"] = "#ecbe7b", }, - diff = { - add = "#42534f", - change = "#42534f", - remove = "#7e7278", - text = "#384643", + ["heading"] = { + ["h1"] = "#bbc2cf", + ["h2"] = "#bbc2cf", }, - dimmed = { - inactive = "#5b6268", - subtle = "#73797e", + ["bg"] = { + ["base"] = "#282c34", + ["alt"] = "#21252a", + ["selected"] = "#21252a", }, - fg = "#bbc2cf", - green = "#76946A", - heading = { - h1 = "#0", - h2 = "#0", + ["pum"] = { + ["sbar"] = "#21242b", + ["thumb"] = "#bbc2cf", + ["bg"] = "#21252a", + ["sel"] = { + ["bg"] = "#51afef", + ["fg"] = "#1b2229", + }, + ["fg"] = "#bbc2cf", }, - inc_search = { - bg = "#2257a0", - fg = "#bbc2cf", + ["border"] = "#3f444a", + ["diagnostic"] = { + ["warn"] = "#ffa500", + ["info"] = "#add8e6", + ["error"] = "#ff0000", + ["hint"] = "#d3d3d3", }, - magenta = "#957FB8", - match = "#0", - orange = "#C0A36E", - pum = { - bg = "#21252a", - fg = "#bbc2cf", - sbar = "#21242b", - sel = { - bg = "#51afef", - fg = "#1b2229", + ["syntax"] = { + ["constant"] = "#a9a1e1", + ["struct"] = "#51afef", + ["punctuation"] = "#51afef", + ["preproc"] = "#a9a1e1", + ["todo"] = { + ["bg"] = "#bbc2cf", + ["fg"] = "#ecbe7b", }, - thumb = "#bbc2cf", + ["statement"] = "#51afef", + ["string"] = "#98be65", + ["comment"] = "#5b6268", + ["operator"] = "#51afef", + ["field"] = "#a9a1e1", + ["number"] = "#da8548", + ["keyword"] = "#51afef", + ["type"] = "#ecbe7b", + ["function"] = "#c678dd", + ["include"] = "#a9a1e1", + ["variable"] = "#bbc2cf", + ["constructor"] = "#51afef", + ["property"] = "#c678dd", + ["parameter"] = "#ffa8ff", + ["conditional"] = "#51afef", }, - search_result = { - bg = "#2257a0", - fg = "#bbc2cf", - telescope = "#0", + ["yellow"] = "#C0A36E", + ["cyan"] = "#6A9589", + ["green"] = "#76946A", + ["uri"] = "#98be65", + ["blue"] = "#7E9CD8", + ["fg"] = "#bbc2cf", + ["magenta"] = "#957FB8", + ["orange"] = "#C0A36E", + ["dimmed"] = { + ["subtle"] = "#73797e", + ["inactive"] = "#5b6268", }, - syntax = { - comment = "#5b6268", - conditional = "#51afef", - constant = "#a9a1e1", - constructor = "#51afef", - field = "#a9a1e1", - ["function"] = "#c678dd", - include = "#a9a1e1", - keyword = "#51afef", - number = "#da8548", - operator = "#51afef", - parameter = "#ffa8ff", - preproc = "#a9a1e1", - property = "#c678dd", - punctuation = "#51afef", - statement = "#51afef", - string = "#98be65", - struct = "#51afef", - todo = { - bg = "#0", - fg = "#ecbe7b", - }, - type = "#ecbe7b", - variable = "#0", + ["accent"] = "#a9a1e1", + ["inc_search"] = { + ["bg"] = "#2257a0", + ["fg"] = "#bbc2cf", }, - uri = "#98be65", - yellow = "#C0A36E", } diff --git a/lua/themer/modules/themes/github_dark.lua b/lua/themer/modules/themes/github_dark.lua index 7b070bc..db82c1d 100644 --- a/lua/themer/modules/themes/github_dark.lua +++ b/lua/themer/modules/themes/github_dark.lua @@ -1,58 +1,91 @@ return { - ["orange"] = "#ffea7f", - ["cyan"] = "#39c5cf", - ["match"] = "#2188ff", - ["fg"] = "#c9d1d9", - ["heading"] = { ["h1"] = "#0", ["h2"] = "#0" }, - ["diff"] = { ["change"] = "#341a00", ["remove"] = "#462c32", ["add"] = "#244032", ["text"] = "#0" }, - ["magenta"] = "#b392f0", - ["accent"] = "#79b8ff", - ["bg"] = { ["base"] = "#24292e", ["alt"] = "#24292e", ["selected"] = "#2c313a" }, - ["green"] = "#34d058", - ["uri"] = "#0", - ["diagnostic"] = { ["error"] = "#f97583", ["info"] = "#75beff", ["warn"] = "#cca700", ["hint"] = "#eeeeb3" }, + ["search_result"] = { + ["bg"] = "#404030", + ["telescope"] = "#79b8ff", + ["fg"] = "#c9d1d9", + }, ["cursorlinenr"] = "#e1e4e8", - ["syntax"] = { - ["field"] = "#c9d1d9", + ["diff"] = { + ["change"] = "#341a00", + ["remove"] = "#462c32", + ["add"] = "#244032", + ["text"] = "#c9d1d9", + }, + ["match"] = "#2188ff", + ["built_in"] = { + ["function"] = "#79b8ff", ["variable"] = "#79b8ff", ["keyword"] = "#f97583", + ["constant"] = "#79b8ff", + ["type"] = "#f97583", + }, + ["heading"] = { + ["h1"] = "#c9d1d9", + ["h2"] = "#c9d1d9", + }, + ["bg"] = { + ["base"] = "#24292e", + ["alt"] = "#24292e", + ["selected"] = "#2c313a", + }, + ["uri"] = "#c9d1d9", + ["border"] = "#c9d1d9", + ["diagnostic"] = { + ["warn"] = "#cca700", + ["hint"] = "#eeeeb3", + ["error"] = "#f97583", + ["info"] = "#75beff", + }, + ["syntax"] = { + ["constant"] = "#79b8ff", ["struct"] = "#f97583", - ["parameter"] = "#e1e4e8", - ["property"] = "#b392f0", - ["comment"] = "#6a737d", ["punctuation"] = "#c9d1d9", - ["constructor"] = "#79b8ff", - ["operator"] = "#f97583", - ["constant"] = "#79b8ff", - ["todo"] = { ["bg"] = "#ffea7f", ["fg"] = "#24292e" }, - ["conditional"] = "#f97583", + ["preproc"] = "#f97583", + ["todo"] = { + ["bg"] = "#ffea7f", + ["fg"] = "#24292e", + }, + ["tag"] = "#85e89d", ["statement"] = "#f97583", + ["string"] = "#9ecbff", + ["comment"] = "#6a737d", + ["keyword"] = "#f97583", + ["field"] = "#c9d1d9", + ["number"] = "#79b8ff", ["type"] = "#f97583", - ["tag"] = "#85e89d", ["function"] = "#b392f0", - ["preproc"] = "#f97583", - ["number"] = "#79b8ff", + ["operator"] = "#f97583", ["include"] = "#f97583", - ["string"] = "#9ecbff", + ["variable"] = "#79b8ff", + ["constructor"] = "#79b8ff", + ["property"] = "#b392f0", + ["parameter"] = "#e1e4e8", + ["conditional"] = "#f97583", }, - ["border"] = "#c9d1d9", ["yellow"] = "#ffea7f", - ["built_in"] = { - ["variable"] = "#79b8ff", - ["type"] = "#f97583", - ["constant"] = "#79b8ff", - ["function"] = "#79b8ff", - ["keyword"] = "#f97583", + ["cyan"] = "#39c5cf", + ["green"] = "#34d058", + ["dimmed"] = { + ["subtle"] = "#666666", + ["inactive"] = "#666666", }, - ["inc_search"] = { ["bg"] = "#404030", ["fg"] = "#0" }, + ["blue"] = "#2188ff", + ["fg"] = "#c9d1d9", + ["magenta"] = "#b392f0", ["pum"] = { - ["sel"] = { ["bg"] = "#6494cb", ["fg"] = "#1f2428" }, + ["sbar"] = "#1f2428", + ["thumb"] = "#32383e", + ["fg"] = "#c9d1d9", + ["sel"] = { + ["bg"] = "#6494cb", + ["fg"] = "#1f2428", + }, ["bg"] = "#1f2428", + }, + ["inc_search"] = { + ["bg"] = "#404030", ["fg"] = "#c9d1d9", - ["thumb"] = "#32383e", - ["sbar"] = "#1f2428", }, - ["search_result"] = { ["telescope"] = "#79b8ff", ["fg"] = "#0", ["bg"] = "#404030" }, - ["blue"] = "#2188ff", - ["dimmed"] = { ["inactive"] = "#666666", ["subtle"] = "#666666" }, + ["accent"] = "#79b8ff", + ["orange"] = "#ffea7f", } diff --git a/lua/themer/modules/themes/github_dark_colorblind.lua b/lua/themer/modules/themes/github_dark_colorblind.lua index 790c877..59a14ba 100644 --- a/lua/themer/modules/themes/github_dark_colorblind.lua +++ b/lua/themer/modules/themes/github_dark_colorblind.lua @@ -1,58 +1,91 @@ return { - ["orange"] = "#e3b341", - ["cyan"] = "#39c5cf", - ["match"] = "#58a6ff", - ["fg"] = "#c9d1d9", - ["heading"] = { ["h1"] = "#0", ["h2"] = "#0" }, - ["diff"] = { ["change"] = "#341a00", ["remove"] = "#462c32", ["add"] = "#244032", ["text"] = "#0" }, - ["magenta"] = "#bc8cff", - ["accent"] = "#9b4215", - ["bg"] = { ["base"] = "#d1117", ["alt"] = "#d1117", ["selected"] = "#161b22" }, - ["green"] = "#3fb950", - ["uri"] = "#0", - ["diagnostic"] = { ["error"] = "#f85149", ["info"] = "#75beff", ["warn"] = "#f0883e", ["hint"] = "#eeeeb3" }, + ["search_result"] = { + ["bg"] = "#2c2b1c", + ["telescope"] = "#79b8ff", + ["fg"] = "#c9d1d9", + }, ["cursorlinenr"] = "#c9d1d9", - ["syntax"] = { - ["field"] = "#c9d1d9", + ["diff"] = { + ["change"] = "#341a00", + ["remove"] = "#462c32", + ["add"] = "#244032", + ["text"] = "#c9d1d9", + }, + ["match"] = "#58a6ff", + ["built_in"] = { + ["function"] = "#9b4215", ["variable"] = "#9b4215", ["keyword"] = "#d69a00", + ["constant"] = "#9b4215", + ["type"] = "#d69a00", + }, + ["heading"] = { + ["h1"] = "#c9d1d9", + ["h2"] = "#c9d1d9", + }, + ["bg"] = { + ["base"] = "#d1117", + ["alt"] = "#d1117", + ["selected"] = "#161b22", + }, + ["uri"] = "#c9d1d9", + ["border"] = "#b3b1ad", + ["diagnostic"] = { + ["warn"] = "#f0883e", + ["hint"] = "#eeeeb3", + ["error"] = "#f85149", + ["info"] = "#75beff", + }, + ["syntax"] = { + ["constant"] = "#79b8ff", ["struct"] = "#d69a00", - ["parameter"] = "#c9d1d9", - ["property"] = "#d2a8ff", - ["comment"] = "#8b949e", ["punctuation"] = "#c9d1d9", - ["constructor"] = "#9b4215", - ["operator"] = "#d69a00", - ["constant"] = "#79b8ff", - ["todo"] = { ["bg"] = "#d29922", ["fg"] = "#d1117" }, - ["conditional"] = "#d69a00", + ["preproc"] = "#d69a00", + ["todo"] = { + ["bg"] = "#d29922", + ["fg"] = "#d1117", + }, + ["tag"] = "#83d4ff", ["statement"] = "#d69a00", + ["string"] = "#a5d6ff", + ["comment"] = "#8b949e", + ["keyword"] = "#d69a00", + ["field"] = "#c9d1d9", + ["number"] = "#79b8ff", ["type"] = "#d69a00", - ["tag"] = "#83d4ff", ["function"] = "#d2a8ff", - ["preproc"] = "#d69a00", - ["number"] = "#79b8ff", + ["operator"] = "#d69a00", ["include"] = "#d69a00", - ["string"] = "#a5d6ff", + ["variable"] = "#9b4215", + ["constructor"] = "#9b4215", + ["property"] = "#d2a8ff", + ["parameter"] = "#c9d1d9", + ["conditional"] = "#d69a00", }, - ["border"] = "#b3b1ad", ["yellow"] = "#d29922", - ["built_in"] = { - ["variable"] = "#9b4215", - ["type"] = "#d69a00", - ["constant"] = "#9b4215", - ["function"] = "#9b4215", - ["keyword"] = "#d69a00", + ["cyan"] = "#39c5cf", + ["green"] = "#3fb950", + ["dimmed"] = { + ["subtle"] = "#d1117", + ["inactive"] = "#d1117", }, - ["inc_search"] = { ["bg"] = "#2c2b1c", ["fg"] = "#0" }, + ["blue"] = "#58a6ff", + ["fg"] = "#c9d1d9", + ["magenta"] = "#bc8cff", ["pum"] = { - ["sel"] = { ["bg"] = "#5e94c5", ["fg"] = "#161b22" }, + ["sbar"] = "#161b22", + ["thumb"] = "#31373d", + ["fg"] = "#c9d1d9", + ["sel"] = { + ["bg"] = "#5e94c5", + ["fg"] = "#161b22", + }, ["bg"] = "#161b22", + }, + ["inc_search"] = { + ["bg"] = "#2c2b1c", ["fg"] = "#c9d1d9", - ["thumb"] = "#31373d", - ["sbar"] = "#161b22", }, - ["search_result"] = { ["telescope"] = "#79b8ff", ["fg"] = "#0", ["bg"] = "#2c2b1c" }, - ["blue"] = "#58a6ff", - ["dimmed"] = { ["inactive"] = "#d1117", ["subtle"] = "#d1117" }, + ["accent"] = "#9b4215", + ["orange"] = "#e3b341", } diff --git a/lua/themer/modules/themes/github_light.lua b/lua/themer/modules/themes/github_light.lua index 6bb80f0..b987b0e 100644 --- a/lua/themer/modules/themes/github_light.lua +++ b/lua/themer/modules/themes/github_light.lua @@ -1,58 +1,91 @@ return { - ["orange"] = "#b08800", - ["cyan"] = "#0598bc", - ["match"] = "#366d6", - ["fg"] = "#24292f", - ["heading"] = { ["h1"] = "#0", ["h2"] = "#0" }, - ["diff"] = { ["change"] = "#fff5b1", ["remove"] = "#fae5e7", ["add"] = "#d4f8db", ["text"] = "#0" }, - ["magenta"] = "#5a32a3", - ["accent"] = "#5cc5", - ["bg"] = { ["base"] = "#ffffff", ["alt"] = "#ffffff", ["selected"] = "#d5e5f6" }, - ["green"] = "#28a745", - ["uri"] = "#0", - ["diagnostic"] = { ["error"] = "#cb2431", ["info"] = "#75beff", ["warn"] = "#bf8803", ["hint"] = "#6c6c6c" }, + ["search_result"] = { + ["bg"] = "#fff2be", + ["telescope"] = "#5cc5", + ["fg"] = "#24292f", + }, ["cursorlinenr"] = "#24292e", - ["syntax"] = { - ["field"] = "#24292f", + ["diff"] = { + ["change"] = "#fff5b1", + ["remove"] = "#fae5e7", + ["add"] = "#d4f8db", + ["text"] = "#24292f", + }, + ["match"] = "#366d6", + ["built_in"] = { + ["function"] = "#5cc5", ["variable"] = "#5cc5", ["keyword"] = "#d73a49", + ["constant"] = "#5cc5", + ["type"] = "#d73a49", + }, + ["heading"] = { + ["h1"] = "#24292f", + ["h2"] = "#24292f", + }, + ["bg"] = { + ["base"] = "#ffffff", + ["alt"] = "#ffffff", + ["selected"] = "#d5e5f6", + }, + ["uri"] = "#24292f", + ["border"] = "#44289", + ["diagnostic"] = { + ["warn"] = "#bf8803", + ["hint"] = "#6c6c6c", + ["error"] = "#cb2431", + ["info"] = "#75beff", + }, + ["syntax"] = { + ["constant"] = "#5cc5", ["struct"] = "#d73a49", - ["parameter"] = "#24292e", - ["property"] = "#6f42c1", - ["comment"] = "#6a737d", ["punctuation"] = "#24292f", - ["constructor"] = "#5cc5", - ["operator"] = "#d73a49", - ["constant"] = "#5cc5", - ["todo"] = { ["bg"] = "#dbab09", ["fg"] = "#ffffff" }, - ["conditional"] = "#d73a49", + ["preproc"] = "#d73a49", + ["todo"] = { + ["bg"] = "#dbab09", + ["fg"] = "#ffffff", + }, + ["tag"] = "#22863a", ["statement"] = "#d73a49", + ["string"] = "#32f62", + ["comment"] = "#6a737d", + ["keyword"] = "#d73a49", + ["field"] = "#24292f", + ["number"] = "#5cc5", ["type"] = "#d73a49", - ["tag"] = "#22863a", ["function"] = "#6f42c1", - ["preproc"] = "#d73a49", - ["number"] = "#5cc5", + ["operator"] = "#d73a49", ["include"] = "#d73a49", - ["string"] = "#32f62", + ["variable"] = "#5cc5", + ["constructor"] = "#5cc5", + ["property"] = "#6f42c1", + ["parameter"] = "#24292e", + ["conditional"] = "#d73a49", }, - ["border"] = "#44289", ["yellow"] = "#dbab09", - ["built_in"] = { - ["variable"] = "#5cc5", - ["type"] = "#d73a49", - ["constant"] = "#5cc5", - ["function"] = "#5cc5", - ["keyword"] = "#d73a49", + ["cyan"] = "#24292f598bc", + ["green"] = "#28a745", + ["dimmed"] = { + ["subtle"] = "#ffffff", + ["inactive"] = "#ffffff", }, - ["inc_search"] = { ["bg"] = "#fff2be", ["fg"] = "#0" }, + ["blue"] = "#24292f366d6", + ["fg"] = "#24292f", + ["magenta"] = "#5a32a3", ["pum"] = { - ["sel"] = { ["bg"] = "#4085d4", ["fg"] = "#f6f8fa" }, + ["sbar"] = "#f6f8fa", + ["thumb"] = "#f0f1f3", + ["fg"] = "#24292f", + ["sel"] = { + ["bg"] = "#4085d4", + ["fg"] = "#f6f8fa", + }, ["bg"] = "#f6f8fa", + }, + ["inc_search"] = { + ["bg"] = "#fff2be", ["fg"] = "#24292f", - ["thumb"] = "#f0f1f3", - ["sbar"] = "#f6f8fa", }, - ["search_result"] = { ["telescope"] = "#5cc5", ["fg"] = "#0", ["bg"] = "#fff2be" }, - ["blue"] = "#0366d6", - ["dimmed"] = { ["inactive"] = "#ffffff", ["subtle"] = "#ffffff" }, + ["accent"] = "#5cc5", + ["orange"] = "#b08800", } diff --git a/lua/themer/modules/themes/gruvbox-light-medium.lua b/lua/themer/modules/themes/gruvbox-light-medium.lua new file mode 100644 index 0000000..2d5ef39 --- /dev/null +++ b/lua/themer/modules/themes/gruvbox-light-medium.lua @@ -0,0 +1,96 @@ +return { + ["search_result"] = { + ["fg"] = "#b57614", + ["bg"] = "#fbf1c7", + ["telescope"] = "#76678", + }, + ["cursorlinenr"] = "#b57614", + ["diff"] = { + ["change"] = "#fbf1c7", + ["remove"] = "#fbf1c7", + ["add"] = "#fbf1c7", + ["text"] = "#fbf1c7", + }, + ["match"] = "#76678", + ["built_in"] = { + ["function"] = "#af3a03", + ["variable"] = "#af3a03", + ["type"] = "#b57614", + ["constant"] = "#af3a03", + ["keyword"] = "#9d0006", + }, + ["inc_search"] = { + ["fg"] = "#af3a03", + ["bg"] = "#fbf1c7", + }, + ["bg"] = { + ["base"] = "#fbf1c7", + ["alt"] = "#d5c4a1", + ["selected"] = "#ebdbb2", + }, + ["uri"] = "#76678", + ["border"] = "#bdae93", + ["diagnostic"] = { + ["warn"] = "#b57614", + ["error"] = "#9d0006", + ["hint"] = "#427b58", + ["info"] = "#76678", + }, + ["syntax"] = { + ["constant"] = "#8f3f71", + ["struct"] = "#427b58", + ["punctuation"] = "#af3a03", + ["preproc"] = "#427b58", + ["todo"] = { + ["bg"] = "#3c3836", + ["fg"] = "#282828", + }, + ["tag"] = "#9d0006", + ["statement"] = "#9d0006", + ["string"] = "#79740e", + ["comment"] = "#928374", + ["type"] = "#b57614", + ["field"] = "#76678", + ["number"] = "#8f3f71", + ["keyword"] = "#9d0006", + ["function"] = "#79740e", + ["operator"] = "#af3a03", + ["include"] = "#427b58", + ["variable"] = "#3c3836", + ["constructor"] = "#af3a03", + ["property"] = "#76678", + ["parameter"] = "#76678", + ["conditional"] = "#9d0006", + }, + ["yellow"] = "#d79921", + ["cyan"] = "#689d6a", + ["orange"] = "#b57614", + ["green"] = "#98971a", + ["pum"] = { + ["sbar"] = "#d5c4a1", + ["thumb"] = "#a89984", + ["bg"] = "#d5c4a1", + ["sel"] = { + ["fg"] = "#d5c4a1", + ["bg"] = "#76678", + }, + ["fg"] = "#3c3836", + }, + ["blue"] = "#458588", + ["fg"] = "#3c3836", + ["magenta"] = "#b16286", + ["dimmed"] = { + ["subtle"] = "#ebdbb2", + ["inactive"] = "#d5c4a1", + }, + ["heading"] = { + ["h1"] = "#79740e", + ["h2"] = "#3c3836", + }, + ["accent"] = "#af3a03", + ["gitsigns"] = { + ["change"] = "#427b58", + ["remove"] = "#9d0006", + ["add"] = "#79740e", + }, +} diff --git a/lua/themer/modules/themes/gruvbox-material-dark-hard.lua b/lua/themer/modules/themes/gruvbox-material-dark-hard.lua index eb1507a..501c2a6 100644 --- a/lua/themer/modules/themes/gruvbox-material-dark-hard.lua +++ b/lua/themer/modules/themes/gruvbox-material-dark-hard.lua @@ -1,59 +1,91 @@ --- Generated by Themer return { - ["accent"] = "#d8a657", - ["pum"] = { - ["bg"] = "#3c3836", - ["sel"] = { ["bg"] = "#a89984", ["fg"] = "#3c3836" }, - ["fg"] = "#ddc7a1", - ["thumb"] = "#7c6f64", - ["sbar"] = "#3c3836", + ["search_result"] = { + ["telescope"] = "#a9b665", + ["bg"] = "#a9b665", + ["fg"] = "#1d2021", }, - ["cyan"] = "#89b482", - ["green"] = "#a9b665", - ["bg"] = { ["base"] = "#1d2021", ["selected"] = "#282828", ["alt"] = "#3c3836" }, - ["magenta"] = "#d3869b", - ["inc_search"] = { ["bg"] = "#ea6962", ["fg"] = "#1d2021" }, - ["orange"] = "#d8a657", - ["diff"] = { ["text"] = "#7daea3", ["remove"] = "#3c1f1e", ["add"] = "#32361a", ["change"] = "#d3138" }, - ["uri"] = "#7daea3", - ["heading"] = { ["h1"] = "#ea6962", ["h2"] = "#0" }, - ["fg"] = "#d4be98", - ["diagnostic"] = { ["hint"] = "#0", ["info"] = "#0", ["warn"] = "#0", ["error"] = "#0" }, + ["cursorlinenr"] = "#928374", + ["diff"] = { + ["text"] = "#7daea3", + ["remove"] = "#3c1f1e", + ["add"] = "#32361a", + ["change"] = "#d3138", + }, + ["match"] = "#a9b665", ["built_in"] = { - ["type"] = "#d8a657", ["function"] = "#a9b665", - ["constant"] = "#7daea3", ["variable"] = "#7daea3", ["keyword"] = "#ea6962", + ["constant"] = "#7daea3", + ["type"] = "#d8a657", }, - ["match"] = "#a9b665", + ["heading"] = { + ["h1"] = "#ea6962", + ["h2"] = "#d4be98", + }, + ["bg"] = { + ["base"] = "#1d2021", + ["alt"] = "#3c3836", + ["selected"] = "#282828", + }, + ["uri"] = "#7daea3", ["border"] = "#504945", + ["diagnostic"] = { + ["warn"] = "#d4be98", + ["error"] = "#d4be98", + ["hint"] = "#d4be98", + ["info"] = "#d4be98", + }, ["syntax"] = { - ["type"] = "#d8a657", - ["function"] = "#a9b665", - ["operator"] = "#e78a4e", - ["statement"] = "#ea6962", - ["conditional"] = "#ea6962", - ["todo"] = { ["bg"] = "#0", ["fg"] = "#d3869b" }, - ["constructor"] = "#a9b665", - ["punctuation"] = "#d4be98", - ["property"] = "#d4be98", + ["constant"] = "#d4be98", ["struct"] = "#e78a4e", + ["punctuation"] = "#d4be98", ["preproc"] = "#d3869b", - ["constant"] = "#d4be98", - ["variable"] = "#d4be98", - ["include"] = "#d3869b", - ["parameter"] = "#d4be98", + ["todo"] = { + ["bg"] = "#d4be98", + ["fg"] = "#d3869b", + }, + ["tag"] = "#e78a4e", + ["statement"] = "#ea6962", ["string"] = "#89b482", - ["field"] = "#a9b665", ["comment"] = "#928374", ["keyword"] = "#ea6962", - ["tag"] = "#e78a4e", + ["field"] = "#a9b665", ["number"] = "#d3869b", + ["type"] = "#d8a657", + ["function"] = "#a9b665", + ["operator"] = "#e78a4e", + ["include"] = "#d3869b", + ["variable"] = "#d4be98", + ["constructor"] = "#a9b665", + ["property"] = "#d4be98", + ["parameter"] = "#d4be98", + ["conditional"] = "#ea6962", }, - ["blue"] = "#7daea3", - ["dimmed"] = { ["subtle"] = "#928374", ["inactive"] = "#504945" }, ["yellow"] = "#d8a657", - ["cursorlinenr"] = "#928374", - ["search_result"] = { ["bg"] = "#a9b665", ["fg"] = "#1d2021", ["telescope"] = "#a9b665" }, + ["cyan"] = "#89b482", + ["green"] = "#a9b665", + ["dimmed"] = { + ["inactive"] = "#504945", + ["subtle"] = "#928374", + }, + ["blue"] = "#7daea3", + ["fg"] = "#d4be98", + ["magenta"] = "#d3869b", + ["orange"] = "#d8a657", + ["pum"] = { + ["sbar"] = "#3c3836", + ["thumb"] = "#7c6f64", + ["fg"] = "#ddc7a1", + ["sel"] = { + ["bg"] = "#a89984", + ["fg"] = "#3c3836", + }, + ["bg"] = "#3c3836", + }, + ["accent"] = "#d8a657", + ["inc_search"] = { + ["bg"] = "#ea6962", + ["fg"] = "#1d2021", + }, } diff --git a/lua/themer/modules/themes/gruvbox-material-dark-medium.lua b/lua/themer/modules/themes/gruvbox-material-dark-medium.lua index f2bcae2..aa3cdb4 100644 --- a/lua/themer/modules/themes/gruvbox-material-dark-medium.lua +++ b/lua/themer/modules/themes/gruvbox-material-dark-medium.lua @@ -1,59 +1,91 @@ --- Generated by Themer return { - ["fg"] = "#d4be98", - ["cyan"] = "#89b482", - ["green"] = "#a9b665", - ["blue"] = "#7daea3", - ["magenta"] = "#d3869b", - ["orange"] = "#d8a657", - ["yellow"] = "#d8a657", - ["heading"] = { ["h1"] = "#ea6962", ["h2"] = "#0" }, - ["diff"] = { ["text"] = "#7daea3", ["remove"] = "#402120", ["add"] = "#34381b", ["change"] = "#e363e" }, + ["search_result"] = { + ["telescope"] = "#a9b665", + ["fg"] = "#282828", + ["bg"] = "#a9b665", + }, + ["cursorlinenr"] = "#928374", + ["diff"] = { + ["text"] = "#7daea3", + ["remove"] = "#402120", + ["add"] = "#34381b", + ["change"] = "#e363e", + }, ["match"] = "#a9b665", - ["diagnostic"] = { ["hint"] = "#0", ["info"] = "#0", ["error"] = "#0", ["warn"] = "#0" }, - ["dimmed"] = { ["inactive"] = "#5a524c", ["subtle"] = "#928374" }, - ["border"] = "#5a524c", - ["pum"] = { - ["fg"] = "#ddc7a1", - ["sbar"] = "#45403d", - ["bg"] = "#45403d", - ["sel"] = { ["fg"] = "#45403d", ["bg"] = "#a89984" }, - ["thumb"] = "#7c6f64", + ["dimmed"] = { + ["subtle"] = "#928374", + ["inactive"] = "#5a524c", + }, + ["inc_search"] = { + ["fg"] = "#282828", + ["bg"] = "#ea6962", + }, + ["bg"] = { + ["base"] = "#282828", + ["alt"] = "#45403d", + ["selected"] = "#32302f", }, - ["inc_search"] = { ["fg"] = "#282828", ["bg"] = "#ea6962" }, ["uri"] = "#7daea3", - ["built_in"] = { - ["keyword"] = "#ea6962", - ["type"] = "#d8a657", - ["variable"] = "#7daea3", - ["function"] = "#a9b665", - ["constant"] = "#7daea3", + ["border"] = "#5a524c", + ["diagnostic"] = { + ["warn"] = "#d4be98", + ["error"] = "#d4be98", + ["hint"] = "#d4be98", + ["info"] = "#d4be98", }, ["syntax"] = { - ["conditional"] = "#ea6962", - ["todo"] = { ["fg"] = "#d3869b", ["bg"] = "#0" }, - ["string"] = "#89b482", - ["punctuation"] = "#d4be98", - ["property"] = "#d4be98", + ["constant"] = "#d4be98", ["struct"] = "#e78a4e", + ["punctuation"] = "#d4be98", ["preproc"] = "#d3869b", - ["keyword"] = "#ea6962", - ["number"] = "#d3869b", + ["todo"] = { + ["fg"] = "#d3869b", + ["bg"] = "#d4be98", + }, ["tag"] = "#e78a4e", - ["function"] = "#a9b665", - ["operator"] = "#e78a4e", - ["include"] = "#d3869b", - ["type"] = "#d8a657", - ["constant"] = "#d4be98", + ["statement"] = "#ea6962", + ["string"] = "#89b482", ["comment"] = "#928374", + ["type"] = "#d8a657", ["field"] = "#a9b665", + ["number"] = "#d3869b", + ["keyword"] = "#ea6962", + ["operator"] = "#e78a4e", + ["function"] = "#a9b665", + ["include"] = "#d3869b", ["variable"] = "#d4be98", - ["parameter"] = "#d4be98", ["constructor"] = "#a9b665", - ["statement"] = "#ea6962", + ["property"] = "#d4be98", + ["parameter"] = "#d4be98", + ["conditional"] = "#ea6962", }, - ["search_result"] = { ["fg"] = "#282828", ["bg"] = "#a9b665", ["telescope"] = "#a9b665" }, - ["bg"] = { ["alt"] = "#45403d", ["base"] = "#282828", ["selected"] = "#32302f" }, - ["cursorlinenr"] = "#928374", + ["yellow"] = "#d8a657", + ["cyan"] = "#89b482", + ["green"] = "#a9b665", + ["pum"] = { + ["sbar"] = "#45403d", + ["thumb"] = "#7c6f64", + ["fg"] = "#ddc7a1", + ["sel"] = { + ["fg"] = "#45403d", + ["bg"] = "#a89984", + }, + ["bg"] = "#45403d", + }, + ["blue"] = "#7daea3", + ["fg"] = "#d4be98", + ["magenta"] = "#d3869b", + ["built_in"] = { + ["function"] = "#a9b665", + ["variable"] = "#7daea3", + ["constant"] = "#7daea3", + ["type"] = "#d8a657", + ["keyword"] = "#ea6962", + }, + ["orange"] = "#d8a657", ["accent"] = "#d8a657", + ["heading"] = { + ["h1"] = "#ea6962", + ["h2"] = "#d4be98", + }, } diff --git a/lua/themer/modules/themes/gruvbox-material-dark-soft.lua b/lua/themer/modules/themes/gruvbox-material-dark-soft.lua index b0953d4..e58a42f 100644 --- a/lua/themer/modules/themes/gruvbox-material-dark-soft.lua +++ b/lua/themer/modules/themes/gruvbox-material-dark-soft.lua @@ -1,59 +1,91 @@ --- Generated by Themer return { - ["diff"] = { ["change"] = "#d79921", ["remove"] = "#fb4934", ["text"] = "#458588", ["add"] = "#b8bb26" }, + ["search_result"] = { + ["fg"] = "#3c3836", + ["telescope"] = "#fabd2f", + ["bg"] = "#fabd2f", + }, ["cursorlinenr"] = "#ebdbb2", - ["diagnostic"] = { ["warn"] = "#d79921", ["hint"] = "#b4bbc8", ["error"] = "#fb4934", ["info"] = "#b8bb26" }, - ["search_result"] = { ["telescope"] = "#fabd2f", ["bg"] = "#fabd2f", ["fg"] = "#3c3836" }, + ["diff"] = { + ["change"] = "#d79921", + ["remove"] = "#fb4934", + ["add"] = "#b8bb26", + ["text"] = "#458588", + }, + ["match"] = "#ebdbb2", + ["inc_search"] = { + ["bg"] = "#fe8019", + ["fg"] = "#3c3836", + }, + ["bg"] = { + ["selected"] = "#504945", + ["alt"] = "#232323", + ["base"] = "#282828", + }, ["uri"] = "#fb4934", - ["accent"] = "#8ec07c", - ["pum"] = { - ["thumb"] = "#83a598", - ["fg"] = "#ebdbb2", - ["bg"] = "#353535", - ["sel"] = { ["bg"] = "#83a598", ["fg"] = "#d5c4a1" }, - ["sbar"] = "#3f3f3f", + ["orange"] = "#d79921", + ["diagnostic"] = { + ["warn"] = "#d79921", + ["info"] = "#b8bb26", + ["hint"] = "#b4bbc8", + ["error"] = "#fb4934", }, - ["bg"] = { ["alt"] = "#232323", ["selected"] = "#504945", ["base"] = "#282828" }, - ["border"] = "#458588", - ["cyan"] = "#749689", - ["green"] = "#b8bb26", ["blue"] = "#458588", - ["magenta"] = "#d3869b", - ["inc_search"] = { ["bg"] = "#fe8019", ["fg"] = "#3c3836" }, - ["orange"] = "#d79921", ["yellow"] = "#d79921", ["built_in"] = { - ["constant"] = "#fe8019", + ["function"] = "#8ec07c", ["variable"] = "#8ec07c", + ["constant"] = "#fe8019", ["keyword"] = "#d3869b", - ["function"] = "#8ec07c", ["type"] = "#fabd2f", }, + ["cyan"] = "#749689", + ["green"] = "#b8bb26", + ["heading"] = { + ["h1"] = "#458588", + ["h2"] = "#ebdbb2", + }, + ["dimmed"] = { + ["inactive"] = "#665c54", + ["subtle"] = "#4e4e4e", + }, ["fg"] = "#ebdbb2", + ["magenta"] = "#d3869b", ["syntax"] = { - ["include"] = "#83a598", - ["field"] = "#fb4934", - ["function"] = "#83a598", + ["punctuation"] = "#d65d0e", + ["property"] = "#fb4934", + ["struct"] = "#fabd2f", + ["preproc"] = "#fabd2f", + ["constructor"] = "#8ec07c", + ["string"] = "#b8bb26", + ["variable"] = "#d5c4a1", + ["keyword"] = "#d3869b", + ["type"] = "#fabd2f", + ["operator"] = "#d5c4a1", ["constant"] = "#fe8019", + ["number"] = "#fe8019", + ["field"] = "#fb4934", ["tag"] = "#fb4934", - ["operator"] = "#d5c4a1", - ["type"] = "#fabd2f", + ["function"] = "#83a598", ["statement"] = "#fb4934", ["conditional"] = "#d3869b", - ["todo"] = { ["bg"] = "#3c3836", ["fg"] = "#fabd2f" }, + ["todo"] = { + ["bg"] = "#3c3836", + ["fg"] = "#fabd2f", + }, ["comment"] = "#665c54", + ["include"] = "#83a598", ["parameter"] = "#fb4934", - ["punctuation"] = "#d65d0e", - ["property"] = "#fb4934", - ["number"] = "#fe8019", - ["struct"] = "#fabd2f", - ["preproc"] = "#fabd2f", - ["keyword"] = "#d3869b", - ["variable"] = "#d5c4a1", - ["string"] = "#b8bb26", - ["constructor"] = "#8ec07c", }, - ["match"] = "#ebdbb2", - ["dimmed"] = { ["subtle"] = "#4e4e4e", ["inactive"] = "#665c54" }, - ["heading"] = { ["h2"] = "#0", ["h1"] = "#458588" }, + ["border"] = "#458588", + ["accent"] = "#8ec07c", + ["pum"] = { + ["sbar"] = "#3f3f3f", + ["thumb"] = "#83a598", + ["fg"] = "#ebdbb2", + ["sel"] = { + ["bg"] = "#83a598", + ["fg"] = "#d5c4a1", + }, + ["bg"] = "#353535", + }, } diff --git a/lua/themer/modules/themes/gruvbox.lua b/lua/themer/modules/themes/gruvbox.lua index eb694f7..07f33c8 100644 --- a/lua/themer/modules/themes/gruvbox.lua +++ b/lua/themer/modules/themes/gruvbox.lua @@ -1,59 +1,96 @@ return { - ["match"] = "#0", - ["search_result"] = { ["bg"] = "#282828", ["fg"] = "#fabd2f", ["telescope"] = "#fe8019" }, - ["accent"] = "#fe8019", - ["pum"] = { - ["bg"] = "#504945", - ["sbar"] = "#504945", - ["sel"] = { ["bg"] = "#83a598", ["fg"] = "#504945" }, - ["fg"] = "#ebdbb2", - ["thumb"] = "#7c6f64", + ["search_result"] = { + ["telescope"] = "#fe8019", + ["bg"] = "#282828", + ["fg"] = "#fabd2f", }, - ["diagnostic"] = { ["hint"] = "#d3d3d3", ["warn"] = "#ffa500", ["info"] = "#add8e6", ["error"] = "#ff0000" }, - ["cyan"] = "#689d6a", - ["green"] = "#98971a", - ["blue"] = "#458588", - ["magenta"] = "#b16286", - ["inc_search"] = { ["bg"] = "#282828", ["fg"] = "#fe8019" }, - ["orange"] = "#fabd2f", - ["yellow"] = "#d79921", ["cursorlinenr"] = "#fabd2f", - ["gitsigns"] = { ["remove"] = "#fb4934", ["add"] = "#b8bb26", ["change"] = "#8ec07c" }, - ["diff"] = { ["remove"] = "#282828", ["text"] = "#282828", ["add"] = "#282828", ["change"] = "#282828" }, - ["uri"] = "#83a598", - ["heading"] = { ["h2"] = "#0", ["h1"] = "#b8bb26" }, + ["diff"] = { + ["text"] = "#282828", + ["remove"] = "#282828", + ["add"] = "#282828", + ["change"] = "#282828", + }, + ["match"] = "#ebdbb2", ["built_in"] = { - ["type"] = "#fabd2f", - ["keyword"] = "#fb4934", ["function"] = "#fe8019", ["variable"] = "#fe8019", ["constant"] = "#fe8019", + ["keyword"] = "#fb4934", + ["type"] = "#fabd2f", + }, + ["inc_search"] = { + ["bg"] = "#282828", + ["fg"] = "#fe8019", + }, + ["bg"] = { + ["selected"] = "#3c3836", + ["alt"] = "#504945", + ["base"] = "#282828", + }, + ["uri"] = "#83a598", + ["orange"] = "#fabd2f", + ["diagnostic"] = { + ["warn"] = "#ffa500", + ["error"] = "#ff0000", + ["hint"] = "#d3d3d3", + ["info"] = "#add8e6", }, - ["dimmed"] = { ["inactive"] = "#504945", ["subtle"] = "#3c3836" }, - ["border"] = "#665c54", ["syntax"] = { + ["constant"] = "#d3869b", ["struct"] = "#8ec07c", - ["tag"] = "#fb4934", - ["variable"] = "#0", - ["property"] = "#83a598", - ["parameter"] = "#83a598", - ["comment"] = "#928374", - ["constructor"] = "#fe8019", ["punctuation"] = "#fe8019", - ["todo"] = { ["fg"] = "#ebdbb2", ["bg"] = "#282828" }, - ["statement"] = "#fb4934", ["preproc"] = "#8ec07c", - ["keyword"] = "#fb4934", - ["constant"] = "#d3869b", - ["type"] = "#fabd2f", - ["conditional"] = "#fb4934", - ["operator"] = "#ebdbb2", - ["number"] = "#d3869b", + ["todo"] = { + ["fg"] = "#ebdbb2", + ["bg"] = "#282828", + }, + ["tag"] = "#fb4934", + ["statement"] = "#fb4934", ["string"] = "#b8bb26", - ["include"] = "#8ec07c", + ["comment"] = "#928374", ["function"] = "#b8bb26", ["field"] = "#83a598", + ["number"] = "#d3869b", + ["type"] = "#fabd2f", + ["keyword"] = "#fb4934", + ["operator"] = "#ebdbb2", + ["include"] = "#8ec07c", + ["variable"] = "#ebdbb2", + ["constructor"] = "#fe8019", + ["property"] = "#83a598", + ["parameter"] = "#83a598", + ["conditional"] = "#fb4934", }, + ["yellow"] = "#d79921", + ["cyan"] = "#689d6a", + ["dimmed"] = { + ["subtle"] = "#3c3836", + ["inactive"] = "#504945", + }, + ["green"] = "#98971a", + ["border"] = "#665c54", + ["blue"] = "#458588", ["fg"] = "#ebdbb2", - ["bg"] = { ["alt"] = "#504945", ["selected"] = "#3c3836", ["base"] = "#282828" }, + ["magenta"] = "#b16286", + ["heading"] = { + ["h2"] = "#ebdbb2", + ["h1"] = "#b8bb26", + }, + ["pum"] = { + ["sbar"] = "#504945", + ["thumb"] = "#7c6f64", + ["fg"] = "#ebdbb2", + ["sel"] = { + ["bg"] = "#83a598", + ["fg"] = "#504945", + }, + ["bg"] = "#504945", + }, + ["accent"] = "#fe8019", + ["gitsigns"] = { + ["change"] = "#8ec07c", + ["remove"] = "#fb4934", + ["add"] = "#b8bb26", + }, } diff --git a/lua/themer/modules/themes/gruvchad.lua b/lua/themer/modules/themes/gruvchad.lua new file mode 100644 index 0000000..158e8c5 --- /dev/null +++ b/lua/themer/modules/themes/gruvchad.lua @@ -0,0 +1,136 @@ +local base = { + 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", + white = "#c7b89d", + darker_black = "#1a1d1e", + black = "#1e2122", -- nvim bg + black2 = "#232627", + one_bg = "#282b2c", + one_bg2 = "#393c3d", + one_bg3 = "#404344", + grey = "#484b4c", + grey_fg = "#575a5b", + grey_fg2 = "#545758", + light_grey = "#5a5d5e", + red = "#ec6b64", + baby_pink = "#ce8196", + pink = "#ff75a0", + line = "#2c2f30", -- for lines like vertsplit + green = "#89b482", + vibrant_green = "#a9b665", + nord_blue = "#6f8faf", + blue = "#6d8dad", + yellow = "#d6b676", + sun = "#d1b171", + purple = "#b4bbc8", + dark_purple = "#cc7f94", + teal = "#749689", + orange = "#e78a4e", + cyan = "#82b3a8", + statusline_bg = "#222526", + lightbg = "#2d3031", + lightbg2 = "#252829", + pmenu_bg = "#89b482", + folder_bg = "#6d8dad", +} + +local cp = { + -- Legacy colors for compatibility + red = base.red, + yellow = base.yellow, + orange = base.orange, + magenta = base.dark_purple, + blue = base.blue, + green = base.green, + cyan = base.teal, + + -- The new shiny boy + directory = base.folder_bg, + fg = base.white, + diff = { + add = base.green, + remove = base.red, + text = base.blue, + change = base.yellow, + }, + accent = base.base0C, + search_result = { fg = base.base01, bg = base.base0A, telescope = base.base0A }, + match = base.base06, + dimmed = { + inactive = base.base03, + subtle = base.grey_fg, + }, + bg = { + base = base.base00, + alt = base.darker_black, + selected = base.base02, + }, + border = base.blue, + syntax = { + statement = base.base08, + ["function"] = base.base0D, + variable = base.base05, + include = base.base0D, + keyword = base.base0E, + struct = base.base0E, + string = base.base0B, + identifier = base.base08, + field = base.base0A, + parameter = base.base08, + property = base.base08, + punctuation = base.base0F, + constructor = base.base0C, + operator = base.base05, + preproc = base.base0A, + constant = base.base09, + todo = { fg = base.base0A, bg = base.base01 }, + number = base.base09, + comment = base.base03, + conditional = base.base0E, + }, + built_in = { + ["function"] = base.base0C, + type = base.base0A, + variable = base.base0C, + keyword = base.base0E, + constant = base.base09, + }, + diagnostic = { + error = base.red, + warn = base.yellow, + info = base.green, + hint = base.purple, + }, + inc_search = { fg = base.base01, bg = base.base09 }, + uri = base.base08, + pum = { + fg = base.base06, + bg = base.one_bg, + sbar = base.one_bg2, + thumb = base.nord_blue, + sel = { + bg = base.pmenu_bg, + fg = base.base02, + }, + }, + heading = { + h1 = base.blue, + h2 = base.blue, + }, +} + +return cp diff --git a/lua/themer/modules/themes/horizon-dark.lua b/lua/themer/modules/themes/horizon-dark.lua new file mode 100644 index 0000000..617ca44 --- /dev/null +++ b/lua/themer/modules/themes/horizon-dark.lua @@ -0,0 +1,96 @@ +return { + ["search_result"] = { + ["telescope"] = "#d5d8da", + ["bg"] = "#e4aa80", + ["fg"] = "#392313", + }, + ["cursorlinenr"] = "#cdd1e6", + ["dimmed"] = { + ["inactive"] = "#2e303e", + ["subtle"] = "#6C6F93", + }, + ["match"] = "#FDF0ED", + ["inc_search"] = { + ["bg"] = "#5b6389", + ["fg"] = "#d5d8da", + }, + ["bg"] = { + ["base"] = "#1c1e26", + ["alt"] = "#1A1C23", + ["selected"] = "#2e303e", + }, + ["uri"] = "#25b0bc", + ["border"] = "#2E303E", + ["diagnostic"] = { + ["warn"] = "#ffa500", + ["info"] = "#add8e6", + ["hint"] = "#d3d3d3", + ["error"] = "#ff0000", + }, + ["gitsigns"] = { + ["change"] = "#e95678", + ["remove"] = "#ec6a88", + ["add"] = "#d5d8da9f7a0", + }, + ["yellow"] = "#fab795", + ["built_in"] = { + ["function"] = "#e95678", + ["variable"] = "#e95678", + ["constant"] = "#e95678", + ["keyword"] = "#b877db", + ["type"] = "#fab795", + }, + ["cyan"] = "#e95678", + ["blue"] = "#25b0bc", + ["green"] = "#d5d8da9f7a0", + ["diff"] = { + ["change"] = "#384851", + ["remove"] = "#53343b", + ["add"] = "#45493e", + ["text"] = "#5b7881", + }, + ["orange"] = "#21bfc2", + ["fg"] = "#d5d8da", + ["magenta"] = "#f09483", + ["syntax"] = { + ["punctuation"] = "#21bfc2", + ["property"] = "#e95678", + ["struct"] = "#25b0bc", + ["preproc"] = "#d5d8da9f7a0", + ["constructor"] = "#e95678", + ["string"] = "#fab795", + ["include"] = "#b877db", + ["variable"] = "#d5d8da", + ["function"] = "#25b0bc", + ["type"] = "#fab795", + ["constant"] = "#f09483", + ["keyword"] = "#b877db", + ["field"] = "#e95678", + ["tag"] = "#b877db", + ["operator"] = "#25b0bc", + ["statement"] = "#b877db", + ["conditional"] = "#b877db", + ["todo"] = { + ["fg"] = "#d5d8da9f7a0", + ["bg"] = "#45493e", + }, + ["comment"] = "#6c6f93", + ["number"] = "#f09483", + ["parameter"] = "#e95678", + }, + ["pum"] = { + ["sbar"] = "#3d425b", + ["thumb"] = "#232530", + ["bg"] = "#1c1e26", + ["sel"] = { + ["bg"] = "#5b6389", + ["fg"] = "#eff0f4", + }, + ["fg"] = "#d5d8da", + }, + ["accent"] = "#e95678", + ["heading"] = { + ["h1"] = "#25b0bc", + ["h2"] = "#d5d8da", + }, +} diff --git a/lua/themer/modules/themes/jellybeans.lua b/lua/themer/modules/themes/jellybeans.lua index 1d5d453..b768fd8 100644 --- a/lua/themer/modules/themes/jellybeans.lua +++ b/lua/themer/modules/themes/jellybeans.lua @@ -1,65 +1,115 @@ return { + ["search_result"] = { + ["fg"] = "#f0a0c0", + ["telescope"] = "#e8e8d3", + ["bg"] = "#302028", + }, + ["cursorlinenr"] = "#ccc5c4", + ["dimmed"] = { + ["subtle"] = "#ffffff", + ["inactive"] = "#606060", + }, + ["match"] = "#e8e8d3", + ["inc_search"] = { + ["bg"] = "#e8e8d3", + ["fg"] = "#e8e8d3", + }, + ["bg"] = { + ["selected"] = "#1c1c1c", + ["alt"] = "#606060", + ["base"] = "#151515", + }, + ["pum"] = { + ["sbar"] = "#808080", + ["thumb"] = "#ffffff", + ["bg"] = "#606060", + ["sel"] = { + ["bg"] = "#eeeeee", + ["fg"] = "#101010", + }, + ["fg"] = "#ffffff", + }, + ["border"] = "#777777", + ["diagnostic"] = { + ["warn"] = "#ffa500", + ["error"] = "#ff0000", + ["hint"] = "#d3d3d3", + ["info"] = "#add8e6", + }, ["syntax"] = { ["punctuation"] = "#668799", - ["function"] = "#fad07a", - ["operator"] = "#8fbfdc", - ["constant"] = "#cf6a4c", - ["todo"] = { ["bg"] = "#0", ["fg"] = "#c7c7c7" }, - ["conditional"] = "#8197bf", - ["statement"] = "#8197bf", - ["field"] = "#c6b6ee", + ["property"] = "#c6b6ee", + ["struct"] = "#8fbfdc", ["preproc"] = "#8fbfdc", - ["type"] = "#ffb964", ["constructor"] = "#799d6a", - ["variable"] = "#0", ["string"] = "#99ad6a", + ["conditional"] = "#8197bf", + ["include"] = "#8fbfdc", ["number"] = "#cf6a4c", - ["tag"] = "#8197bf", + ["type"] = "#ffb964", + ["constant"] = "#cf6a4c", ["keyword"] = "#8197bf", - ["struct"] = "#8fbfdc", - ["parameter"] = "#c6b6ee", - ["include"] = "#8fbfdc", - ["property"] = "#c6b6ee", + ["field"] = "#c6b6ee", + ["tag"] = "#8197bf", + ["operator"] = "#8fbfdc", + ["statement"] = "#8197bf", + ["variable"] = "#e8e8d3", + ["todo"] = { + ["bg"] = "#e8e8d3", + ["fg"] = "#c7c7c7", + }, ["comment"] = "#888888", + ["function"] = "#fad07a", + ["parameter"] = "#c6b6ee", }, - ["match"] = "#0", - ["uri"] = "#80a0ff", - ["accent"] = "#799d6a", - ["search_result"] = { ["telescope"] = "#0", ["bg"] = "#302028", ["fg"] = "#f0a0c0" }, - ["dimmed"] = { ["inactive"] = "#606060", ["subtle"] = "#ffffff" }, - ["heading"] = { ["h2"] = "#0", ["h1"] = "#0" }, - ["green"] = "#9ece6a", - ["border"] = "#777777", ["yellow"] = "#e0af68", ["built_in"] = { - ["keyword"] = "#8197bf", - ["constant"] = "#799d6a", ["function"] = "#799d6a", ["variable"] = "#799d6a", + ["constant"] = "#799d6a", + ["keyword"] = "#8197bf", ["type"] = "#ffb964", }, - ["inc_search"] = { ["bg"] = "#0", ["fg"] = "#0" }, - ["pum"] = { - ["thumb"] = "#ffffff", - ["bg"] = "#606060", - ["sel"] = { ["bg"] = "#eeeeee", ["fg"] = "#101010" }, - ["fg"] = "#ffffff", - ["sbar"] = "#808080", - }, - ["bg"] = { ["alt"] = "#606060", ["selected"] = "#1c1c1c", ["base"] = "#151515" }, - ["magenta"] = "#9d7cd8", - ["diagnostic"] = { ["hint"] = "#d3d3d3", ["info"] = "#add8e6", ["error"] = "#ff0000", ["warn"] = "#ffa500" }, - ["cursorlinenr"] = "#ccc5c4", - ["orange"] = "#e0af68", - ["cyan"] = "#0db9d7", - ["fg"] = "#e8e8d3", - ["blue"] = "#7aa2f7", - ["diff"] = { ["add"] = "#437019", ["text"] = "#0", ["change"] = "#2b5b77", ["remove"] = "#700009" }, + ["cyan"] = "#e8e8d3db9d7", ["remaps"] = { ["base"] = { - ["ColorColumn"] = { bg = "#000000" }, - ["LineNr"] = { fg = "#606060" }, - ["Visual"] = { bg = "#404040" }, + ["DiffAdd"] = { + ["fg"] = "#D2EBBE", + ["bg"] = "#437019", + }, + ["DiffDelete"] = { + ["fg"] = "#40000A", + ["bg"] = "#700009", + }, + ["ColorColumn"] = { + ["bg"] = "#000000", + }, + ["DiffText"] = { + ["bg"] = "#000000", + }, + ["LineNr"] = { + ["fg"] = "#606060", + }, + ["Visual"] = { + ["bg"] = "#404040", + }, }, }, + ["green"] = "#9ece6a", + ["diff"] = { + ["text"] = "#8fbfdc", + ["remove"] = "#700009", + ["add"] = "#437019", + ["change"] = "#2b5b77", + }, + ["blue"] = "#7aa2f7", + ["fg"] = "#e8e8d3", + ["magenta"] = "#9d7cd8", + ["orange"] = "#e0af68", + ["uri"] = "#80a0ff", + ["accent"] = "#799d6a", + ["heading"] = { + ["h1"] = "#e8e8d3", + ["h2"] = "#e8e8d3", + }, } diff --git a/lua/themer/modules/themes/kanagawa.lua b/lua/themer/modules/themes/kanagawa.lua index 69fd694..3e9072e 100644 --- a/lua/themer/modules/themes/kanagawa.lua +++ b/lua/themer/modules/themes/kanagawa.lua @@ -1,54 +1,90 @@ --- Generated by Themer return { + ["accent"] = "#7fb4ca", + ["search_result"] = { + ["telescope"] = "#7fb4ca", + ["bg"] = "#2d4f67", + ["fg"] = "#dcd7ba", + }, ["cursorlinenr"] = "#ff9e3b", - ["dimmed"] = { ["inactive"] = "#54546d", ["subtle"] = "#727169" }, + ["dimmed"] = { + ["subtle"] = "#727169", + ["inactive"] = "#54546d", + }, + ["match"] = "#7e9cd8", + ["inc_search"] = { + ["fg"] = "#223249", + ["bg"] = "#ff9e3b", + }, + ["border"] = "#54546d", + ["diagnostic"] = { + ["hint"] = "#6a9589", + ["warn"] = "#ff9e3b", + ["info"] = "#658594", + ["error"] = "#e82424", + }, + ["gitsigns"] = { + ["change"] = "#dca561", + ["remove"] = "#c34043", + ["add"] = "#76946a", + }, ["built_in"] = { ["function"] = "#7fb4ca", + ["variable"] = "#e46876", ["constant"] = "#7fb4ca", ["keyword"] = "#957fb8", - ["variable"] = "#e46876", ["type"] = "#7aa89f", }, - ["gitsigns"] = { ["remove"] = "#c34043", ["add"] = "#76946a", ["change"] = "#dca561" }, + ["bg"] = { + ["selected"] = "#363646", + ["alt"] = "#16161d", + ["base"] = "#1f1f28", + }, + ["heading"] = { + ["h1"] = "#7e9cd8", + ["h2"] = "#dcd7ba", + }, + ["fg"] = "#dcd7ba", + ["uri"] = "#7fb4ca", + ["diff"] = { + ["change"] = "#252535", + ["remove"] = "#43242b", + ["add"] = "#2b3328", + ["text"] = "#49443c", + }, ["pum"] = { ["sbar"] = "#223249", - ["sel"] = { ["fg"] = "#0", ["bg"] = "#2d4f67" }, ["fg"] = "#dcd7ba", + ["sel"] = { + ["fg"] = "#dcd7ba", + ["bg"] = "#2d4f67", + }, ["bg"] = "#223249", ["thumb"] = "#2d4f67", }, - ["heading"] = { ["h1"] = "#7e9cd8", ["h2"] = "#0" }, - ["uri"] = "#7fb4ca", - ["inc_search"] = { ["fg"] = "#223249", ["bg"] = "#ff9e3b" }, ["syntax"] = { - ["tag"] = "#957fb8", - ["constant"] = "#ffa066", - ["preproc"] = "#ffa066", - ["string"] = "#98bb6c", - ["parameter"] = "#e6c384", ["field"] = "#e6c384", - ["variable"] = "#0", - ["number"] = "#d27e99", ["statement"] = "#957fb8", - ["todo"] = { ["fg"] = "#658594", ["bg"] = "#223249" }, - ["function"] = "#7e9cd8", + ["preproc"] = "#ffa066", ["punctuation"] = "#9cabca", ["struct"] = "#7aa89f", ["operator"] = "#c0a36e", ["conditional"] = "#957fb8", - ["type"] = "#7aa89f", ["comment"] = "#727169", - ["keyword"] = "#957fb8", ["property"] = "#e6c384", ["constructor"] = "#957fb8", ["include"] = "#ffa066", + ["string"] = "#98bb6c", + ["constant"] = "#ffa066", + ["number"] = "#d27e99", + ["type"] = "#7aa89f", + ["function"] = "#7e9cd8", + ["variable"] = "#dcd7ba", + ["tag"] = "#957fb8", + ["keyword"] = "#957fb8", + ["todo"] = { + ["fg"] = "#658594", + ["bg"] = "#223249", + }, + ["parameter"] = "#e6c384", }, - ["border"] = "#54546d", - ["fg"] = "#dcd7ba", - ["match"] = "#7e9cd8", - ["diagnostic"] = { ["warn"] = "#ff9e3b", ["info"] = "#658594", ["error"] = "#e82424", ["hint"] = "#6a9589" }, - ["bg"] = { ["alt"] = "#16161d", ["selected"] = "#363646", ["base"] = "#1f1f28" }, - ["diff"] = { ["text"] = "#49443c", ["remove"] = "#43242b", ["add"] = "#2b3328", ["change"] = "#252535" }, - ["accent"] = "#7fb4ca", - ["search_result"] = { ["fg"] = "#dcd7ba", ["bg"] = "#2d4f67", ["telescope"] = "#7fb4ca" }, } diff --git a/lua/themer/modules/themes/nightfox.lua b/lua/themer/modules/themes/nightfox.lua new file mode 100644 index 0000000..4076a81 --- /dev/null +++ b/lua/themer/modules/themes/nightfox.lua @@ -0,0 +1,96 @@ +return { + ["accent"] = "#719cd6", + ["search_result"] = { + ["telescope"] = "#719cd6", + ["bg"] = "#2f5660", + ["fg"] = "#cdcecf", + }, + ["cursorlinenr"] = "#aeafb0", + ["dimmed"] = { + ["inactive"] = "#526175", + ["subtle"] = "#3b4261", + }, + ["match"] = "#719cd6", + ["inc_search"] = { + ["fg"] = "#393b44", + ["bg"] = "#63cdcf", + }, + ["magenta"] = "#9d79d6", + ["yellow"] = "#dbc074", + ["border"] = "#719cd6", + ["diagnostic"] = { + ["hint"] = "#63cdcf", + ["warn"] = "#dbc074", + ["error"] = "#c94f6d", + ["info"] = "#719cd6", + }, + ["gitsigns"] = { + ["change"] = "#536c9e", + ["remove"] = "#b2555b", + ["add"] = "#266d6a", + }, + ["built_in"] = { + ["function"] = "#63cdcf", + ["variable"] = "#c94f6d", + ["constant"] = "#f6a878", + ["keyword"] = "#9d79d6", + ["type"] = "#63cdcf", + }, + ["bg"] = { + ["selected"] = "#283648", + ["base"] = "#192330", + ["alt"] = "#131a24", + }, + ["blue"] = "#719cd6", + ["green"] = "#81b29a", + ["cyan"] = "#63cdcf", + ["heading"] = { + ["h1"] = "#9d79d6", + ["h2"] = "#cdcecf", + }, + ["fg"] = "#cdcecf", + ["uri"] = "#f4a261", + ["diff"] = { + ["change"] = "#263549", + ["text"] = "#3c5372", + ["add"] = "#293840", + ["remove"] = "#332a39", + }, + ["orange"] = "#ffe37e", + ["syntax"] = { + ["field"] = "#719cd6", + ["statement"] = "#b8a1e3", + ["preproc"] = "#d67ad2", + ["punctuation"] = "#aeafb0", + ["struct"] = "#dbc074", + ["operator"] = "#aeafb0", + ["conditional"] = "#b8a1e3", + ["comment"] = "#526175", + ["property"] = "#81b29a", + ["constructor"] = "#9d79d6", + ["include"] = "#d67ad2", + ["string"] = "#81b29a", + ["constant"] = "#f4a261", + ["number"] = "#f6a878", + ["type"] = "#dbc074", + ["function"] = "#719cd6", + ["variable"] = "#cdcecf", + ["todo"] = { + ["fg"] = "#192330", + ["bg"] = "#dbc074", + }, + ["tag"] = "#b8a1e3", + ["keyword"] = "#9d79d6", + ["parameter"] = "#f6a878", + }, + ["pum"] = { + ["sbar"] = "#1f252f", + ["fg"] = "#aeafb0", + ["sel"] = { + ["fg"] = "#63cdcf", + ["bg"] = "#283648", + }, + ["bg"] = "#131a24", + ["thumb"] = "#3b4261", + }, +} diff --git a/lua/themer/modules/themes/papa_dark.lua b/lua/themer/modules/themes/papa_dark.lua index af30aea..fdc6121 100644 --- a/lua/themer/modules/themes/papa_dark.lua +++ b/lua/themer/modules/themes/papa_dark.lua @@ -34,6 +34,7 @@ local color_palette = { blue = colors.blue, green = colors.green, cyan = colors.cyan, + fg = colors.fg, diff = { add = colors.green, @@ -208,8 +209,8 @@ color_palette.remaps = { TelescopeSelectionCaret = { fg = colors.bg_alt, bg = colors.bg_alt }, }, lsp = { - DiagnosticUnderlineWarn = { fg = "NONE", style = "underline", sp = colors.yellow }, - DiagnosticUnderlineHint = { fg = "NONE", style = "underline", sp = colors.light_blue }, + DiagnosticUnderlineWarn = { fg = "NONE", underline = true, sp = colors.yellow }, + DiagnosticUnderlineHint = { fg = "NONE", underline = true, sp = colors.light_blue }, }, }, diff --git a/lua/themer/modules/themes/rose_pine.lua b/lua/themer/modules/themes/rose_pine.lua index 37bd328..c786df5 100644 --- a/lua/themer/modules/themes/rose_pine.lua +++ b/lua/themer/modules/themes/rose_pine.lua @@ -1,11 +1,46 @@ --- Generated by Themer return { - ["uri"] = "#c4a7e7", - ["cyan"] = "#ebbcba", - ["diff"] = { ["text"] = "#826a6f", ["remove"] = "#82435b", ["change"] = "#26233a", ["add"] = "#5b737e" }, - ["blue"] = "#9ccfd8", + ["accent"] = "#ebbcba", + ["search_result"] = { + ["telescope"] = "#ebbcba", + ["bg"] = "#403d52", + ["fg"] = "#e0def4", + }, + ["cursorlinenr"] = "#e0def4", + ["dimmed"] = { + ["inactive"] = "#6e6a86", + ["subtle"] = "#6e6a86", + }, + ["match"] = "#e0def4", + ["inc_search"] = { + ["fg"] = "#191724", + ["bg"] = "#ebbcba", + }, + ["magenta"] = "#c4a7e7", ["yellow"] = "#f6c177", - ["gitsigns"] = { ["remove"] = "#eb6f92", ["change"] = "#ebbcba", ["add"] = "#9ccfd8" }, + ["border"] = "#403d52", + ["diagnostic"] = { + ["hint"] = "#c4a7e7", + ["warn"] = "#f6c177", + ["info"] = "#9ccfd8", + ["error"] = "#eb6f92", + }, + ["pum"] = { + ["thumb"] = "#403d52", + ["fg"] = "#908caa", + ["sel"] = { + ["fg"] = "#e0def4", + ["bg"] = "#26233a", + }, + ["bg"] = "#1f1d2e", + ["sbar"] = "#21202e", + }, + ["remaps"] = { + ["core"] = { + ["Visual"] = { + ["bg"] = "# 403d52", + }, + }, + }, ["built_in"] = { ["function"] = "#eb6f92", ["variable"] = "#eb6f92", @@ -13,48 +48,56 @@ return { ["keyword"] = "#31748f", ["type"] = "#9ccfd8", }, - ["cursorlinenr"] = "#e0def4", - ["fg"] = "#e0def4", - ["bg"] = { ["selected"] = "#21202e", ["base"] = "#191724", ["alt"] = "#1f1d2e" }, - ["dimmed"] = { ["subtle"] = "#6e6a86", ["inactive"] = "#6e6a86" }, - ["border"] = "#403d52", - ["heading"] = { ["h2"] = "#0", ["h1"] = "#c4a7e7" }, - ["magenta"] = "#c4a7e7", - ["search_result"] = { ["bg"] = "#403d52", ["telescope"] = "#ebbcba", ["fg"] = "#0" }, - ["diagnostic"] = { ["hint"] = "#c4a7e7", ["info"] = "#9ccfd8", ["error"] = "#eb6f92", ["warn"] = "#f6c177" }, - ["accent"] = "#ebbcba", - ["pum"] = { - ["bg"] = "#1f1d2e", - ["thumb"] = "#403d52", - ["sbar"] = "#21202e", - ["sel"] = { ["bg"] = "#26233a", ["fg"] = "#e0def4" }, - ["fg"] = "#908caa", + ["bg"] = { + ["selected"] = "#21202e", + ["base"] = "#191724", + ["alt"] = "#1f1d2e", + }, + ["blue"] = "#9ccfd8", + ["green"] = "#31748f", + ["cyan"] = "#ebbcba", + ["heading"] = { + ["h1"] = "#c4a7e7", + ["h2"] = "#e0def4", + }, + ["gitsigns"] = { + ["change"] = "#ebbcba", + ["remove"] = "#eb6f92", + ["add"] = "#9ccfd8", + }, + ["uri"] = "#c4a7e7", + ["diff"] = { + ["change"] = "#26233a", + ["remove"] = "#82435b", + ["add"] = "#5b737e", + ["text"] = "#826a6f", }, - ["orange"] = "#f6c177", ["syntax"] = { - ["variable"] = "#e0def4", + ["field"] = "#9ccfd8", + ["statement"] = "#31748f", + ["preproc"] = "#c4a7e7", + ["punctuation"] = "#6e6a86", + ["struct"] = "#9ccfd8", ["operator"] = "#908caa", - ["include"] = "#c4a7e7", ["conditional"] = "#31748f", - ["tag"] = "#9ccfd8", - ["parameter"] = "#c4a7e7", - ["string"] = "#f6c177", - ["preproc"] = "#c4a7e7", - ["constructor"] = "#9ccfd8", + ["comment"] = "#6e6a86", ["property"] = "#c4a7e7", - ["field"] = "#9ccfd8", + ["constructor"] = "#9ccfd8", + ["include"] = "#c4a7e7", + ["string"] = "#f6c177", + ["constant"] = "#9ccfd8", ["number"] = "#f6c177", ["type"] = "#9ccfd8", - ["comment"] = "#6e6a86", - ["constant"] = "#9ccfd8", - ["struct"] = "#9ccfd8", - ["todo"] = { ["bg"] = "#0", ["fg"] = "#c4a7e7" }, - ["punctuation"] = "#6e6a86", ["function"] = "#ebbcba", + ["variable"] = "#e0def4", + ["tag"] = "#9ccfd8", ["keyword"] = "#31748f", - ["statement"] = "#31748f", + ["todo"] = { + ["fg"] = "#c4a7e7", + ["bg"] = "#e0def4", + }, + ["parameter"] = "#c4a7e7", }, - ["match"] = "#e0def4", - ["green"] = "#31748f", - ["inc_search"] = { ["bg"] = "#ebbcba", ["fg"] = "#191724" }, + ["orange"] = "#f6c177", + ["fg"] = "#e0def4", } diff --git a/lua/themer/modules/themes/rose_pine_dawn.lua b/lua/themer/modules/themes/rose_pine_dawn.lua index 2acbf58..811b772 100644 --- a/lua/themer/modules/themes/rose_pine_dawn.lua +++ b/lua/themer/modules/themes/rose_pine_dawn.lua @@ -1,59 +1,92 @@ --- Generated by Themer return { - ["diagnostic"] = { ["warn"] = "#ea9d34", ["error"] = "#b4637a", ["info"] = "#56949f", ["hint"] = "#907aa9" }, - ["fg"] = "#575279", - ["cyan"] = "#d7827e", - ["border"] = "#6e6a86", - ["heading"] = { ["h1"] = "#907aa9", ["h2"] = "#0" }, + ["accent"] = "#d7827e", + ["search_result"] = { + ["telescope"] = "#dcd7ba", + ["bg"] = "#cecacd", + ["fg"] = "#907aa9", + }, + ["cursorlinenr"] = "#575279", + ["dimmed"] = { + ["inactive"] = "#9893a5", + ["subtle"] = "#6e6a86", + }, + ["match"] = "#575279", + ["inc_search"] = { + ["fg"] = "#575279", + ["bg"] = "#dfdad9", + }, + ["magenta"] = "#907aa9", + ["flavour"] = "light", ["yellow"] = "#ea9d34", + ["border"] = "#6e6a86", + ["diagnostic"] = { + ["hint"] = "#907aa9", + ["warn"] = "#ea9d34", + ["error"] = "#b4637a", + ["info"] = "#56949f", + }, ["syntax"] = { - ["property"] = "#907aa9", - ["number"] = "#ea9d34", + ["field"] = "#56949f", + ["statement"] = "#286983", + ["preproc"] = "#907aa9", ["punctuation"] = "#6e6a86", - ["constant"] = "#56949f", - ["function"] = "#d7827e", + ["struct"] = "#56949f", ["operator"] = "#6e6a86", - ["preproc"] = "#907aa9", - ["include"] = "#907aa9", - ["variable"] = "#575279", - ["keyword"] = "#286983", ["conditional"] = "#957fb8", - ["type"] = "#7aa89f", ["comment"] = "#6e6a86", - ["todo"] = { ["bg"] = "#0", ["fg"] = "#907aa9" }, - ["field"] = "#56949f", + ["property"] = "#907aa9", + ["constructor"] = "#56949f", + ["include"] = "#907aa9", ["string"] = "#ea9d34", + ["constant"] = "#56949f", + ["number"] = "#ea9d34", + ["type"] = "#7aa89f", + ["function"] = "#d7827e", + ["variable"] = "#575279", + ["todo"] = { + ["fg"] = "#907aa9", + ["bg"] = "#575279", + }, + ["keyword"] = "#286983", ["tag"] = "#56949f", - ["struct"] = "#56949f", - ["constructor"] = "#56949f", ["parameter"] = "#907aa9", - ["statement"] = "#286983", }, - ["blue"] = "#56949f", - ["bg"] = { ["base"] = "#faf4ed", ["alt"] = "#fffaf3", ["selected"] = "#f4ede8" }, - ["green"] = "#286983", - ["accent"] = "#d7827e", - ["magenta"] = "#907aa9", - ["cursorlinenr"] = "#575279", - ["uri"] = "#ea9d34", - ["inc_search"] = { ["bg"] = "#dfdad9", ["fg"] = "#0" }, ["built_in"] = { - ["variable"] = "#b4637a", - ["type"] = "#7aa89f", - ["keyword"] = "#957fb8", ["function"] = "#b4637a", + ["variable"] = "#b4637a", ["constant"] = "#b4637a", + ["keyword"] = "#957fb8", + ["type"] = "#7aa89f", + }, + ["bg"] = { + ["selected"] = "#f4ede8", + ["base"] = "#faf4ed", + ["alt"] = "#fffaf3", + }, + ["blue"] = "#56949f", + ["green"] = "#286983", + ["cyan"] = "#d7827e", + ["heading"] = { + ["h1"] = "#907aa9", + ["h2"] = "#575279", + }, + ["fg"] = "#575279", + ["uri"] = "#ea9d34", + ["diff"] = { + ["change"] = "#f2e9de", + ["text"] = "#e9bbb6", + ["add"] = "#a8c4c6", + ["remove"] = "#d7acb4", }, - ["search_result"] = { ["fg"] = "#907aa9", ["bg"] = "#cecacd", ["telescope"] = "#dcd7ba" }, - ["orange"] = "#ea9d34", - ["match"] = "#575279", ["pum"] = { ["sbar"] = "#f2e9de", ["fg"] = "#6e6a86", + ["sel"] = { + ["fg"] = "#575279", + ["bg"] = "#f2e9de", + }, ["bg"] = "#fffaf3", - ["sel"] = { ["bg"] = "#f2e9de", ["fg"] = "#575279" }, ["thumb"] = "#9893a5", }, - ["diff"] = { ["add"] = "#a8c4c6", ["change"] = "#f2e9de", ["text"] = "#e9bbb6", ["remove"] = "#d7acb4" }, - ["dimmed"] = { ["subtle"] = "#6e6a86", ["inactive"] = "#9893a5" }, + ["orange"] = "#ea9d34", } diff --git a/lua/themer/modules/themes/rose_pine_moon.lua b/lua/themer/modules/themes/rose_pine_moon.lua index 7b5d04f..5d9e917 100644 --- a/lua/themer/modules/themes/rose_pine_moon.lua +++ b/lua/themer/modules/themes/rose_pine_moon.lua @@ -1,59 +1,91 @@ --- Generated by Themer return { - ["diff"] = { ["add"] = "#607887", ["text"] = "#875e67", ["remove"] = "#874864", ["change"] = "#393552" }, + ["accent"] = "#ea9a97", + ["search_result"] = { + ["telescope"] = "#dcd7ba", + ["bg"] = "#56526e", + ["fg"] = "#c4a7e7", + }, + ["cursorlinenr"] = "#e0def4", + ["dimmed"] = { + ["subtle"] = "#817c9c", + ["inactive"] = "#59546d", + }, + ["match"] = "#e0def4", + ["inc_search"] = { + ["fg"] = "#e0def4", + ["bg"] = "#44415a", + }, + ["magenta"] = "#c4a7e7", + ["yellow"] = "#f6c177", + ["border"] = "#817c9c", + ["diagnostic"] = { + ["hint"] = "#c4a7e7", + ["warn"] = "#f6c177", + ["info"] = "#9ccfd8", + ["error"] = "#eb6f92", + }, ["syntax"] = { - ["string"] = "#f6c177", - ["include"] = "#c4a7e7", - ["property"] = "#c4a7e7", - ["number"] = "#f6c177", - ["operator"] = "#817c9c", - ["function"] = "#ea9a97", + ["field"] = "#9ccfd8", ["statement"] = "#3e8fb0", - ["todo"] = { ["fg"] = "#c4a7e7", ["bg"] = "#0" }, - ["conditional"] = "#957fb8", + ["preproc"] = "#c4a7e7", ["punctuation"] = "#817c9c", - ["type"] = "#7aa89f", - ["tag"] = "#9ccfd8", - ["constructor"] = "#9ccfd8", - ["field"] = "#9ccfd8", ["struct"] = "#9ccfd8", - ["keyword"] = "#3e8fb0", - ["preproc"] = "#c4a7e7", + ["operator"] = "#817c9c", + ["conditional"] = "#957fb8", + ["comment"] = "#817c9c", + ["property"] = "#c4a7e7", + ["constructor"] = "#9ccfd8", + ["include"] = "#c4a7e7", + ["string"] = "#f6c177", ["constant"] = "#9ccfd8", + ["keyword"] = "#3e8fb0", + ["type"] = "#7aa89f", + ["function"] = "#ea9a97", ["variable"] = "#e0def4", + ["tag"] = "#9ccfd8", + ["number"] = "#f6c177", + ["todo"] = { + ["fg"] = "#c4a7e7", + ["bg"] = "#e0def4", + }, ["parameter"] = "#c4a7e7", - ["comment"] = "#817c9c", }, - ["dimmed"] = { ["inactive"] = "#59546d", ["subtle"] = "#817c9c" }, - ["search_result"] = { ["fg"] = "#c4a7e7", ["telescope"] = "#dcd7ba", ["bg"] = "#56526e" }, + ["built_in"] = { + ["function"] = "#eb6f92", + ["variable"] = "#eb6f92", + ["constant"] = "#eb6f92", + ["keyword"] = "#957fb8", + ["type"] = "#7aa89f", + }, + ["bg"] = { + ["selected"] = "#2a283e", + ["base"] = "#232136", + ["alt"] = "#2a273f", + }, + ["blue"] = "#9ccfd8", + ["green"] = "#3e8fb0", + ["cyan"] = "#ea9a97", + ["orange"] = "#f6c177", ["fg"] = "#e0def4", - ["accent"] = "#ea9a97", + ["uri"] = "#f6c177", + ["diff"] = { + ["change"] = "#393552", + ["text"] = "#875e67", + ["add"] = "#607887", + ["remove"] = "#874864", + }, + ["heading"] = { + ["h1"] = "#c4a7e7", + ["h2"] = "#e0def4", + }, ["pum"] = { ["thumb"] = "#59546d", - ["sbar"] = "#393552", ["fg"] = "#817c9c", - ["sel"] = { ["fg"] = "#e0def4", ["bg"] = "#393552" }, + ["sel"] = { + ["fg"] = "#e0def4", + ["bg"] = "#393552", + }, ["bg"] = "#2a273f", + ["sbar"] = "#393552", }, - ["yellow"] = "#f6c177", - ["border"] = "#817c9c", - ["orange"] = "#f6c177", - ["inc_search"] = { ["fg"] = "#0", ["bg"] = "#44415a" }, - ["blue"] = "#9ccfd8", - ["cyan"] = "#ea9a97", - ["bg"] = { ["base"] = "#232136", ["selected"] = "#2a283e", ["alt"] = "#2a273f" }, - ["magenta"] = "#c4a7e7", - ["uri"] = "#f6c177", - ["heading"] = { ["h1"] = "#c4a7e7", ["h2"] = "#0" }, - ["diagnostic"] = { ["hint"] = "#c4a7e7", ["info"] = "#9ccfd8", ["warn"] = "#f6c177", ["error"] = "#eb6f92" }, - ["built_in"] = { - ["keyword"] = "#957fb8", - ["type"] = "#7aa89f", - ["constant"] = "#eb6f92", - ["function"] = "#eb6f92", - ["variable"] = "#eb6f92", - }, - ["green"] = "#3e8fb0", - ["cursorlinenr"] = "#e0def4", - ["match"] = "#e0def4", } diff --git a/lua/themer/modules/themes/sakura.lua b/lua/themer/modules/themes/sakura.lua index 668adb3..4ad55d6 100644 --- a/lua/themer/modules/themes/sakura.lua +++ b/lua/themer/modules/themes/sakura.lua @@ -1,58 +1,91 @@ return { - ["cyan"] = "#ebbcba", - ["uri"] = "#f6c177", + ["accent"] = "#ebbcba", + ["search_result"] = { + ["telescope"] = "#ebbcba", + ["bg"] = "#ebbcba", + ["fg"] = "#12121e", + }, ["cursorlinenr"] = "#6ea86", + ["dimmed"] = { + ["inactive"] = "#555169", + ["subtle"] = "#6e6a86", + }, + ["match"] = "#ebbcba", + ["inc_search"] = { + ["fg"] = "#12121e", + ["bg"] = "#ff789e", + }, ["magenta"] = "#c4a7e7", - ["fg"] = "#e0def4", - ["green"] = "#9ccfd8", - ["accent"] = "#ebbcba", - ["search_result"] = { ["fg"] = "#12121e", ["telescope"] = "#ebbcba", ["bg"] = "#ebbcba" }, - ["diff"] = { ["remove"] = "#0", ["add"] = "#0", ["text"] = "#0", ["change"] = "#0" }, - ["heading"] = { ["h1"] = "#ebbcba", ["h2"] = "#0" }, - ["blue"] = "#3e8fb0", ["yellow"] = "#f6c177", + ["border"] = "#6e6a86", + ["diagnostic"] = { + ["hint"] = "#c4a7e7", + ["warn"] = "#f6c177", + ["info"] = "#9ccfd8", + ["error"] = "#ff789e", + }, ["syntax"] = { - ["type"] = "#9ccfd8", - ["todo"] = { ["fg"] = "#c4a7e7", ["bg"] = "#0" }, - ["function"] = "#ebbcba", - ["conditional"] = "#3e8fb0", - ["statement"] = "#3e8fb0", ["field"] = "#9ccfd8", - ["variable"] = "#e0def4", + ["statement"] = "#3e8fb0", + ["preproc"] = "#c4a7e7", + ["punctuation"] = "#6e6a86", ["struct"] = "#9ccfd8", + ["operator"] = "#3e8fb0", + ["conditional"] = "#3e8fb0", + ["comment"] = "#555169", + ["property"] = "#c4a7e7", + ["constructor"] = "#9ccfd8", + ["include"] = "#c4a7e7", + ["string"] = "#f6c177", + ["constant"] = "#9ccfd8", ["number"] = "#f6c177", + ["type"] = "#9ccfd8", + ["function"] = "#ebbcba", + ["variable"] = "#e0def4", + ["todo"] = { + ["fg"] = "#c4a7e7", + ["bg"] = "#e0def4", + }, ["keyword"] = "#3e8fb0", ["tag"] = "#9ccfd8", - ["include"] = "#c4a7e7", ["parameter"] = "#c4a7e7", - ["preproc"] = "#c4a7e7", - ["property"] = "#c4a7e7", - ["comment"] = "#555169", - ["string"] = "#f6c177", - ["punctuation"] = "#6e6a86", - ["constructor"] = "#9ccfd8", - ["operator"] = "#3e8fb0", - ["constant"] = "#9ccfd8", }, - ["border"] = "#6e6a86", - ["diagnostic"] = { ["hint"] = "#c4a7e7", ["warn"] = "#f6c177", ["info"] = "#9ccfd8", ["error"] = "#ff789e" }, ["built_in"] = { - ["type"] = "#9ccfd8", - ["variable"] = "#ff789e", ["function"] = "#ff789e", - ["keyword"] = "#3e8fb0", + ["variable"] = "#ff789e", ["constant"] = "#ff789e", + ["keyword"] = "#3e8fb0", + ["type"] = "#9ccfd8", + }, + ["bg"] = { + ["selected"] = "#211f2d", + ["base"] = "#12121e", + ["alt"] = "#1e1e2e", + }, + ["blue"] = "#3e8fb0", + ["green"] = "#9ccfd8", + ["cyan"] = "#ebbcba", + ["heading"] = { + ["h1"] = "#ebbcba", + ["h2"] = "#e0def4", }, - ["inc_search"] = { ["bg"] = "#ff789e", ["fg"] = "#12121e" }, + ["fg"] = "#e0def4", + ["uri"] = "#f6c177", + ["diff"] = { + ["change"] = "#e0def4", + ["remove"] = "#e0def4", + ["add"] = "#e0def4", + ["text"] = "#e0def4", + }, + ["orange"] = "#f6c177", ["pum"] = { ["sbar"] = "#26233a", ["fg"] = "#6e6a86", - ["thumb"] = "#555169", + ["sel"] = { + ["fg"] = "#e0def4", + ["bg"] = "#26233a", + }, ["bg"] = "#1e1e2e", - ["sel"] = { ["bg"] = "#26233a", ["fg"] = "#e0def4" }, + ["thumb"] = "#555169", }, - ["dimmed"] = { ["subtle"] = "#6e6a86", ["inactive"] = "#555169" }, - ["match"] = "#ebbcba", - ["bg"] = { ["base"] = "#12121e", ["alt"] = "#1e1e2e", ["selected"] = "#211f2d" }, - ["orange"] = "#f6c177", } diff --git a/lua/themer/modules/themes/scery.lua b/lua/themer/modules/themes/scery.lua index 33b2cfa..b093a29 100644 --- a/lua/themer/modules/themes/scery.lua +++ b/lua/themer/modules/themes/scery.lua @@ -1,58 +1,91 @@ return { - ["yellow"] = "#FBB829", ["accent"] = "#ff5f00", + ["search_result"] = { + ["telescope"] = "#e02c6d", + ["bg"] = "#4e4e4e", + ["fg"] = "#fce8c3", + }, + ["cursorlinenr"] = "#fbb829", + ["dimmed"] = { + ["inactive"] = "#444444", + ["subtle"] = "#918175", + }, + ["match"] = "#fce8c3", + ["inc_search"] = { + ["fg"] = "#fce8c3", + ["bg"] = "#4e4e4e", + }, + ["magenta"] = "#E02C6D", + ["yellow"] = "#FBB829", + ["border"] = "#fce8c3", + ["diagnostic"] = { + ["hint"] = "#d3d3d3", + ["warn"] = "#ffa500", + ["error"] = "#ff0000", + ["info"] = "#add8e6", + }, ["syntax"] = { - ["struct"] = "#aaeb3", - ["parameter"] = "#aaeb3", ["field"] = "#519f50", - ["property"] = "#68a8e4", + ["statement"] = "#ef2f27", + ["preproc"] = "#aaeb3", ["punctuation"] = "#918175", - ["constant"] = "#ff5c8f", + ["struct"] = "#aaeb3", ["operator"] = "#fce8c3", - ["todo"] = { ["fg"] = "#fce8c3", ["bg"] = "#1c1b19" }, - ["preproc"] = "#aaeb3", - ["statement"] = "#ef2f27", - ["tag"] = "#2c78bf", - ["string"] = "#98bc37", ["conditional"] = "#ef2f27", - ["include"] = "#aaeb3", ["comment"] = "#918175", - ["function"] = "#fbb829", - ["variable"] = "#fce8c3", + ["property"] = "#68a8e4", + ["constructor"] = "#ff5f00", + ["include"] = "#aaeb3", + ["string"] = "#98bc37", + ["constant"] = "#ff5c8f", ["number"] = "#ff5c8f", ["type"] = "#baa67f", + ["function"] = "#fbb829", + ["variable"] = "#fce8c3", + ["tag"] = "#2c78bf", ["keyword"] = "#ef2f27", - ["constructor"] = "#ff5f00", + ["todo"] = { + ["fg"] = "#fce8c3", + ["bg"] = "#1c1b19", + }, + ["parameter"] = "#aaeb3", }, - ["dimmed"] = { ["subtle"] = "#918175", ["inactive"] = "#444444" }, - ["match"] = "#0", - ["border"] = "#fce8c3", ["built_in"] = { ["function"] = "#fbb829", ["variable"] = "#aaeb3", - ["type"] = "#68a8e4", - ["keyword"] = "#ef2f27", ["constant"] = "#aaeb3", + ["keyword"] = "#ef2f27", + ["type"] = "#68a8e4", + }, + ["bg"] = { + ["selected"] = "#303030", + ["base"] = "#1c1b19", + ["alt"] = "#303030", + }, + ["blue"] = "#2C78BF", + ["green"] = "#519F50", + ["cyan"] = "#fce8c3AAEB3", + ["heading"] = { + ["h1"] = "#fce8c3", + ["h2"] = "#fce8c3", + }, + ["fg"] = "#fce8c3", + ["uri"] = "#519f50", + ["diff"] = { + ["change"] = "#1c1b19", + ["remove"] = "#1c1b19", + ["add"] = "#1c1b19", + ["text"] = "#1c1b19", }, - ["inc_search"] = { ["bg"] = "#4e4e4e", ["fg"] = "#0" }, + ["orange"] = "#FED06E", ["pum"] = { + ["sbar"] = "#1c1b19", ["fg"] = "#fce8c3", - ["sel"] = { ["bg"] = "#2c78bf", ["fg"] = "#fce8c3" }, + ["sel"] = { + ["fg"] = "#fce8c3", + ["bg"] = "#2c78bf", + }, ["bg"] = "#303030", - ["sbar"] = "#1c1b19", ["thumb"] = "#1c1b19", }, - ["bg"] = { ["base"] = "#1c1b19", ["selected"] = "#303030", ["alt"] = "#303030" }, - ["diff"] = { ["change"] = "#1c1b19", ["remove"] = "#1c1b19", ["add"] = "#1c1b19", ["text"] = "#1c1b19" }, - ["orange"] = "#FED06E", - ["cyan"] = "#0AAEB3", - ["uri"] = "#519f50", - ["heading"] = { ["h2"] = "#0", ["h1"] = "#0" }, - ["green"] = "#519F50", - ["diagnostic"] = { ["error"] = "#ff0000", ["info"] = "#add8e6", ["warn"] = "#ffa500", ["hint"] = "#d3d3d3" }, - ["magenta"] = "#E02C6D", - ["fg"] = "#fce8c3", - ["cursorlinenr"] = "#fbb829", - ["search_result"] = { ["fg"] = "#0", ["bg"] = "#4e4e4e", ["telescope"] = "#e02c6d" }, - ["blue"] = "#2C78BF", } diff --git a/lua/themer/modules/themes/shado.lua b/lua/themer/modules/themes/shado.lua index d74befa..e3e7329 100644 --- a/lua/themer/modules/themes/shado.lua +++ b/lua/themer/modules/themes/shado.lua @@ -1,59 +1,91 @@ --- Generated by Themer return { - ["orange"] = "#8897F4", - ["yellow"] = "#8897F4", - ["match"] = "#0", - ["diagnostic"] = { ["hint"] = "#d3d3d3", ["warn"] = "#ffa500", ["info"] = "#add8e6", ["error"] = "#ff0000" }, + ["accent"] = "#8d4ecc", + ["search_result"] = { + ["telescope"] = "#dfb7e8", + ["bg"] = "#dfb7e8", + ["fg"] = "#302b30", + }, ["cursorlinenr"] = "#de286e", + ["dimmed"] = { + ["subtle"] = "#1b1b29", + ["inactive"] = "#73daff", + }, + ["match"] = "#dfb7e8", + ["inc_search"] = { + ["fg"] = "#dfb7e8", + ["bg"] = "#de286e", + }, + ["magenta"] = "#ff79c6", + ["yellow"] = "#8897F4", ["border"] = "#1b1b29", - ["bg"] = { ["selected"] = "#1b1b29", ["base"] = "#0", ["alt"] = "#1b1b29" }, - ["heading"] = { ["h2"] = "#0", ["h1"] = "#0" }, - ["pum"] = { - ["fg"] = "#eed6ee", - ["sel"] = { ["fg"] = "#6876de", ["bg"] = "#2f2f4a" }, - ["sbar"] = "#2f2f4a", - ["bg"] = "#1b1b29", - ["thumb"] = "#5b5b8a", + ["diagnostic"] = { + ["hint"] = "#d3d3d3", + ["warn"] = "#ffa500", + ["info"] = "#add8e6", + ["error"] = "#ff0000", }, - ["search_result"] = { ["fg"] = "#302b30", ["bg"] = "#dfb7e8", ["telescope"] = "#0" }, - ["uri"] = "#458faa", - ["inc_search"] = { ["fg"] = "#dfb7e8", ["bg"] = "#de286e" }, - ["accent"] = "#8d4ecc", - ["dimmed"] = { ["inactive"] = "#73daff", ["subtle"] = "#1b1b29" }, - ["fg"] = "#dfb7e8", ["syntax"] = { - ["punctuation"] = "#bc6bd0", - ["preproc"] = "#849be0", - ["include"] = "#329090", - ["property"] = "#cd9ad9", - ["constant"] = "#de286e", - ["tag"] = "#c081fa", ["field"] = "#cd9ad9", + ["statement"] = "#505ede", + ["preproc"] = "#849be0", + ["punctuation"] = "#bc6bd0", + ["struct"] = "#329090", ["operator"] = "#73daff", ["conditional"] = "#6876de", + ["comment"] = "#6272a4", + ["property"] = "#cd9ad9", + ["constructor"] = "#8d4ecc", + ["include"] = "#329090", ["string"] = "#73daff", - ["variable"] = "#0", + ["constant"] = "#de286e", ["keyword"] = "#c081fa", - ["constructor"] = "#8d4ecc", - ["comment"] = "#6272a4", - ["struct"] = "#329090", - ["todo"] = { ["fg"] = "#302b30", ["bg"] = "#eba4e9" }, - ["number"] = "#de286e", ["type"] = "#8677d9", - ["statement"] = "#505ede", ["function"] = "#e086e0", + ["variable"] = "#dfb7e8", + ["todo"] = { + ["fg"] = "#302b30", + ["bg"] = "#eba4e9", + }, + ["tag"] = "#c081fa", + ["number"] = "#de286e", ["parameter"] = "#cd9ad9", }, - ["green"] = "#5ADECD", - ["cyan"] = "#8be9fd", - ["diff"] = { ["add"] = "#0", ["text"] = "#4d254d", ["remove"] = "#0", ["change"] = "#0" }, - ["blue"] = "#bd93f9", - ["magenta"] = "#ff79c6", ["built_in"] = { - ["constant"] = "#8d4ecc", - ["type"] = "#8677d9", + ["function"] = "#8d4ecc", ["variable"] = "#8d4ecc", + ["constant"] = "#8d4ecc", ["keyword"] = "#c081fa", - ["function"] = "#8d4ecc", + ["type"] = "#8677d9", + }, + ["bg"] = { + ["selected"] = "#1b1b29", + ["base"] = "#dfb7e8", + ["alt"] = "#1b1b29", + }, + ["blue"] = "#bd93f9", + ["green"] = "#5ADECD", + ["cyan"] = "#8be9fd", + ["orange"] = "#8897F4", + ["fg"] = "#dfb7e8", + ["uri"] = "#458faa", + ["diff"] = { + ["change"] = "#dfb7e8", + ["text"] = "#4d254d", + ["add"] = "#dfb7e8", + ["remove"] = "#dfb7e8", + }, + ["heading"] = { + ["h1"] = "#dfb7e8", + ["h2"] = "#dfb7e8", + }, + ["pum"] = { + ["sbar"] = "#2f2f4a", + ["fg"] = "#eed6ee", + ["sel"] = { + ["fg"] = "#6876de", + ["bg"] = "#2f2f4a", + }, + ["bg"] = "#1b1b29", + ["thumb"] = "#5b5b8a", }, } diff --git a/lua/themer/modules/themes/tokyodark.lua b/lua/themer/modules/themes/tokyodark.lua index 0a69985..3688652 100644 --- a/lua/themer/modules/themes/tokyodark.lua +++ b/lua/themer/modules/themes/tokyodark.lua @@ -1,59 +1,91 @@ --- Generated by Themer return { ["accent"] = "#a485dd", - ["diff"] = { ["remove"] = "#281b27", ["text"] = "#0", ["change"] = "#262b3d", ["add"] = "#1e2326" }, - ["uri"] = "#80a0ff", - ["bg"] = { ["base"] = "#11121d", ["selected"] = "#1a1b2a", ["alt"] = "#11121d" }, + ["search_result"] = { + ["telescope"] = "#a0a8cd", + ["bg"] = "#98c379", + ["fg"] = "#11121d", + }, + ["cursorlinenr"] = "#a0a8cd", + ["dimmed"] = { + ["subtle"] = "#4a5057", + ["inactive"] = "#4a5057", + }, ["match"] = "#7199ee", - ["built_in"] = { - ["function"] = "#a485dd", - ["keyword"] = "#ee6d85", - ["variable"] = "#a485dd", - ["type"] = "#7199ee", - ["constant"] = "#a485dd", + ["inc_search"] = { + ["fg"] = "#11121d", + ["bg"] = "#fe6d85", }, - ["fg"] = "#a0a8cd", - ["orange"] = "#d7a65f", + ["magenta"] = "#a485dd", ["yellow"] = "#d7a65f", - ["heading"] = { ["h1"] = "#0", ["h2"] = "#0" }, - ["blue"] = "#7199ee", + ["border"] = "#282c34", + ["diagnostic"] = { + ["hint"] = "#d3d3d3", + ["warn"] = "#ffa500", + ["error"] = "#ff0000", + ["info"] = "#add8e6", + }, ["pum"] = { - ["sel"] = { ["fg"] = "#11121d", ["bg"] = "#98c379" }, - ["fg"] = "#a0a8cd", - ["thumb"] = "#212234", ["sbar"] = "#11121d", + ["fg"] = "#a0a8cd", + ["sel"] = { + ["fg"] = "#11121d", + ["bg"] = "#98c379", + }, ["bg"] = "#11121d", + ["thumb"] = "#212234", }, - ["cyan"] = "#38a89d", - ["inc_search"] = { ["fg"] = "#11121d", ["bg"] = "#fe6d85" }, - ["diagnostic"] = { ["hint"] = "#d3d3d3", ["error"] = "#ff0000", ["info"] = "#add8e6", ["warn"] = "#ffa500" }, - ["search_result"] = { ["bg"] = "#98c379", ["fg"] = "#11121d", ["telescope"] = "#0" }, - ["border"] = "#282c34", - ["dimmed"] = { ["inactive"] = "#4a5057", ["subtle"] = "#4a5057" }, - ["magenta"] = "#a485dd", - ["cursorlinenr"] = "#a0a8cd", + ["built_in"] = { + ["function"] = "#a485dd", + ["variable"] = "#a485dd", + ["constant"] = "#a485dd", + ["keyword"] = "#ee6d85", + ["type"] = "#7199ee", + }, + ["bg"] = { + ["selected"] = "#1a1b2a", + ["base"] = "#11121d", + ["alt"] = "#11121d", + }, + ["blue"] = "#7199ee", ["green"] = "#95c561", + ["cyan"] = "#38a89d", + ["orange"] = "#d7a65f", + ["fg"] = "#a0a8cd", + ["uri"] = "#80a0ff", + ["diff"] = { + ["change"] = "#262b3d", + ["text"] = "#a0a8cd", + ["add"] = "#1e2326", + ["remove"] = "#281b27", + }, ["syntax"] = { - ["include"] = "#ee6d85", - ["variable"] = "#0", - ["string"] = "#d7a65f", - ["parameter"] = "#f6955b", + ["field"] = "#f6955b", + ["statement"] = "#ee6d85", + ["preproc"] = "#ee6d85", ["punctuation"] = "#a0a8cd", ["struct"] = "#7199ee", + ["operator"] = "#ee6d85", + ["conditional"] = "#ee6d85", + ["comment"] = "#4a5057", + ["property"] = "#f6955b", + ["constructor"] = "#a485dd", + ["include"] = "#ee6d85", + ["string"] = "#d7a65f", ["constant"] = "#f6955b", + ["number"] = "#a485dd", ["type"] = "#7199ee", - ["preproc"] = "#ee6d85", ["function"] = "#95c561", - ["keyword"] = "#ee6d85", - ["constructor"] = "#a485dd", - ["comment"] = "#4a5057", - ["field"] = "#f6955b", - ["todo"] = { ["fg"] = "#7199ee", ["bg"] = "#0" }, - ["number"] = "#a485dd", - ["conditional"] = "#ee6d85", + ["variable"] = "#a0a8cd", + ["todo"] = { + ["fg"] = "#7199ee", + ["bg"] = "#a0a8cd", + }, ["tag"] = "#a485dd", - ["statement"] = "#ee6d85", - ["operator"] = "#ee6d85", - ["property"] = "#f6955b", + ["keyword"] = "#ee6d85", + ["parameter"] = "#f6955b", + }, + ["heading"] = { + ["h1"] = "#a0a8cd", + ["h2"] = "#a0a8cd", }, } diff --git a/lua/themer/modules/themes/tokyonight.lua b/lua/themer/modules/themes/tokyonight.lua index f7af6cc..02cbf4b 100644 --- a/lua/themer/modules/themes/tokyonight.lua +++ b/lua/themer/modules/themes/tokyonight.lua @@ -1,147 +1,60 @@ -local colors = { - bg = "#1a1b26", - bg_dark = "#16161e", - bg_float = "#24283b", - bg_highlight = "#292e42", - bg_popup = "#1f2335", - bg_search = "#3d59a1", - bg_sidebar = "#24283b", - bg_statusline = "#1f2335", - bg_visual = "#364A82", - black = "#1D202F", - blue = "#7aa2f7", - blue0 = "#3d59a1", - blue1 = "#2ac3de", - blue2 = "#0db9d7", - blue5 = "#89ddff", - blue6 = "#B4F9F8", - blue7 = "#394b70", - border = "#1D202F", - border_highlight = "#3d59a1", - comment = "#565f89", - cyan = "#7dcfff", - dark3 = "#545c7e", - dark5 = "#737aa2", - diff = { - add = "#283B4D", - change = "#272D43", - remove = "#3F2D3D", - text = "#394b70", - }, - error = "#db4b4b", - fg = "#c0caf5", - fg_dark = "#a9b1d6", - fg_gutter = "#3b4261", - fg_sidebar = "#a9b1d6", - git = { - add = "#449dab", - change = "#6183bb", - conflict = "#bb7a61", - delete = "#914c54", - ignore = "#545c7e", - }, - gitSigns = { - add = "#266d6a", - change = "#536c9e", - delete = "#b2555b", - }, - green = "#9ece6a", - green1 = "#73daca", - green2 = "#41a6b5", - hint = "#1abc9c", - info = "#0db9d7", - magenta = "#bb9af7", - magenta2 = "#ff007c", - none = "NONE", - orange = "#ff9e64", - purple = "#9d7cd8", - red = "#f7768e", - red1 = "#db4b4b", - teal = "#1abc9c", - terminal_black = "#414868", - warning = "#e0af68", - yellow = "#e0af68", -} - -local cp = { - -- Legacy colors for compatibility - red = colors.red, - yellow = colors.yellow, - orange = colors.orange, - magenta = colors.magenta, - blue = colors.blue, - green = colors.green, - cyan = colors.cyan, - - -- The new shiny boy - fg = colors.fg, - diff = colors.diff, - accent = colors.blue1, - directory = colors.blue, - search_result = { bg = colors.bg_search, fg = colors.fg, telescope = colors.fg }, - match = colors.blue1, - dimmed = { - linenr = colors.fg_gutter, - inactive = colors.dark3, - subtle = colors.fg_dark, - }, - bg = { - base = colors.bg, - alt = colors.bg_float, - selected = colors.bg_highlight, - }, - border = colors.border, - syntax = { - statement = colors.magenta, - ["function"] = colors.blue, - variable = colors.fg, - include = colors.cyan, - keyword = colors.magenta, - struct = colors.orange, - string = colors.green, - field = colors.green1, - parameter = colors.yellow, - property = colors.green1, - punctuation = colors.fg_dark, - constructor = colors.magenta, - operator = colors.blue5, - preproc = colors.cyan, - constant = colors.orange, - todo = { fg = colors.bg, bg = colors.yellow }, - number = colors.orange, - comment = colors.comment, - type = colors.blue1, - conditional = colors.magenta, - }, - built_in = { - ["function"] = colors.blue1, - type = colors.blue1, - variable = colors.red, - keyword = colors.magenta, - constant = colors.blue1, - }, - diagnostic = { - error = colors.error, - warn = colors.warning, - info = colors.info, - hint = colors.hint, - }, - inc_search = { bg = colors.orange, fg = colors.black }, - uri = colors.fg, - pum = { - fg = colors.fg, - bg = colors.bg_popup, - sbar = "#222229", - thumb = colors.fg_gutter, - sel = { - bg = "#343A55", - fg = colors.fg, - }, - }, - heading = { - h1 = colors.magenta, - h2 = colors.blue, - }, +-- Generated by Themer +return { + ["bg"] = { ["alt"] = "#16161e", ["base"] = "#1a1b26", ["selected"] = "#292e42" }, + ["diagnostic"] = { ["error"] = "#db4b4b", ["warn"] = "#e0af68", ["hint"] = "#1abc9c", ["info"] = "#0db9d7" }, + ["orange"] = "#e0af68", + ["uri"] = "#c0caf5", + ["border"] = "#3d59a1", + ["pum"] = { + ["bg"] = "#16161e", + ["thumb"] = "#3b4261", + ["sbar"] = "#222229", + ["sel"] = { ["bg"] = "#343a55", ["fg"] = "#c0caf5" }, + ["fg"] = "#c0caf5", + }, + ["syntax"] = { + ["preproc"] = "#7dcfff", + ["field"] = "#73daca", + ["constant"] = "#ff9e64", + ["constructor"] = "#bb9af7", + ["punctuation"] = "#a9b1d6", + ["comment"] = "#565f89", + ["property"] = "#73daca", + ["parameter"] = "#e0af68", + ["operator"] = "#89ddff", + ["keyword"] = "#9d7cd8", + ["string"] = "#9ece6a", + ["variable"] = "#c0caf5", + ["conditional"] = "#bb9af7", + ["number"] = "#ff9e64", + ["type"] = "#2ac3de", + ["todo"] = { ["bg"] = "#e0af68", ["fg"] = "#1a1b26" }, + ["function"] = "#7aa2f7", + ["struct"] = "#2ac3de", + ["include"] = "#7dcfff", + ["tag"] = "#bb9af7", + ["statement"] = "#bb9af7", + }, + ["inc_search"] = { ["bg"] = "#ff9e64", ["fg"] = "#15161e" }, + ["built_in"] = { + ["keyword"] = "#bb9af7", + ["type"] = "#2ac3de", + ["variable"] = "#f7768e", + ["function"] = "#2ac3de", + ["constant"] = "#2ac3de", + }, + ["cyan"] = "#7dcfff", + ["magenta"] = "#bb9af7", + ["heading"] = { ["h2"] = "#c0caf5", ["h1"] = "#bb9af7" }, + ["blue"] = "#7aa2f7", + ["search_result"] = { ["bg"] = "#3d59a1", ["telescope"] = "#2ac3de", ["fg"] = "#c0caf5" }, + ["gitsigns"] = { ["add"] = "#266d6a", ["change"] = "#536c9e", ["remove"] = "#b2555b" }, + ["dimmed"] = { ["inactive"] = "#545c7e", ["subtle"] = "#3b4261" }, + ["green"] = "#9ece6a", + ["yellow"] = "#e0af68", + ["cursorlinenr"] = "#737aa2", + ["accent"] = "#2ac3de", + ["diff"] = { ["add"] = "#20303b", ["text"] = "#394b70", ["change"] = "#1f2231", ["remove"] = "#37222c" }, + ["fg"] = "#c0caf5", + ["match"] = "#2ac3de", } - -return cp diff --git a/lua/themer/modules/themes/untitled.lua b/lua/themer/modules/themes/untitled.lua new file mode 100644 index 0000000..e16c092 --- /dev/null +++ b/lua/themer/modules/themes/untitled.lua @@ -0,0 +1,104 @@ +local colors = { + black0 = "#161616", + black1 = "#262626", + black2 = "#393939", + black3 = "#525252", + white0 = "#FDFDFD", + white1 = "#FAFAFA", + white2 = "#FFFFFF", + grey0 = "#c1c7cd", + grey1 = "#dde1e6", + grey2 = "#f2f4f8", + green = "#42be65", + cyan = "#3ddbd9", + blue = "#33b1ff", + red = "#ff8080", + yellow = "#ffff80", + purple = "#be95ff", +} + +local cp = { + fg = colors.grey2, + bg = { + base = colors.black0, + alt = colors.black1, + selected = colors.black2, + }, + dimmed = { + inactive = colors.black3, + subtle = colors.black3, + }, + diff = { + add = colors.green, + delete = colors.red, + change = colors.yellow, + text = colors.white1, + }, + accent = colors.purple, + inc_search = { + fg = colors.white0, + bg = colors.blue, + }, + search_result = { + fg = colors.white0, + bg = colors.cyan, + telescope = colors.white0, + }, + match = colors.cyan, + border = colors.black1, + uri = colors.purple, + heading = { + h1 = colors.blue, + h2 = colors.cyan, + }, + syntax = { + statement = colors.green, + ["function"] = colors.blue, + variable = colors.grey1, + include = colors.cyan, + keyword = colors.purple, + struct = colors.cyan, + string = colors.green, + field = colors.purple, + parameter = colors.cyan, + property = colors.blue, + punctuation = colors.grey0, + constructor = colors.purple, + operator = colors.yellow, + preproc = colors.yellow, + constant = colors.blue, + todo = { + fg = colors.white0, + bg = colors.red, + }, + number = colors.cyan, + comment = colors.black3, + ["type"] = colors.green, + conditional = colors.blue, + }, + built_in = { + ["function"] = colors.blue, + ["type"] = colors.green, + variable = colors.red, + keyword = colors.blue, + constant = colors.blue, + }, + diagnostic = { + ["error"] = colors.red, + want = colors.yellow, + info = colors.green, + hint = colors.cyan, + }, + pum = { + fg = colors.grey2, + bg = colors.black2, + sbar = colors.grey1, + thumb = colors.grey2, + sel = { + bg = colors.black3, + fg = colors.grey2, + }, + }, +} + +return cp diff --git a/lua/themer/modules/themes/uwu.lua b/lua/themer/modules/themes/uwu.lua index 90c443d..e6b8ede 100644 --- a/lua/themer/modules/themes/uwu.lua +++ b/lua/themer/modules/themes/uwu.lua @@ -1,58 +1,91 @@ return { - ["magenta"] = "#c882e7", - ["fg"] = "#c5c8c9", ["accent"] = "#53a7bf", - ["search_result"] = { ["telescope"] = "#53a7bf", ["fg"] = "#53a7bf", ["bg"] = "#2f3638" }, - ["dimmed"] = { ["subtle"] = "#c5c8c9", ["inactive"] = "#b185db" }, - ["border"] = "#1b2224", + ["search_result"] = { + ["telescope"] = "#53a7bf", + ["bg"] = "#2f3638", + ["fg"] = "#53a7bf", + }, + ["cursorlinenr"] = "#c4c4c4", + ["dimmed"] = { + ["inactive"] = "#b185db", + ["subtle"] = "#c5c8c9", + }, + ["match"] = "#c5c8c9", + ["inc_search"] = { + ["fg"] = "#e59e67", + ["bg"] = "#c5c8c9", + }, + ["magenta"] = "#c882e7", ["yellow"] = "#e7c787", - ["bg"] = { ["alt"] = "#1b2224", ["selected"] = "#1b2224", ["base"] = "#131a1c" }, - ["heading"] = { ["h2"] = "#0", ["h1"] = "#0" }, + ["border"] = "#1b2224", + ["diagnostic"] = { + ["hint"] = "#d3d3d3", + ["warn"] = "#ffa500", + ["error"] = "#ff0000", + ["info"] = "#add8e6", + }, + ["pum"] = { + ["sbar"] = "#808080", + ["fg"] = "#c4c4c4", + ["sel"] = { + ["fg"] = "#2f3638", + ["bg"] = "#b185db", + }, + ["bg"] = "#1b2224", + ["thumb"] = "#ffffff", + }, ["built_in"] = { - ["type"] = "#e59e67", ["function"] = "#6db0ad", - ["constant"] = "#53a7bf", ["variable"] = "#53a7bf", + ["constant"] = "#53a7bf", ["keyword"] = "#53a7bf", + ["type"] = "#e59e67", }, - ["inc_search"] = { ["bg"] = "#0", ["fg"] = "#e59e67" }, - ["pum"] = { - ["bg"] = "#1b2224", - ["fg"] = "#c4c4c4", - ["sel"] = { ["bg"] = "#b185db", ["fg"] = "#2f3638" }, - ["sbar"] = "#808080", - ["thumb"] = "#ffffff", + ["bg"] = { + ["selected"] = "#1b2224", + ["alt"] = "#1b2224", + ["base"] = "#131a1c", }, + ["blue"] = "#61afef", + ["green"] = "#A3BE8C", + ["cyan"] = "#519ABA", ["orange"] = "#e7c787", + ["fg"] = "#c5c8c9", ["uri"] = "#e59e67", - ["cyan"] = "#519ABA", - ["diagnostic"] = { ["error"] = "#ff0000", ["warn"] = "#ffa500", ["info"] = "#add8e6", ["hint"] = "#d3d3d3" }, - ["cursorlinenr"] = "#c4c4c4", + ["diff"] = { + ["change"] = "#131a1c", + ["text"] = "#131a1c", + ["add"] = "#131a1c", + ["remove"] = "#131a1c", + }, ["syntax"] = { ["field"] = "#f65b5b", - ["constant"] = "#51a39f", - ["keyword"] = "#b185db", - ["struct"] = "#e59e67", - ["string"] = "#6bb05d", + ["statement"] = "#e59e67", ["preproc"] = "#53a7bf", ["punctuation"] = "#c4c4c4", - ["constructor"] = "#53a7bf", + ["struct"] = "#e59e67", ["operator"] = "#53a7bf", - ["todo"] = { ["fg"] = "#b185db", ["bg"] = "#ffff00" }, - ["type"] = "#e59e67", ["conditional"] = "#f65b5b", - ["tag"] = "#53a7bf", - ["variable"] = "#53a7bf", ["comment"] = "#2f3638", + ["property"] = "#f65b5b", + ["constructor"] = "#53a7bf", + ["include"] = "#f65b5b", + ["string"] = "#6bb05d", + ["constant"] = "#51a39f", ["number"] = "#51a39f", + ["type"] = "#e59e67", ["function"] = "#f65b5b", - ["property"] = "#f65b5b", + ["variable"] = "#53a7bf", + ["tag"] = "#53a7bf", + ["keyword"] = "#b185db", + ["todo"] = { + ["fg"] = "#b185db", + ["bg"] = "#ffff00", + }, ["parameter"] = "#f65b5b", - ["statement"] = "#e59e67", - ["include"] = "#f65b5b", }, - ["green"] = "#A3BE8C", - ["diff"] = { ["text"] = "#131a1c", ["change"] = "#131a1c", ["add"] = "#131a1c", ["remove"] = "#131a1c" }, - ["blue"] = "#61afef", - ["match"] = "#0", + ["heading"] = { + ["h1"] = "#c5c8c9", + ["h2"] = "#c5c8c9", + }, } diff --git a/lua/themer/modules/time/init.lua b/lua/themer/modules/time/init.lua new file mode 100644 index 0000000..48f39bf --- /dev/null +++ b/lua/themer/modules/time/init.lua @@ -0,0 +1,13 @@ +return function(colorscheme, options) + local cs = colorscheme + local _hr = tostring(os.date("*t").hour) + for cs_time, cond in pairs(options.time) do + for _, current_cond in ipairs(cond) do + local from_to = require("themer.utils.str").split(current_cond, "-") + if _hr >= from_to[1] and _hr < from_to[2] then + cs = cs_time + end + end + end + return cs or colorscheme +end diff --git a/lua/themer/utils/str.lua b/lua/themer/utils/str.lua new file mode 100644 index 0000000..8e27d80 --- /dev/null +++ b/lua/themer/utils/str.lua @@ -0,0 +1,36 @@ +local str = {} + +--- Split strings +--- @param inputstr string string to split +--- @param sep string separator +--- @return string +str.split = function(inputstr, sep) + if sep == nil then + sep = "%s" + end + local t = {} + for str in string.gmatch(inputstr, "([^" .. sep .. "]+)") do + table.insert(t, str) + end + return t +end + +--- Do deep recursion and replace given string in nested table +--- @param table table table to perform deep recursion upon +--- @param search_for string string to look for +--- @param replacement string string to replace to +str.deep_replace = function(table, search_for, replacement) + if not table then + return + end + + for key, value in pairs(table) do + if type(value) == "table" then + str.deep_replace(value, search_for, replacement) + else + table[key] = value:gsub(search_for, replacement) + end + end +end + +return str diff --git a/plugin/themer.lua b/plugin/themer.lua index 9ed01f2..752bc10 100644 --- a/plugin/themer.lua +++ b/plugin/themer.lua @@ -1 +1,2 @@ vim.cmd([[command! -nargs=0 ThemerReload :lua require("themer.modules.reload").load_au() ]]) +vim.cmd([[command! -nargs=0 ThemerImport :lua require("themer.modules.import").write_colorscheme() ]]) diff --git a/scripts/replace_0.lua b/scripts/replace_0.lua new file mode 100644 index 0000000..5371668 --- /dev/null +++ b/scripts/replace_0.lua @@ -0,0 +1,74 @@ +concat = function(t, r) + r = r or {} + for k, v in pairs(t) do + if type(v) == "table" then + r[#r + 1] = string.format('\t["%s"]={\n', k) + concat(v, r) + r[#r + 1] = "\t},\n" + else + r[#r + 1] = string.format('\t\t["%s"]=%03s,\n', k, '"' .. v .. '"') + end + end + return r +end + +--- Do deep recursion and replace given string in nested table +--- @param table table table to perform deep recursion upon +--- @param search_for string string to look for +--- @param replacement string string to replace to +deep_replace = function(table, search_for, replacement) + if not table then + return + end + + for key, value in pairs(table) do + if key == "remaps" then + goto continue + end + if type(value) == "table" then + deep_replace(value, search_for, replacement) + else + table[key] = value:gsub(search_for, replacement) + end + ::continue:: + end +end + +scandir = function(directory) + local i, t, popen = 0, {}, io.popen + local pfile = popen('ls -A "' .. directory .. '"') + for filename in pfile:lines() do + i = i + 1 + t[i] = filename + end + pfile:close() + return t +end + +for _, theme in ipairs(scandir("../lua/themer/modules/themes")) do + -- read + local handle = io.open("../lua/themer/modules/themes/" .. theme, "rb") + local data = handle:read("*a") + handle:close() + + -- Skip if #0 not found + -- usually themes maintained by contributors, like papa_dark + if not (string.find(data, '"#0"')) then + print("Skipping", theme) + goto continue + end + print("Modifying", theme) + local t = load(data)() + -- edit + deep_replace(t, "#0", t.fg) + + -- write + local r = concat(t) + local text = "return { \n " .. table.concat(r) .. "}" + -- print(text) -- just control + + local handle = io.open("../lua/themer/modules/themes/" .. theme, "wb") + local data = handle:write(text) + handle:close() + ::continue:: +end diff --git a/todo.norg b/todo.norg index f249dba..1d9dcb0 100644 --- a/todo.norg +++ b/todo.norg @@ -10,17 +10,17 @@ * v0.1 release plans - [*] Better Plugin Support - [ ] modes.nvim - - [ ] nvim tree + - [x] nvim tree - [ ] which key - [ ] startup.nvim - - [_] Telescope picker - - [_] use random.lua stuff for that + - [x] Telescope picker + - [!] use random.lua stuff for that - [-] more themes - - [ ] fix doom one + - [x] fix doom one - [x] gruvbox - [x] remastered cpt - [x] more cpt versions - [x] issues/3 - - [=] parse to a single no dep file - - [_] async loading (Pocco81) - - [-] live reload + - [x] parse to a single no dep file + - [!] async loading (Pocco81) + - [x] live reload