From 9df4a024367184a18ea2819257019a7fff520547 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Sat, 21 Aug 2021 22:21:02 -0500 Subject: [PATCH] fix: all of the integrations were adapted --- lua/catppuccino/core/integrations/barbar.lua | 44 ++++++++++------- .../core/integrations/dashboard.lua | 18 ++++--- lua/catppuccino/core/integrations/fern.lua | 12 +++-- .../core/integrations/gitgutter.lua | 15 ++++-- .../core/integrations/gitsigns.lua | 16 ++++-- .../core/integrations/lsp_saga.lua | 49 ++++++++++--------- .../core/integrations/lsp_trouble.lua | 16 ++++-- .../core/integrations/markdown.lua | 22 ++++++--- lua/catppuccino/core/integrations/neogit.lua | 23 +++++---- .../core/integrations/telescope.lua | 18 ++++--- .../core/integrations/vim_sneak.lua | 14 ++++-- .../core/integrations/which_key.lua | 24 +++++---- 12 files changed, 170 insertions(+), 101 deletions(-) diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/catppuccino/core/integrations/barbar.lua index 7c4e349..8ead618 100644 --- a/lua/catppuccino/core/integrations/barbar.lua +++ b/lua/catppuccino/core/integrations/barbar.lua @@ -1,21 +1,27 @@ local util = require("catppuccino.utils.util") -return { - BufferCurrent = {bg = cpt.fg_gutter, fg = cpt.fg}, - BufferCurrentIndex = {bg = cpt.fg_gutter, fg = cpt.info}, - BufferCurrentMod = {bg = cpt.fg_gutter, fg = cpt.warning}, - BufferCurrentSign = {bg = cpt.fg_gutter, fg = cpt.info}, - BufferCurrentTarget = {bg = cpt.fg_gutter, fg = cpt.red}, - BufferVisible = {bg = cpt.bg_statusline, fg = cpt.fg}, - BufferVisibleIndex = {bg = cpt.bg_statusline, fg = cpt.info}, - BufferVisibleMod = {bg = cpt.bg_statusline, fg = cpt.warning}, - BufferVisibleSign = {bg = cpt.bg_statusline, fg = cpt.info}, - BufferVisibleTarget = {bg = cpt.bg_statusline, fg = cpt.red}, - BufferInactive = {bg = cpt.bg_statusline, fg = cpt.comment}, - BufferInactiveIndex = {bg = cpt.bg_statusline, fg = cpt.comment}, - BufferInactiveMod = {bg = cpt.bg_statusline, fg = util.darken(cpt.warning, 0.7)}, - BufferInactiveSign = {bg = cpt.bg_statusline, fg = cpt.border_highlight}, - BufferInactiveTarget = {bg = cpt.bg_statusline, fg = cpt.red}, - BufferTabpages = {bg = cpt.bg_statusline, fg = cpt.none}, - BufferTabpage = {bg = cpt.bg_statusline, fg = cpt.border_highlight} -} +local M = {} + +function M.get(cpt) + return { + BufferCurrent = {bg = cpt.fg_gutter, fg = cpt.fg}, + BufferCurrentIndex = {bg = cpt.fg_gutter, fg = cpt.info}, + BufferCurrentMod = {bg = cpt.fg_gutter, fg = cpt.warning}, + BufferCurrentSign = {bg = cpt.fg_gutter, fg = cpt.info}, + BufferCurrentTarget = {bg = cpt.fg_gutter, fg = cpt.red}, + BufferVisible = {bg = cpt.bg_statusline, fg = cpt.fg}, + BufferVisibleIndex = {bg = cpt.bg_statusline, fg = cpt.info}, + BufferVisibleMod = {bg = cpt.bg_statusline, fg = cpt.warning}, + BufferVisibleSign = {bg = cpt.bg_statusline, fg = cpt.info}, + BufferVisibleTarget = {bg = cpt.bg_statusline, fg = cpt.red}, + BufferInactive = {bg = cpt.bg_statusline, fg = cpt.comment}, + BufferInactiveIndex = {bg = cpt.bg_statusline, fg = cpt.comment}, + BufferInactiveMod = {bg = cpt.bg_statusline, fg = util.darken(cpt.warning, 0.7)}, + BufferInactiveSign = {bg = cpt.bg_statusline, fg = cpt.border_highlight}, + BufferInactiveTarget = {bg = cpt.bg_statusline, fg = cpt.red}, + BufferTabpages = {bg = cpt.bg_statusline, fg = cpt.none}, + BufferTabpage = {bg = cpt.bg_statusline, fg = cpt.border_highlight} + } +end + +return M diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/catppuccino/core/integrations/dashboard.lua index 5501432..f108d1a 100644 --- a/lua/catppuccino/core/integrations/dashboard.lua +++ b/lua/catppuccino/core/integrations/dashboard.lua @@ -1,6 +1,12 @@ -return { - DashboardShortCut = {fg = cpt.cyan}, - DashboardHeader = {fg = cpt.yellow}, - DashboardCenter = {fg = cpt.green}, - DashboardFooter = {fg = cpt.orange, style = "italic"} -} +local M = {} + +function M.get(cpt) + return { + DashboardShortCut = {fg = cpt.cyan}, + DashboardHeader = {fg = cpt.yellow}, + DashboardCenter = {fg = cpt.green}, + DashboardFooter = {fg = cpt.orange, style = "italic"} + } +end + +return M diff --git a/lua/catppuccino/core/integrations/fern.lua b/lua/catppuccino/core/integrations/fern.lua index 9088592..d68ad05 100644 --- a/lua/catppuccino/core/integrations/fern.lua +++ b/lua/catppuccino/core/integrations/fern.lua @@ -1,3 +1,9 @@ -return { - FernBranchText = {fg = cpt.blue} -} +local M = {} + +function M.get(cpt) + return { + FernBranchText = {fg = cpt.blue} + } +end + +return M diff --git a/lua/catppuccino/core/integrations/gitgutter.lua b/lua/catppuccino/core/integrations/gitgutter.lua index 86e6d4d..be39b86 100644 --- a/lua/catppuccino/core/integrations/gitgutter.lua +++ b/lua/catppuccino/core/integrations/gitgutter.lua @@ -1,5 +1,10 @@ -return { - GitGutterAdd = {fg = cpt.gitSigns.add}, -- diff mode: Added line |diff.txt| - GitGutterChange = {fg = cpt.gitSigns.change}, -- diff mode: Changed line |diff.txt| - GitGutterDelete = {fg = cpt.gitSigns.delete} -- diff mode: Deleted line |diff.txt| -} +local M = {} + +function M.get(cpt) + return { + GitGutterAdd = {fg = cpt.gitSigns.add}, -- diff mode: Added line |diff.txt| + GitGutterChange = {fg = cpt.gitSigns.change}, -- diff mode: Changed line |diff.txt| + GitGutterDelete = {fg = cpt.gitSigns.delete} -- diff mode: Deleted line |diff.txt| + } +end +return M diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua index 5af8496..2d7bd11 100644 --- a/lua/catppuccino/core/integrations/gitsigns.lua +++ b/lua/catppuccino/core/integrations/gitsigns.lua @@ -1,5 +1,11 @@ -return { - GitSignsAdd = {fg = cpt.diff.add, bg = cpt.bg}, -- diff mode: Added line |diff.txt| - GitSignsChange = {fg = cpt.diff.change, bg = cpt.bg}, -- diff mode: Changed line |diff.txt| - GitSignsDelete = {fg = cpt.diff.delete, bg = cpt.bg} -- diff mode: Deleted line |diff.txt| -} +local M = {} + +function M.get(cpt) + return { + GitSignsAdd = {fg = cpt.diff.add, bg = cpt.bg}, -- diff mode: Added line |diff.txt| + GitSignsChange = {fg = cpt.diff.change, bg = cpt.bg}, -- diff mode: Changed line |diff.txt| + GitSignsDelete = {fg = cpt.diff.delete, bg = cpt.bg} -- diff mode: Deleted line |diff.txt| + } +end + +return M diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua index e2dbc05..6c17953 100644 --- a/lua/catppuccino/core/integrations/lsp_saga.lua +++ b/lua/catppuccino/core/integrations/lsp_saga.lua @@ -1,22 +1,27 @@ -return { - DiagnosticError = {fg = cpt.error}, - DiagnosticWarning = {fg = cpt.warning}, - DiagnosticInformation = {fg = cpt.info}, - DiagnosticHint = {fg = cpt.hint}, - LspFloatWinNormal = {bg = cpt.bg_float}, - LspFloatWinBorder = {fg = cpt.border_highlight}, - LspSagaBorderTitle = {fg = cpt.cyan}, - LspSagaHoverBorder = {fg = cpt.blue}, - LspSagaRenameBorder = {fg = cpt.green}, - LspSagaDefPreviewBorder = {fg = cpt.green}, - LspSagaCodeActionBorder = {fg = cpt.blue}, - LspSagaFinderSelection = {fg = cpt.bg_visual}, - LspSagaCodeActionTitle = {fg = cpt.blue1}, - LspSagaCodeActionContent = {fg = cpt.purple}, - LspSagaSignatureHelpBorder = {fg = cpt.red}, - ReferencesCount = {fg = cpt.purple}, - DefinitionCount = {fg = cpt.purple}, - DefinitionIcon = {fg = cpt.blue}, - ReferencesIcon = {fg = cpt.blue}, - TargetWord = {fg = cpt.cyan} -} +local M = {} + +function M.get(cpt) + return { + DiagnosticError = {fg = cpt.error}, + DiagnosticWarning = {fg = cpt.warning}, + DiagnosticInformation = {fg = cpt.info}, + DiagnosticHint = {fg = cpt.hint}, + LspFloatWinNormal = {bg = cpt.bg_float}, + LspFloatWinBorder = {fg = cpt.border_highlight}, + LspSagaBorderTitle = {fg = cpt.cyan}, + LspSagaHoverBorder = {fg = cpt.blue}, + LspSagaRenameBorder = {fg = cpt.green}, + LspSagaDefPreviewBorder = {fg = cpt.green}, + LspSagaCodeActionBorder = {fg = cpt.blue}, + LspSagaFinderSelection = {fg = cpt.bg_visual}, + LspSagaCodeActionTitle = {fg = cpt.blue1}, + LspSagaCodeActionContent = {fg = cpt.purple}, + LspSagaSignatureHelpBorder = {fg = cpt.red}, + ReferencesCount = {fg = cpt.purple}, + DefinitionCount = {fg = cpt.purple}, + DefinitionIcon = {fg = cpt.blue}, + ReferencesIcon = {fg = cpt.blue}, + TargetWord = {fg = cpt.cyan} + } +end +return M diff --git a/lua/catppuccino/core/integrations/lsp_trouble.lua b/lua/catppuccino/core/integrations/lsp_trouble.lua index 477b15f..8713d23 100644 --- a/lua/catppuccino/core/integrations/lsp_trouble.lua +++ b/lua/catppuccino/core/integrations/lsp_trouble.lua @@ -1,5 +1,11 @@ -return { - LspTroubleText = {fg = cpt.fg_alt}, - LspTroubleCount = {fg = cpt.magenta, bg = cpt.fg_gutter}, - LspTroubleNormal = {fg = cpt.fg_sidebar, bg = cpt.bg_sidebar} -} +local M = {} + +function M.get(cpt) + return { + LspTroubleText = {fg = cpt.fg_alt}, + LspTroubleCount = {fg = cpt.magenta, bg = cpt.fg_gutter}, + LspTroubleNormal = {fg = cpt.fg_sidebar, bg = cpt.bg_sidebar} + } +end + +return M diff --git a/lua/catppuccino/core/integrations/markdown.lua b/lua/catppuccino/core/integrations/markdown.lua index df23f3e..e4dcf75 100644 --- a/lua/catppuccino/core/integrations/markdown.lua +++ b/lua/catppuccino/core/integrations/markdown.lua @@ -1,8 +1,14 @@ -return { - markdownHeadingDelimiter = {fg = cpt.orange, style = "bold"}, - markdownCode = {fg = cpt.cyan}, - markdownCodeBlock = {fg = cpt.cyan}, - markdownH1 = {fg = cpt.magenta, style = "bold"}, - markdownH2 = {fg = cpt.blue, style = "bold"}, - markdownLinkText = {fg = cpt.blue, style = "underline"} -} +local M = {} + +function M.get(cpt) + return { + markdownHeadingDelimiter = {fg = cpt.orange, style = "bold"}, + markdownCode = {fg = cpt.cyan}, + markdownCodeBlock = {fg = cpt.cyan}, + markdownH1 = {fg = cpt.magenta, style = "bold"}, + markdownH2 = {fg = cpt.blue, style = "bold"}, + markdownLinkText = {fg = cpt.blue, style = "underline"} + } +end + +return M diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua index ea83c43..5aff07e 100644 --- a/lua/catppuccino/core/integrations/neogit.lua +++ b/lua/catppuccino/core/integrations/neogit.lua @@ -1,11 +1,16 @@ local util = require("catppuccino.utils.util") +local M = {} -return { - NeogitBranch = {fg = cpt.magenta}, - NeogitRemote = {fg = cpt.pink}, - NeogitHunkHeader = {bg = cpt.bg_highlight, fg = cpt.fg}, - NeogitHunkHeaderHighlight = {bg = cpt.fg_gutter, fg = cpt.blue}, - NeogitDiffContextHighlight = {bg = util.darken(cpt.fg_gutter, 0.5), fg = cpt.fg_alt}, - NeogitDiffDeleteHighlight = {fg = cpt.git.delete, bg = cpt.diff.delete}, - NeogitDiffAddHighlight = {fg = cpt.git.add, bg = cpt.diff.add} -} +function M.get(cpt) + return { + NeogitBranch = {fg = cpt.magenta}, + NeogitRemote = {fg = cpt.pink}, + NeogitHunkHeader = {bg = cpt.bg_highlight, fg = cpt.fg}, + NeogitHunkHeaderHighlight = {bg = cpt.fg_gutter, fg = cpt.blue}, + NeogitDiffContextHighlight = {bg = util.darken(cpt.fg_gutter, 0.5), fg = cpt.fg_alt}, + NeogitDiffDeleteHighlight = {fg = cpt.git.delete, bg = cpt.diff.delete}, + NeogitDiffAddHighlight = {fg = cpt.git.add, bg = cpt.diff.add} + } +end + +return M diff --git a/lua/catppuccino/core/integrations/telescope.lua b/lua/catppuccino/core/integrations/telescope.lua index 4b4c634..18dad73 100644 --- a/lua/catppuccino/core/integrations/telescope.lua +++ b/lua/catppuccino/core/integrations/telescope.lua @@ -1,6 +1,12 @@ -return { - TelescopeBorder = {fg = cpt.border_highlight}, - TelescopeSelectionCaret = {fg = cpt.cyan}, - TelescopeSelection = {fg = cpt.cyan, bg = cpt.bg_highlight}, - TelescopeMatching = {fg = cpt.blue} -} +local M = {} + +function M.get(cpt) + return { + TelescopeBorder = {fg = cpt.border_highlight}, + TelescopeSelectionCaret = {fg = cpt.cyan}, + TelescopeSelection = {fg = cpt.cyan, bg = cpt.bg_highlight}, + TelescopeMatching = {fg = cpt.blue} + } +end + +return M diff --git a/lua/catppuccino/core/integrations/vim_sneak.lua b/lua/catppuccino/core/integrations/vim_sneak.lua index c15c573..4763955 100644 --- a/lua/catppuccino/core/integrations/vim_sneak.lua +++ b/lua/catppuccino/core/integrations/vim_sneak.lua @@ -1,4 +1,10 @@ -return { - Sneak = {fg = cpt.bg_highlight, bg = cpt.magenta}, - SneakScope = {bg = cpt.bg_visual} -} +local M = {} + +function M.get(cpt) + return { + Sneak = {fg = cpt.bg_highlight, bg = cpt.magenta}, + SneakScope = {bg = cpt.bg_visual} + } +end + +return M diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua index 301f271..36f8484 100644 --- a/lua/catppuccino/core/integrations/which_key.lua +++ b/lua/catppuccino/core/integrations/which_key.lua @@ -1,9 +1,15 @@ -return { - WhichKey = {fg = cpt.cyan}, - WhichKeyGroup = {fg = cpt.blue}, - WhichKeyDesc = {fg = cpt.magenta}, - WhichKeySeperator = {fg = cpt.comment}, - WhichKeySeparator = {fg = cpt.comment}, - WhichKeyFloat = {bg = cpt.bg_sidebar}, - WhichKeyValue = {fg = cpt.comment} -} +local M = {} + +function M.get(cpt) + return { + WhichKey = {fg = cpt.cyan}, + WhichKeyGroup = {fg = cpt.blue}, + WhichKeyDesc = {fg = cpt.magenta}, + WhichKeySeperator = {fg = cpt.comment}, + WhichKeySeparator = {fg = cpt.comment}, + WhichKeyFloat = {bg = cpt.bg_sidebar}, + WhichKeyValue = {fg = cpt.comment} + } +end + +return M