Skip to content

Commit 2e3034a

Browse files
A-Lamiamehalter
authored andcommitted
refactor!: renamed all secondary colors to have a prefix of alt_xxxx
The secondary colors had a mixture of light_xxxx or dark_xxxx with the new multi palette system in context of multiple themes this did not make sense renamed the prefix to something more generic.
1 parent cd57e69 commit 2e3034a

File tree

12 files changed

+53
-53
lines changed

12 files changed

+53
-53
lines changed

lua/astrotheme/groups/base.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ local function callback(opts)
5353
StatusNormal = { fg = C.crust, bg = C.blue },
5454
StatusInsert = { fg = C.crust, bg = C.green },
5555
StatusVisual = { fg = C.crust, bg = C.purple },
56-
StatusReplace = { fg = C.crust, bg = C.dark_red },
57-
StatusCommand = { fg = C.crust, bg = C.dark_yellow },
56+
StatusReplace = { fg = C.crust, bg = C.alt_red },
57+
StatusCommand = { fg = C.crust, bg = C.alt_yellow },
5858
StatusTerminal = { link = "StatusInsert" },
5959
WinBar = { fg = C.subtext1, bg = C.base },
6060
WinBarNC = { fg = C.subtext0, bg = opts.inactive and C.crust or C.base },

lua/astrotheme/groups/lsp.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
local function callback()
22
return {
3-
DiagnosticError = { fg = C.dark_red },
4-
DiagnosticHint = { fg = C.dark_yellow },
3+
DiagnosticError = { fg = C.alt_red },
4+
DiagnosticHint = { fg = C.alt_yellow },
55
DiagnosticInfo = { fg = C.overlay0 },
6-
DiagnosticWarn = { fg = C.dark_orange },
6+
DiagnosticWarn = { fg = C.alt_orange },
77
DiagnosticInformation = { fg = C.yellow, bold = true },
88
DiagnosticTruncateLine = { fg = C.overlay0, bold = true },
99
DiagnosticUnderlineError = { sp = C.red, undercurl = true },
@@ -12,10 +12,10 @@ local function callback()
1212
DiagnosticUnderlineWarn = { sp = C.red, undercurl = true },
1313
LspCodeLens = { fg = C.subtext1 },
1414
LspCodeLensSeparator = { fg = C.subtext1 },
15-
LspDiagnosticsFloatingError = { fg = C.dark_red },
16-
LspDiagnosticsFloatingHint = { fg = C.dark_yellow },
15+
LspDiagnosticsFloatingError = { fg = C.alt_red },
16+
LspDiagnosticsFloatingHint = { fg = C.alt_yellow },
1717
LspDiagnosticsFloatingInfor = { fg = C.overlay0 },
18-
LspDiagnosticsFloatingWarn = { fg = C.dark_orange },
18+
LspDiagnosticsFloatingWarn = { fg = C.alt_orange },
1919
LspFloatWinBorder = { fg = C.overlay0 },
2020
LspFloatWinNormal = { fg = C.text, bg = C.crust },
2121
LspInlayHint = { link = "Comment" },

lua/astrotheme/groups/plugins/bufferline.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ local function callback()
1010
BufferLineCloseButtonSelected = { fg = C.red, bg = C.base },
1111
BufferLineModifiedVisible = { fg = C.text, bg = C.base },
1212
BufferLineModifiedSelected = { fg = C.green, bg = C.base },
13-
BufferLineError = { fg = C.dark_red, bg = C.dark_red },
14-
BufferLineErrorDiagnostic = { fg = C.dark_red, bg = C.dark_red },
13+
BufferLineError = { fg = C.alt_red, bg = C.alt_red },
14+
BufferLineErrorDiagnostic = { fg = C.alt_red, bg = C.alt_red },
1515
}
1616
end
1717

lua/astrotheme/groups/plugins/gitsigns.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
local function callback()
22
return {
33
GitSignsAdd = { fg = C.green, bg = C.none },
4-
GitSignsChange = { fg = C.dark_orange, bg = C.none },
5-
GitSignsDelete = { fg = C.dark_red, bg = C.none },
4+
GitSignsChange = { fg = C.alt_orange, bg = C.none },
5+
GitSignsDelete = { fg = C.alt_red, bg = C.none },
66
MoreMsg = { fg = C.green, bold = true },
77
ModeMsg = { fg = C.subtext0, bold = true },
88
}

lua/astrotheme/groups/plugins/lightspeed.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
local function callback()
22
return {
3-
LightspeedLabel = { fg = C.dark_red, underline = true },
3+
LightspeedLabel = { fg = C.alt_red, underline = true },
44
LightspeedLabelOverlapped = { fg = C.blue, underline = true },
5-
LightspeedLabelDistant = { fg = C.dark_red, underline = true },
6-
LightspeedLabelDistantOverlapped = { fg = C.light_blue, underline = true },
7-
LightspeedShortcut = { fg = C.mantle, bg = C.dark_red, bold = true, underline = true },
5+
LightspeedLabelDistant = { fg = C.alt_red, underline = true },
6+
LightspeedLabelDistantOverlapped = { fg = C.alt_blue, underline = true },
7+
LightspeedShortcut = { fg = C.mantle, bg = C.alt_red, bold = true, underline = true },
88
LightspeedShortcutOverlapped = { fg = C.mantle, bg = C.blue, bold = true, underline = true },
9-
LightspeedMaskedChar = { fg = C.light_green },
9+
LightspeedMaskedChar = { fg = C.alt_green },
1010
LightspeedUnlabeledMatch = { fg = C.surface2, bold = true },
1111
LightspeedUniqueChar = { link = "LightspeedUnlabeledMatch" },
1212
LightspeedGreyWash = { link = "Comment" },

lua/astrotheme/groups/plugins/neo-tree.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local function callback(opts)
55
NeoTreeFileName = { fg = C.text },
66
NeoTreeFileIcon = { fg = C.text },
77
NeoTreeFileNameOpened = { fg = C.green },
8-
NeoTreeIndentMarker = { fg = C.light_blue },
8+
NeoTreeIndentMarker = { fg = C.alt_blue },
99
NeoTreeGitAdded = { fg = C.green },
1010
NeoTreeGitConflict = { fg = C.red },
1111
NeoTreeGitModified = { fg = C.orange },

lua/astrotheme/groups/plugins/nvim-dap-ui.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ local function callback()
44
DapUIScope = { link = "Title" },
55
DapUIType = { link = "Type" },
66
DapUIValue = { fg = C.red },
7-
DapUIModifiedValue = { fg = C.dark_yellow, bold = true },
7+
DapUIModifiedValue = { fg = C.alt_yellow, bold = true },
88
DapUIDecoration = { fg = C.subtext0 },
99
DapUIThread = { link = "String" },
1010
DapUIStoppedThread = { link = "Title" },
1111
DapUIFrameName = { link = "Normal" },
1212
DapUISource = { link = "Keyword" },
1313
DapUILineNumber = { link = "Number" },
1414
DapUIFloatBorder = { link = "FloatBorder" },
15-
DapUIWatchesEmpty = { fg = C.dark_red },
16-
DapUIWatchesValue = { fg = C.dark_orange },
17-
DapUIWatchesError = { fg = C.dark_red },
15+
DapUIWatchesEmpty = { fg = C.alt_red },
16+
DapUIWatchesValue = { fg = C.alt_orange },
17+
DapUIWatchesError = { fg = C.alt_red },
1818
DapUIBreakpointsPath = { link = "Title" },
1919
DapUIBreakpointsInfo = { fg = C.overlay0 },
20-
DapUIBreakpointsCurrentLine = { fg = C.dark_yellow, bold = true },
20+
DapUIBreakpointsCurrentLine = { fg = C.alt_yellow, bold = true },
2121
DapUIBreakpointsLine = { link = "DapUILineNumber" },
2222
DapUIBreakpointsDisabledLine = { link = "Comment" },
2323
DapUIPlayPause = { fg = C.green },

lua/astrotheme/groups/plugins/nvim-notify.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ local function callback()
22
return {
33
NotifyBackground = { bg = C.base },
44
NotifyERRORBorder = { fg = C.red },
5-
NotifyWARNBorder = { fg = C.dark_orange },
5+
NotifyWARNBorder = { fg = C.alt_orange },
66
NotifyINFOBorder = { fg = C.green },
77
NotifyDEBUGBorder = { fg = C.cyan },
88
NotifyTRACERBorder = { fg = C.purple },
99
NotifyERRORIcon = { fg = C.red },
10-
NotifyWARNIcon = { fg = C.dark_orange },
10+
NotifyWARNIcon = { fg = C.alt_orange },
1111
NotifyINFOIcon = { fg = C.green },
1212
NotifyDEBUGIcon = { fg = C.cyan },
1313
NotifyTRACEIcon = { fg = C.purple },
1414
NotifyERRORTitle = { fg = C.red },
15-
NotifyWARNTitle = { fg = C.dark_orange },
15+
NotifyWARNTitle = { fg = C.alt_orange },
1616
NotifyINFOTitle = { fg = C.green },
1717
NotifyDEBUGTitle = { fg = C.cyan },
1818
NotifyTRACETitle = { fg = C.purple },

lua/astrotheme/lib/util.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ end
7373
function M.set_terminal_colors()
7474
vim.g.terminal_color_0 = C.base
7575
vim.g.terminal_color_1 = C.red
76-
vim.g.terminal_color_2 = C.light_green
77-
vim.g.terminal_color_3 = C.dark_yellow
76+
vim.g.terminal_color_2 = C.alt_green
77+
vim.g.terminal_color_3 = C.alt_yellow
7878
vim.g.terminal_color_4 = C.blue
7979
vim.g.terminal_color_5 = C.purple
8080
vim.g.terminal_color_6 = C.cyan
8181
vim.g.terminal_color_7 = C.surface2
8282
vim.g.terminal_color_8 = C.surface1
83-
vim.g.terminal_color_9 = C.dark_red
83+
vim.g.terminal_color_9 = C.alt_red
8484
vim.g.terminal_color_10 = C.green
8585
vim.g.terminal_color_11 = C.yellow
86-
vim.g.terminal_color_12 = C.light_blue
87-
vim.g.terminal_color_13 = C.light_purple
88-
vim.g.terminal_color_14 = C.light_cyan
86+
vim.g.terminal_color_12 = C.alt_blue
87+
vim.g.terminal_color_13 = C.alt_purple
88+
vim.g.terminal_color_14 = C.alt_cyan
8989
vim.g.terminal_color_15 = C.text
9090
vim.g.terminal_color_background = C.base
9191
vim.g.terminal_color_foreground = C.text

lua/astrotheme/palettes/astrodark.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ local colors = {
88
cyan = "#56b6c2",
99
orange = "#d19a66",
1010
-------------------
11-
dark_red = "#ec5f67",
12-
light_blue = "#90c7f3",
13-
light_green = "#89b06d",
14-
dark_yellow = "#ebae34",
15-
light_purple = "#a9a1e1",
16-
light_cyan = "#88cbd4",
17-
dark_orange = "#ff9640",
11+
alt_red = "#ec5f67",
12+
alt_blue = "#90c7f3",
13+
alt_green = "#89b06d",
14+
alt_yellow = "#ebae34",
15+
alt_purple = "#a9a1e1",
16+
alt_cyan = "#88cbd4",
17+
alt_orange = "#ff9640",
1818
-------------------
1919
base = "#1e222a",
2020
crust = "#1f1f25",

0 commit comments

Comments
 (0)