dev: migrated everything to catppuccin

dev-remaster
Pocco81 3 years ago
parent a9a4c2b720
commit f35ae3f646

@ -1,7 +1,7 @@
local M = {}
function M.get_colors()
return require("katppuccino.core.color_palette")
return require("catppuccin.core.color_palette")
end
return M

@ -1,20 +1,20 @@
local color_palette = {
katppuccino0 = "#F2F2F7", -- Ghost White
katppuccino1 = "#181521", -- Xiketic
katppuccino2 = "#EA31B5", -- Fashion Fuchsia
katppuccino3 = "#AE9AD6", -- Blue Shell
katppuccino4 = "#F0A8E4", -- Orchid Crayola
katppuccino5 = "#E28D8D", -- New York Pink
katppuccino6 = "#E7A988", -- Tumbleweed
katppuccino7 = "#ADD692", -- Granny Smith Apple
katppuccino8 = "#E3DAA3", -- Megium Champagne
katppuccino9 = "#7EA1C8", -- Cerulean Frost
katppuccino10 = "#A7B6DC", -- Wild Blue Yonder
katppuccino11 = "#6F6A8A", -- Rhythm
katppuccino12 = "#3e4058", -- Independence
katppuccino13 = "#0E0C13", -- Xiketic
katppuccino14 = "#201C2B", -- Raisin Black
katppuccino15 = "#312C44", -- Space Cadet
catppuccin0 = "#F2F2F7", -- Ghost White
catppuccin1 = "#181521", -- Xiketic
catppuccin2 = "#EA31B5", -- Fashion Fuchsia
catppuccin3 = "#AE9AD6", -- Blue Shell
catppuccin4 = "#F0A8E4", -- Orchid Crayola
catppuccin5 = "#E28D8D", -- New York Pink
catppuccin6 = "#E7A988", -- Tumbleweed
catppuccin7 = "#ADD692", -- Granny Smith Apple
catppuccin8 = "#E3DAA3", -- Megium Champagne
catppuccin9 = "#7EA1C8", -- Cerulean Frost
catppuccin10 = "#A7B6DC", -- Wild Blue Yonder
catppuccin11 = "#6F6A8A", -- Rhythm
catppuccin12 = "#3e4058", -- Independence
catppuccin13 = "#0E0C13", -- Xiketic
catppuccin14 = "#201C2B", -- Raisin Black
catppuccin15 = "#312C44", -- Space Cadet
}
return color_palette

@ -2,23 +2,23 @@ local M = {}
function M.get(cp)
return {
BufferCurrent = { bg = cp.katppuccino12, fg = cp.katppuccino10 },
BufferCurrentIndex = { bg = cp.katppuccino12, fg = cp.katppuccino9 },
BufferCurrentMod = { bg = cp.katppuccino12, fg = cp.katppuccino8 },
BufferCurrentSign = { bg = cp.katppuccino12, fg = cp.katppuccino9 },
BufferCurrentTarget = { bg = cp.katppuccino12, fg = cp.katppuccino5 },
BufferVisible = { bg = cp.katppuccino14, fg = cp.katppuccino10 },
BufferVisibleIndex = { bg = cp.katppuccino14, fg = cp.katppuccino9 },
BufferVisibleMod = { bg = cp.katppuccino14, fg = cp.katppuccino8 },
BufferVisibleSign = { bg = cp.katppuccino14, fg = cp.katppuccino9 },
BufferVisibleTarget = { bg = cp.katppuccino14, fg = cp.katppuccino5 },
BufferInactive = { bg = cp.katppuccino14, fg = cp.katppuccino11 },
BufferInactiveIndex = { bg = cp.katppuccino14, fg = cp.katppuccino11 },
BufferInactiveMod = { bg = cp.katppuccino14, fg = cp.katppuccino8 },
BufferInactiveSign = { bg = cp.katppuccino14, fg = cp.katppuccino9 },
BufferInactiveTarget = { bg = cp.katppuccino14, fg = cp.katppuccino5 },
BufferTabpages = { bg = cp.katppuccino14, fg = cp.none },
BufferTabpage = { bg = cp.katppuccino14, fg = cp.katppuccino9 },
BufferCurrent = { bg = cp.catppuccin12, fg = cp.catppuccin10 },
BufferCurrentIndex = { bg = cp.catppuccin12, fg = cp.catppuccin9 },
BufferCurrentMod = { bg = cp.catppuccin12, fg = cp.catppuccin8 },
BufferCurrentSign = { bg = cp.catppuccin12, fg = cp.catppuccin9 },
BufferCurrentTarget = { bg = cp.catppuccin12, fg = cp.catppuccin5 },
BufferVisible = { bg = cp.catppuccin14, fg = cp.catppuccin10 },
BufferVisibleIndex = { bg = cp.catppuccin14, fg = cp.catppuccin9 },
BufferVisibleMod = { bg = cp.catppuccin14, fg = cp.catppuccin8 },
BufferVisibleSign = { bg = cp.catppuccin14, fg = cp.catppuccin9 },
BufferVisibleTarget = { bg = cp.catppuccin14, fg = cp.catppuccin5 },
BufferInactive = { bg = cp.catppuccin14, fg = cp.catppuccin11 },
BufferInactiveIndex = { bg = cp.catppuccin14, fg = cp.catppuccin11 },
BufferInactiveMod = { bg = cp.catppuccin14, fg = cp.catppuccin8 },
BufferInactiveSign = { bg = cp.catppuccin14, fg = cp.catppuccin9 },
BufferInactiveTarget = { bg = cp.catppuccin14, fg = cp.catppuccin5 },
BufferTabpages = { bg = cp.catppuccin14, fg = cp.none },
BufferTabpage = { bg = cp.catppuccin14, fg = cp.catppuccin9 },
}
end

@ -2,10 +2,10 @@ local M = {}
function M.get(cp)
return {
HopNextKey = { bg = cp.katppuccino1, fg = cp.katppuccino6, style = "bold,underline" },
HopNextKey1 = { bg = cp.katppuccino1, fg = cp.katppuccino9, style = "bold" },
HopNextKey2 = { bg = cp.katppuccino1, fg = cp.katppuccino7, style = "bold,italic" },
HopUnmatched = { bg = cp.katppuccino1, fg = cp.katppuccino11 },
HopNextKey = { bg = cp.catppuccin1, fg = cp.catppuccin6, style = "bold,underline" },
HopNextKey1 = { bg = cp.catppuccin1, fg = cp.catppuccin9, style = "bold" },
HopNextKey2 = { bg = cp.catppuccin1, fg = cp.catppuccin7, style = "bold,italic" },
HopUnmatched = { bg = cp.catppuccin1, fg = cp.catppuccin11 },
}
end

@ -2,26 +2,26 @@ local M = {}
function M.get(cp)
return {
DiagnosticError = { fg = cp.katppuccino5 },
DiagnosticWarning = { fg = cp.katppuccino8 },
DiagnosticInformation = { fg = cp.katppuccino9 },
DiagnosticError = { fg = cp.catppuccin5 },
DiagnosticWarning = { fg = cp.catppuccin8 },
DiagnosticInformation = { fg = cp.catppuccin9 },
DiagnosticHint = { fg = cp.hint },
LspFloatWinNormal = { bg = cp.katppuccino13 },
LspFloatWinBorder = { fg = cp.katppuccino9 },
LspSagaBorderTitle = { fg = cp.katppuccino2 },
LspSagaHoverBorder = { fg = cp.katppuccino9 },
LspSagaRenameBorder = { fg = cp.katppuccino7 },
LspSagaDefPreviewBorder = { fg = cp.katppuccino7 },
LspSagaCodeActionBorder = { fg = cp.katppuccino9 },
LspSagaFinderSelection = { fg = cp.katppuccino12 },
LspSagaCodeActionTitle = { fg = cp.katppuccino91 },
LspFloatWinNormal = { bg = cp.catppuccin13 },
LspFloatWinBorder = { fg = cp.catppuccin9 },
LspSagaBorderTitle = { fg = cp.catppuccin2 },
LspSagaHoverBorder = { fg = cp.catppuccin9 },
LspSagaRenameBorder = { fg = cp.catppuccin7 },
LspSagaDefPreviewBorder = { fg = cp.catppuccin7 },
LspSagaCodeActionBorder = { fg = cp.catppuccin9 },
LspSagaFinderSelection = { fg = cp.catppuccin12 },
LspSagaCodeActionTitle = { fg = cp.catppuccin91 },
LspSagaCodeActionContent = { fg = cp.purple },
LspSagaSignatureHelpBorder = { fg = cp.katppuccino5 },
LspSagaSignatureHelpBorder = { fg = cp.catppuccin5 },
ReferencesCount = { fg = cp.purple },
DefinitionCount = { fg = cp.purple },
DefinitionIcon = { fg = cp.katppuccino9 },
ReferencesIcon = { fg = cp.katppuccino9 },
TargetWord = { fg = cp.katppuccino2 },
DefinitionIcon = { fg = cp.catppuccin9 },
ReferencesIcon = { fg = cp.catppuccin9 },
TargetWord = { fg = cp.catppuccin2 },
}
end
return M

@ -2,9 +2,9 @@ local M = {}
function M.get(cp)
return {
LspTroubleText = { fg = cp.katppuccino0 },
LspTroubleCount = { fg = cp.katppuccino4, bg = cp.katppuccino12 },
LspTroubleNormal = { fg = cp.katppuccino10, bg = cp.katppuccino13 },
LspTroubleText = { fg = cp.catppuccin0 },
LspTroubleCount = { fg = cp.catppuccin4, bg = cp.catppuccin12 },
LspTroubleNormal = { fg = cp.catppuccin10, bg = cp.catppuccin13 },
}
end

@ -9,38 +9,38 @@ function M.get(cp)
-- These groups are for the native LSP cliencp. Some other LSP clients may
-- use these groups, or use their own. Consult your LSP client's
-- documentation.
LspReferenceText = { bg = cp.katppuccino12 }, -- used for highlighting "text" references
LspReferenceRead = { bg = cp.katppuccino12 }, -- used for highlighting "read" references
LspReferenceWrite = { bg = cp.katppuccino12 }, -- used for highlighting "write" references
LspReferenceText = { bg = cp.catppuccin12 }, -- used for highlighting "text" references
LspReferenceRead = { bg = cp.catppuccin12 }, -- used for highlighting "read" references
LspReferenceWrite = { bg = cp.catppuccin12 }, -- used for highlighting "write" references
-- hightlight diagnostics in numberline
DiagnosticError = { fg = cp.katppuccino5 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
DiagnosticWarn = { fg = cp.katppuccino8 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
DiagnosticInfo = { fg = cp.katppuccino9 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
DiagnosticError = { fg = cp.catppuccin5 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
DiagnosticWarn = { fg = cp.catppuccin8 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
DiagnosticInfo = { fg = cp.catppuccin9 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
DiagnosticHint = { fg = cp.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
LspDiagnosticsDefaultError = { fg = cp.katppuccino5 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspDiagnosticsDefaultWarning = { fg = cp.katppuccino8 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspDiagnosticsDefaultInformation = { fg = cp.katppuccino9 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspDiagnosticsDefaultError = { fg = cp.catppuccin5 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspDiagnosticsDefaultWarning = { fg = cp.catppuccin8 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspDiagnosticsDefaultInformation = { fg = cp.catppuccin9 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspDiagnosticsDefaultHint = { fg = cp.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
LspSignatureActiveParameter = { fg = cp.katppuccino6 },
LspSignatureActiveParameter = { fg = cp.catppuccin6 },
-- LspDiagnosticsFloatingError = { }, -- Used to color "Error" diagnostic messages in diagnostics float
-- LspDiagnosticsFloatingWarning = { }, -- Used to color "Warning" diagnostic messages in diagnostics float
-- LspDiagnosticsFloatingInformation = { }, -- Used to color "Information" diagnostic messages in diagnostics float
-- LspDiagnosticsFloatingHint = { }, -- Used to color "Hint" diagnostic messages in diagnostics float
LspDiagnosticsError = { fg = cp.katppuccino5 },
LspDiagnosticsWarning = { fg = cp.katppuccino8 },
LspDiagnosticsInformation = { fg = cp.katppuccino9 },
LspDiagnosticsError = { fg = cp.catppuccin5 },
LspDiagnosticsWarning = { fg = cp.catppuccin8 },
LspDiagnosticsInformation = { fg = cp.catppuccin9 },
LspDiagnosticsHint = { fg = cp.hint },
LspDiagnosticsVirtualTextError = { fg = cp.katppuccino5, style = virtual_text.errors }, -- Used for "Error" diagnostic virtual text
LspDiagnosticsVirtualTextWarning = { fg = cp.katppuccino8, style = virtual_text.warnings }, -- Used for "Warning" diagnostic virtual text
LspDiagnosticsVirtualTextInformation = { fg = cp.katppuccino9, style = virtual_text.warnings }, -- Used for "Information" diagnostic virtual text
LspDiagnosticsVirtualTextError = { fg = cp.catppuccin5, style = virtual_text.errors }, -- Used for "Error" diagnostic virtual text
LspDiagnosticsVirtualTextWarning = { fg = cp.catppuccin8, style = virtual_text.warnings }, -- Used for "Warning" diagnostic virtual text
LspDiagnosticsVirtualTextInformation = { fg = cp.catppuccin9, style = virtual_text.warnings }, -- Used for "Information" diagnostic virtual text
LspDiagnosticsVirtualTextHint = { fg = cp.hint, style = virtual_text.hints }, -- Used for "Hint" diagnostic virtual text
LspDiagnosticsUnderlineError = { style = underlines.errors, sp = cp.katppuccino5 }, -- Used to underline "Error" diagnostics
LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cp.katppuccino8 }, -- Used to underline "Warning" diagnostics
LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = cp.katppuccino9 }, -- Used to underline "Information" diagnostics
LspDiagnosticsUnderlineError = { style = underlines.errors, sp = cp.catppuccin5 }, -- Used to underline "Error" diagnostics
LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cp.catppuccin8 }, -- Used to underline "Warning" diagnostics
LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = cp.catppuccin9 }, -- Used to underline "Information" diagnostics
LspDiagnosticsUnderlineHint = { style = underlines.hints, sp = cp.hint }, -- Used to underline "Hint" diagnostics
LspCodeLens = { fg = cp.katppuccino11 }, -- virtual text of the codelens
LspCodeLens = { fg = cp.catppuccin11 }, -- virtual text of the codelens
}
end

@ -2,8 +2,8 @@ local M = {}
function M.get(cp)
return {
Sneak = { fg = cp.katppuccino15, bg = cp.katppuccino4 },
SneakScope = { bg = cp.katppuccino10 },
Sneak = { fg = cp.catppuccin15, bg = cp.catppuccin4 },
SneakScope = { bg = cp.catppuccin10 },
}
end

@ -2,13 +2,13 @@ local M = {}
function M.get(cp)
return {
WhichKey = { fg = cp.katppuccino2 },
WhichKeyGroup = { fg = cp.katppuccino9 },
WhichKeyDesc = { fg = cp.katppuccino4 },
WhichKeySeperator = { fg = cp.katppuccino11 },
WhichKeySeparator = { fg = cp.katppuccino11 },
WhichKeyFloat = { bg = cp.katppuccino13 },
WhichKeyValue = { fg = cp.katppuccino11 },
WhichKey = { fg = cp.catppuccin2 },
WhichKeyGroup = { fg = cp.catppuccin9 },
WhichKeyDesc = { fg = cp.catppuccin4 },
WhichKeySeperator = { fg = cp.catppuccin11 },
WhichKeySeparator = { fg = cp.catppuccin11 },
WhichKeyFloat = { bg = cp.catppuccin13 },
WhichKeyValue = { fg = cp.catppuccin11 },
}
end

@ -1,16 +1,16 @@
local M = {}
function M.load()
require("catppucin.main").main("load")
require("catppuccin.main").main("load")
end
function M.remap(hi_groups)
hi_groups = hi_groups or {}
require("catppucin.core.remaps").set_hig_remaps(hi_groups)
require("catppuccin.core.remaps").set_hig_remaps(hi_groups)
end
function M.setup(custom_opts)
require("catppucin.config").set_options(custom_opts)
require("catppuccin.config").set_options(custom_opts)
end
return M

@ -1,20 +1,20 @@
local M = {}
local utils = require("catppucin.utils.util")
local utils = require("catppuccin.utils.util")
local function load()
local catppucin = require("catppucin")
local catppuccin = require("catppuccin")
if catppucin.before_loading ~= nil then
catppucin.before_loading()
if catppuccin.before_loading ~= nil then
catppuccin.before_loading()
end
-- colorscheme gets evaluated from mapper.lua
local theme = require("catppucin.core.mapper").apply()
local theme = require("catppuccin.core.mapper").apply()
utils.load(theme)
if catppucin.after_loading ~= nil then
catppucin.after_loading()
if catppuccin.after_loading ~= nil then
catppuccin.after_loading()
end
end
@ -30,7 +30,7 @@ function M.main(option)
elseif option == "clear" then
clear()
else
print("catppucin: option was not recognized")
print("catppuccin: option was not recognized")
end
end

@ -1,4 +1,4 @@
local hsluv = require("katppuccino.utils.hsluv")
local hsluv = require("catppuccin.utils.hsluv")
local g = vim.g
local o = vim.o
@ -142,13 +142,13 @@ function util.load(theme)
vim.cmd("syntax reset")
end
g.colors_name = "katppuccino"
g.colors_name = "catppuccin"
util.properties(theme.properties)
util.syntax(theme.base)
util.syntax(theme.integrations)
if require("katppuccino.config").options["term_colors"] then
if require("catppuccin.config").options["term_colors"] then
util.terminal(theme.terminal)
end
end

Loading…
Cancel
Save