From 35f5a434cd269410cf161b9ff05e1bd2b0614f9b Mon Sep 17 00:00:00 2001 From: ache Date: Mon, 21 Oct 2024 02:30:45 +0200 Subject: Update theme to add base46 version of multiple themes --- lua/ache/plugins/telescope.lua | 14 ++------ lua/ache/plugins/themes/README.md | 24 +++++++++++++ lua/ache/plugins/themes/ayu.lua | 21 ++++++++++- lua/ache/plugins/themes/base46.lua | 7 ++++ lua/ache/plugins/themes/catppuccin.lua | 9 ----- lua/ache/plugins/themes/cyberdream.lua | 64 ++++++++++++++++++++++++++++++++++ lua/ache/plugins/themes/material.lua | 15 ++++++++ lua/ache/plugins/themes/tokyonight.lua | 5 --- 8 files changed, 133 insertions(+), 26 deletions(-) create mode 100644 lua/ache/plugins/themes/README.md create mode 100644 lua/ache/plugins/themes/base46.lua delete mode 100644 lua/ache/plugins/themes/catppuccin.lua create mode 100644 lua/ache/plugins/themes/material.lua delete mode 100644 lua/ache/plugins/themes/tokyonight.lua diff --git a/lua/ache/plugins/telescope.lua b/lua/ache/plugins/telescope.lua index d424f23..7ab7736 100644 --- a/lua/ache/plugins/telescope.lua +++ b/lua/ache/plugins/telescope.lua @@ -43,6 +43,7 @@ return { color_devicons = true, }, pickers = { + -- NOTE: List of theme colorscheme = { enable_preview = true, ignore_builtins = true, @@ -54,19 +55,10 @@ return { "carbonfox", "cyberdream", "jellybeans-nvim", - "ayu-night", - "ayu-light", + "ayu", "pastelnight", "night-owl", - "catppuccin-latte", - "catppuccin-mocha", - "catppuccin-frappe", - "catppuccin-macchiato", - "tokyonight", - "tokyonight-day", - "tokyonight-night", - "tokyonight-moon", - "tokyonight-storm", + "material", "github_dark", "github_dark_colorblind", "github_light_high_contrast", diff --git a/lua/ache/plugins/themes/README.md b/lua/ache/plugins/themes/README.md new file mode 100644 index 0000000..82c234b --- /dev/null +++ b/lua/ache/plugins/themes/README.md @@ -0,0 +1,24 @@ +# Adding a theme + +2 phases, first add it to nvim, them add it to telescope. + +## nvim + +Theme are lazy loaded. +To add a theme, add it in the theme directory with this stucture: + +```lua +return { + "", + lazy = true, + config = function(opts) + require("").setup() + vim.cmd.colorscheme("material") + end, +} +``` + +## telescope.nvim + +Now, in the file telescope.lua, add the colorscheme name in the picker list. +So with cc, you can pick it. diff --git a/lua/ache/plugins/themes/ayu.lua b/lua/ache/plugins/themes/ayu.lua index 2011260..a363a99 100644 --- a/lua/ache/plugins/themes/ayu.lua +++ b/lua/ache/plugins/themes/ayu.lua @@ -2,6 +2,25 @@ return { "Shatur/neovim-ayu", lazy = true, config = function() - vim.cmd.colorscheme("ayu-mirage") + local colors = require("ayu.colors") + colors.generate(true) -- Pass `true` to enable mirage + + require("ayu").setup({ + mirage = true, -- Set to `true` to use `mirage` variant instead of `dark` for dark background. + terminal = false, -- Set to `false` to let terminal manage its own colors. + overrides = { + IncSearch = { fg = colors.fg }, + }, + }) + + -- Use lua print(vim.inspect(require('ayu.colors'))) + -- to check all available colors. + + -- Use source $VIMRUNTIME/syntax/hitest.vim + -- to check all highlight groups. + + -- overrides is a dictionary of group names, each associated with a dictionary of parameters (`bg`, `fg`, `sp` and `style`) and colors in hex. + + vim.cmd.colorscheme("ayu") end, } diff --git a/lua/ache/plugins/themes/base46.lua b/lua/ache/plugins/themes/base46.lua new file mode 100644 index 0000000..60fd022 --- /dev/null +++ b/lua/ache/plugins/themes/base46.lua @@ -0,0 +1,7 @@ +return { + "https://git.ache.one/base46", + name = "base46", + lazy = false, + enable = true, + config = function() end, +} diff --git a/lua/ache/plugins/themes/catppuccin.lua b/lua/ache/plugins/themes/catppuccin.lua deleted file mode 100644 index 502ca18..0000000 --- a/lua/ache/plugins/themes/catppuccin.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "catppuccin/nvim", - name = "catppuccin", - lazy = true, - config = function() - require("catppuccin").setup({ background = { dark = "latte" } }) - vim.cmd.colorscheme("catppuccin-latte") - end, -} diff --git a/lua/ache/plugins/themes/cyberdream.lua b/lua/ache/plugins/themes/cyberdream.lua index 55f89cc..c9ae273 100644 --- a/lua/ache/plugins/themes/cyberdream.lua +++ b/lua/ache/plugins/themes/cyberdream.lua @@ -1,4 +1,68 @@ return { "scottmckendry/cyberdream.nvim", lazy = true, + config = function() + -- This is optional + -- + require("cyberdream").setup({ + -- Enable transparent background + transparent = false, + + -- Enable italics comments + italic_comments = false, + + -- Replace all fillchars with ' ' for the ultimate clean look + hide_fillchars = false, + + -- Modern borderless telescope theme - also applies to fzf-lua + borderless_telescope = true, + + -- Set terminal colors used in `:terminal` + terminal_colors = true, + + -- WARNING: experimental feature - expect the unexpected! + -- Use caching to improve performance + -- Early testing shows a 60-70% improvement in startup time. YMMV. Disables dynamic light/dark theme switching. + cache = false, -- generate cache with :CyberdreamBuildCache and clear with :CyberdreamClearCache + + theme = { + variant = "default", -- use "light" for the light variant. Also accepts "auto" to set dark or light colors based on the current value of `vim.o.background` + highlights = { + -- Highlight groups to override, adding new groups is also possible + -- See `:h highlight-groups` for a list of highlight groups or run `:hi` to see all groups and their current values + + -- Example: + Comment = { fg = "#696969", bg = "NONE", italic = true }, + + -- Complete list can be found in `lua/cyberdream/theme.lua` + }, + + -- Override a highlight group entirely using the color palette + overrides = function(colors) -- NOTE: This function nullifies the `highlights` option + -- Example: + return { + Comment = { fg = colors.green, bg = "NONE", italic = true }, + ["@property"] = { fg = colors.magenta, bold = true }, + } + end, + + -- Override a color entirely + colors = { + -- For a list of colors see `lua/cyberdream/colours.lua` + -- Example: + bg = "#000000", + green = "#00ff00", + magenta = "#ff00ff", + }, + }, + + -- Disable or enable colorscheme extensions + extensions = { + telescope = true, + notify = true, + mini = true, + -- ..., + }, + }) + end, } diff --git a/lua/ache/plugins/themes/material.lua b/lua/ache/plugins/themes/material.lua new file mode 100644 index 0000000..98796f2 --- /dev/null +++ b/lua/ache/plugins/themes/material.lua @@ -0,0 +1,15 @@ +return { + "marko-cerovac/material.nvim", + lazy = true, + config = function() + vim.g.material_style = "palenight" + vim.cmd.colorscheme("material") + + vim.keymap.set( + { "n" }, + "cS", + "lua require('material.functions').find_style()", + { desc = "Switch material.nvim style" } + ) + end, +} diff --git a/lua/ache/plugins/themes/tokyonight.lua b/lua/ache/plugins/themes/tokyonight.lua deleted file mode 100644 index bfc0750..0000000 --- a/lua/ache/plugins/themes/tokyonight.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "folke/tokyonight.nvim", - lazy = true, - opts = {}, -} -- cgit v1.3-2-g11bf