From 1e9f2af3fb0f8c11007153b766dc096a68a006f0 Mon Sep 17 00:00:00 2001 From: dodofarm <120017300+dodofarm@users.noreply.github.com> Date: Sun, 20 Jul 2025 17:22:32 +0100 Subject: [PATCH 1/3] Add mini-icons integration and modify bufferline integration to support mini-icons (#411) --- lua/base46/integrations/bufferline.lua | 106 ++++++++++++++++++++++++- lua/base46/integrations/mini-icons.lua | 36 +++++++++ 2 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 lua/base46/integrations/mini-icons.lua diff --git a/lua/base46/integrations/bufferline.lua b/lua/base46/integrations/bufferline.lua index 885047f6..3d86a8b1 100644 --- a/lua/base46/integrations/bufferline.lua +++ b/lua/base46/integrations/bufferline.lua @@ -7,7 +7,7 @@ return { bg = colors.black2, }, - BufferlineIndicatorVisible = { + BufferLineIndicatorVisible = { fg = colors.black2, bg = colors.black2, }, @@ -32,7 +32,89 @@ return { fg = colors.light_grey, bg = colors.black2, }, + BufferLineErrorDiagnosticSelected = { + fg = colors.red, + bg = colors.black, + bold = true, + italic = true, + sp = colors.red, + }, + BufferLineErrorSelected = { + fg = colors.red, + bg = colors.black, + bold = true, + italic = true, + sp = colors.red, + }, + BufferLineInfo = { + fg = colors.light_grey, + bg = colors.black2, + }, + BufferLineInfoDiagnostic = { + fg = colors.light_grey, + bg = colors.black2, + }, + BufferLineInfoDiagnosticSelected = { + fg = colors.blue, + bg = colors.black, + bold = true, + italic = true, + sp = colors.red, + }, + BufferLineInfoSelected = { + fg = colors.blue, + bg = colors.black, + bold = true, + italic = true, + sp = colors.red, + }, + + BufferLineWarning = { + fg = colors.light_grey, + bg = colors.black2, + }, + BufferLineWarningDiagnostic = { + fg = colors.light_grey, + bg = colors.black2, + }, + BufferLineWarningDiagnosticSelected = { + fg = colors.yellow, + bg = colors.black, + bold = true, + italic = true, + sp = colors.yellow, + }, + BufferLineWarningSelected = { + fg = colors.yellow, + bg = colors.black, + bold = true, + italic = true, + sp = colors.yellow, + }, + + BufferLineHint = { + fg = colors.light_grey, + bg = colors.black2, + }, + BufferLineHintDiagnostic = { + fg = colors.light_grey, + bg = colors.black2, + }, + BufferLineHintDiagnosticSelected = { + fg = colors.purple, + bg = colors.black, + bold = true, + italic = true, + sp = colors.purple, + }, + BufferLineHintSelected = { + fg = colors.purple, + bg = colors.black, + bold = true, + italic = true, + sp = colors.purple, + }, -- close buttons BufferLineCloseButton = { fg = colors.light_grey, @@ -50,7 +132,7 @@ return { fg = colors.grey_fg, bg = colors.black2, }, - BufferlineIndicatorSelected = { + BufferLineIndicatorSelected = { fg = colors.black, bg = colors.black, }, @@ -126,4 +208,24 @@ return { BufferLineRightCustomAreaText2 = { fg = colors.red, }, + + -- MiniIcons integration + BufferLineMiniIconsYellow = { fg = colors.yellow, bg = colors.black2 }, + BufferLineMiniIconsYellowSelected = { fg = colors.yellow, bg = colors.black }, + BufferLineMiniIconsOrange = { fg = colors.orange, bg = colors.black2 }, + BufferLineMiniIconsOrangeSelected = { fg = colors.orange, bg = colors.black }, + BufferLineMiniIconsAzure = { fg = colors.teal, bg = colors.black2 }, + BufferLineMiniIconsAzureSelected = { fg = colors.teal, bg = colors.black }, + BufferLineMiniIconsCyan = { fg = colors.cyan, bg = colors.black2 }, + BufferLineMiniIconsCyanSelected = { fg = colors.cyan, bg = colors.black }, + BufferLineMiniIconsPurple = { fg = colors.purple, bg = colors.black2 }, + BufferLineMiniIconsPurpleSelected = { fg = colors.purple, bg = colors.black }, + BufferLineMiniIconsBlue = { fg = colors.blue, bg = colors.black2 }, + BufferLineMiniIconsBlueSelected = { fg = colors.blue, bg = colors.black }, + BufferLineMiniIconsRed = { fg = colors.red, bg = colors.black2 }, + BufferLineMiniIconsRedSelected = { fg = colors.red, bg = colors.black }, + BufferLineMiniIconsGreen = { fg = colors.green, bg = colors.black2 }, + BufferLineMiniIconsGreenSelected = { fg = colors.green, bg = colors.black }, + BufferLineMiniIconsGrey = { fg = colors.white, bg = colors.black2 }, + BufferLineMiniIconsGreySelected = { fg = colors.white, bg = colors.black }, } diff --git a/lua/base46/integrations/mini-icons.lua b/lua/base46/integrations/mini-icons.lua new file mode 100644 index 00000000..2d55152a --- /dev/null +++ b/lua/base46/integrations/mini-icons.lua @@ -0,0 +1,36 @@ +local colors = require("base46").get_theme_tb "base_30" + +return { + MiniIcons = { + -- seems to be normal text + -- cleared + }, + MiniIconsAzure = { + fg = colors.teal, + }, + MiniIconsBlue = { + fg = colors.blue, + }, + MiniIconsRed = { + fg = colors.red, + }, + MiniIconsYellow = { + fg = colors.yellow, + }, + MiniIconsOrange = { + fg = colors.orange, + }, + MiniIconsGreen = { + fg = colors.green, + }, + MiniIconsPurple = { + fg = colors.purple, + }, + MiniIconsCyan = { + fg = colors.cyan, + }, + + MiniIconsGrey = { + fg = colors.white, + }, +} From cee12a263602cc97652d3dd55f0fc5e171012967 Mon Sep 17 00:00:00 2001 From: dodofarm <120017300+dodofarm@users.noreply.github.com> Date: Sun, 20 Jul 2025 20:00:44 +0100 Subject: [PATCH 2/3] Small fix to make arrows on sides of bufferline blend in better (#412) --- lua/base46/integrations/bufferline.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/base46/integrations/bufferline.lua b/lua/base46/integrations/bufferline.lua index 3d86a8b1..affd166c 100644 --- a/lua/base46/integrations/bufferline.lua +++ b/lua/base46/integrations/bufferline.lua @@ -1,6 +1,10 @@ local colors = require("base46").get_theme_tb "base_30" return { + BufferLineTruncMarker = { + fg = colors.light_grey, + bg = colors.black2, + }, BufferLineBackground = { fg = colors.light_grey, From 8f82886397278f882c1e6f6ff9da535fd934cada Mon Sep 17 00:00:00 2001 From: Chris Fonnesbeck Date: Fri, 1 Aug 2025 17:26:03 -0500 Subject: [PATCH 3/3] Added cobalt2 theme --- lua/base46/themes/cobalt2.lua | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 lua/base46/themes/cobalt2.lua diff --git a/lua/base46/themes/cobalt2.lua b/lua/base46/themes/cobalt2.lua new file mode 100644 index 00000000..afab0821 --- /dev/null +++ b/lua/base46/themes/cobalt2.lua @@ -0,0 +1,63 @@ +-- Credits to original https://github.com/lalitmee/cobalt2.nvim +-- Cobalt2 theme adapted for Base46 + +local M = {} + +M.base_30 = { + white = "#FFFFFF", + darker_black = "#0f2a3f", + black = "#193549", -- cobalt_bg + black2 = "#1f3b50", + one_bg = "#234157", + one_bg2 = "#2d4b61", + one_bg3 = "#37556b", + grey = "#626262", + grey_fg = "#808080", + grey_fg2 = "#9E9E9E", + light_grey = "#BCBCBC", + red = "#FF0000", + baby_pink = "#FF628C", + pink = "#FF00FF", + line = "#0d3a58", -- cursor_line + green = "#3AD900", + vibrant_green = "#88FF88", + nord_blue = "#8fbfdc", + blue = "#00AAFF", + seablue = "#0088FF", + yellow = "#FFC600", + sun = "#F2ED7F", + purple = "#967EFB", + dark_purple = "#345FA8", + teal = "#80FCFF", + orange = "#FF9D00", + cyan = "#80FCFF", + statusline_bg = "#0d3a58", + lightbg = "#234157", + pmenu_bg = "#00AAFF", + folder_bg = "#00AAFF", +} + +M.base_16 = { + base00 = "#193549", -- cobalt_bg + base01 = "#234157", + base02 = "#2d4b61", + base03 = "#37556b", + base04 = "#626262", + base05 = "#BCBCBC", + base06 = "#CCCCCC", + base07 = "#FFFFFF", + base08 = "#FF0000", -- red + base09 = "#FF9D00", -- orange + base0A = "#FFC600", -- yellow + base0B = "#3AD900", -- green + base0C = "#80FCFF", -- cyan/teal + base0D = "#00AAFF", -- blue + base0E = "#967EFB", -- purple + base0F = "#FF628C", -- pink +} + +M.type = "dark" + +M = require("base46").override_theme(M, "cobalt2") + +return M \ No newline at end of file