Messing with colors again.

This commit is contained in:
Daniel Weber 2024-12-22 18:13:24 -05:00
parent 48021b5b4e
commit f6861907e6
3 changed files with 74 additions and 13 deletions

View File

@ -1,15 +1,15 @@
-- My initial attempt to trying to use catppuccin...may revisit later so keeping it -- My initial attempt to trying to use catppuccin...may revisit later so keeping it
require("catppuccin").setup({ require("catppuccin").setup({
flavour = "mocha", -- latte, frappe, macchiato, mocha flavour = "latte", -- latte, frappe, macchiato, mocha
background = { -- :h background background = { -- :h background
light = "latte", light = "latte",
dark = "mocha", dark = "mocha",
}, },
transparent_background = false, -- disables setting the background color. transparent_background = false, -- disables setting the background color.
show_end_of_buffer = false, -- shows the '~' characters after the end of buffers show_end_of_buffer = false, -- shows the '~' characters after the end of buffers
term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`) term_colors = true, -- sets terminal colors (e.g. `g:terminal_color_0`)
dim_inactive = { dim_inactive = {
enabled = true, -- dims the background color of inactive window enabled = false, -- dims the background color of inactive window
shade = "light", shade = "light",
percentage = 0.15, -- percentage of the shade to apply to the inactive window percentage = 0.15, -- percentage of the shade to apply to the inactive window
}, },
@ -36,13 +36,48 @@ require("catppuccin").setup({
mantle = "#000000", mantle = "#000000",
crust = "#000000", crust = "#000000",
}, },
latte = {
base = "#000000",
mantle = "#111111",
crust = "#222222",
surface0 = "#111111",
surface1 = "#555555",
surface2 = "#666666",
overlay0 = "#777777",
overlay1 = "#888888",
overlay2 = "#999999",
subtext0 = "#aaaaaa",
subtext1 = "#cccccc",
text = "#F9F9F9",
-- Rosewater = "",
-- Flamingo = "",
pink = "#FF1A75",
-- Mauve = "",
-- Red = "",
-- Maroon = "",
-- Peach = "#FF7431",
yellow = "#FFFF00",
-- Green = "",
-- Teal = "",
-- Sky = "",
-- Sapphire = "",
-- Blue = "",
-- Lavender = "",
},
}, },
custom_highlights = { highlight_overrides = {
-- ["@keyword"] = {fg = '${green}'}, latte = function(latte)
-- ["@string"] = {fg = '#ff9900'}, return {
-- ["@function"] = {fg = '#00ccff', italic=true, underline=true}, -- ["@keyword"] = {fg = '${green}'},
-- ["@function.builtin"] = {fg = '#0059ff'}, ["@string"] = {fg = latte.rosewater},
-- ["@variable"] = {fg = '#00FF88'}, Include = {fg = latte.pink},
["@function"] = {fg = latte.sky, italic=true, underline=true},
["@function.builtin"] = {fg = latte.blue},
["@variable"] = {fg = latte.green},
Operator = {fg = latte.yellow},
Constant = {fg = latte.yellow},
}
end,
}, },
integrations = { integrations = {
cmp = true, cmp = true,
@ -79,5 +114,30 @@ require('onedarkpro').setup {
} }
} }
require("citruszest").setup({
option = {
transparent = false, -- Enable/Disable transparency
bold = false,
italic = true,
},
-- Override default highlight style in this table
-- E.g If you want to override `Constant` highlight style
style = {
-- This will change Constant foreground color and make it bold.
["@keyword"] = {fg = '#FF5454'},
["@variable"] = {fg = '#00FF88'},
["@string"] = {fg = '#ff9900'},
Function = {fg = '#00ccff', italic=true, underline=true},
-- ["@function.python"] = {fg = '#00ccff', italic=true, underline=true},
["@function.builtin"] = {fg = '#0059ff'},
Include = {fg = "#FF1A75"},
Comment = { fg = "#767C77"},
-- Comment = { fg = "#767C77", bold = true},
},
})
-- vim.cmd("colorscheme onedark_dark") -- vim.cmd("colorscheme onedark_dark")
vim.cmd("colorscheme wildcharm") -- vim.cmd("colorscheme citruszest")
vim.cmd("colorscheme catppuccin-latte")
-- vim.cmd("colorscheme wildcharm")

View File

@ -1,7 +1,8 @@
require('lualine').setup { require('lualine').setup {
options = { options = {
-- theme = "catppuccin" theme = "catppuccin"
theme = "onedark" -- theme = "citruszest"
-- theme = "onedark"
-- ... the rest of your lualine config -- ... the rest of your lualine config
} }
} }

View File

@ -24,9 +24,9 @@ require("lazy").setup({
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
} }
}, },
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 }, { "catppuccin/nvim", name = "catppuccin", priority = 1000 },
{ "olimorris/onedarkpro.nvim", priority = 1000}, -- Ensure it loads first { "olimorris/onedarkpro.nvim", priority = 1000}, -- Ensure it loads first
{ "zootedb0t/citruszest.nvim", lazy = false, priority = 1000, },
{'norcalli/nvim-colorizer.lua'}, {'norcalli/nvim-colorizer.lua'},
{ {
"rcarriga/nvim-dap-ui", "rcarriga/nvim-dap-ui",