Skip to content

Commit 791dad8

Browse files
A-Lamiamehalter
A-Lamia
authored and
mehalter
committed
feat: large update to new naming scheme; complete color rework
This is an initial step to a very large rework many changes are made with naming and colors with alongside the removal of 6 generalized variables that i felt didn't have much meaning and caused more confusion
1 parent 7b93f1b commit 791dad8

27 files changed

+470
-456
lines changed

‎lua/astrotheme/groups/base.lua‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
local function callback(opts)
22
return {
3-
Normal = { fg = C.text, bg = C.base },
4-
NormalNC = { fg = C.text, bg = opts.inactive and C.crust or C.base },
5-
Title = { fg = C.cyan, bg = C.none },
6-
Cursor = { fg = C.base, bg = C.text },
3+
Normal = { fg = C.syntax.text, bg = C.ui.base },
4+
NormalNC = { fg = C.syntax.text, bg = opts.inactive and C.ui.tabline or C.ui.base },
5+
Title = { fg = C.syntax.cyan, bg = C.none },
6+
Cursor = { fg = C.ui.base, bg = C.syntax.text },
77
CursorIM = { link = "Cursor" },
88
lCursor = { link = "Cursor" },
9-
ColorColumn = { fg = C.none, bg = C.overlay1 },
10-
CursorLineNr = { fg = C.text, bg = C.none },
11-
Conceal = { fg = C.subtext1, bg = C.none },
12-
CursorColumn = { fg = C.none, bg = C.overlay1 },
13-
CursorLine = { fg = C.none, bg = C.surface0 },
14-
Directory = { fg = C.blue, bg = C.none },
15-
DiffAdd = { fg = C.base, bg = C.green },
16-
DiffChange = { fg = C.yellow, bg = C.none },
17-
DiffDelete = { fg = C.base, bg = C.red },
18-
DiffText = { fg = C.base, bg = C.yellow },
19-
DiffAdded = { fg = C.green },
20-
DiffRemoved = { fg = C.red },
21-
DiffChanged = { fg = C.blue },
22-
DiffOldFile = { fg = C.orange },
23-
DiffNewFile = { fg = C.green },
24-
DiffFile = { fg = C.blue },
25-
DiffLine = { fg = C.overlay0 },
26-
DiffIndexLine = { fg = C.cyan },
27-
ErrorMsg = { fg = C.red, bg = C.none },
28-
WinSeparator = { fg = C.overlay1, bg = C.none },
29-
Folded = { fg = C.subtext1, bg = C.none },
9+
ColorColumn = { fg = C.none, bg = C.ui.current_line }, -- NOTE: Find better color
10+
CursorLineNr = { fg = C.syntax.text, bg = C.none },
11+
Conceal = { fg = C.syntax.subtext1, bg = C.none },
12+
CursorColumn = { fg = C.none, bg = C.ui.current_line },
13+
CursorLine = { fg = C.none, bg = C.ui.current_line },
14+
Directory = { fg = C.syntax.blue, bg = C.none },
15+
DiffAdd = { fg = C.ui.base, bg = C.syntax.green },
16+
DiffChange = { fg = C.ui.base, bg = C.syntax.yellow },
17+
DiffDelete = { fg = C.ui.base, bg = C.syntax.red },
18+
DiffText = { fg = C.ui.base, bg = C.syntax.yellow },
19+
DiffAdded = { fg = C.syntax.green },
20+
DiffRemoved = { fg = C.syntax.red },
21+
DiffChanged = { fg = C.syntax.blue },
22+
DiffOldFile = { fg = C.syntax.orange },
23+
DiffNewFile = { fg = C.syntax.green },
24+
DiffFile = { fg = C.syntax.blue },
25+
DiffLine = { fg = C.syntax.text }, -- NOTE: Find better color
26+
DiffIndexLine = { fg = C.syntax.cyan },
27+
ErrorMsg = { fg = C.syntax.red, bg = C.none },
28+
WinSeparator = { fg = C.ui.split, bg = C.none, bold = true },
29+
Folded = { fg = C.syntax.subtext1, bg = C.none },
3030
FoldColumn = { fg = C.none, bg = C.none },
31-
IncSearch = { fg = C.base, bg = C.purple },
31+
IncSearch = { fg = C.ui.base, bg = C.ui.purple },
3232
CurSearch = { link = "IncSearch" },
33-
LineNr = { fg = C.subtext1, bg = C.none },
34-
NonText = { fg = C.subtext1, bg = C.none },
35-
Pmenu = { fg = C.text, bg = C.mantle },
36-
PmenuSel = { fg = C.none, bg = C.overlay1 },
37-
PmenuSbar = { fg = C.none, bg = C.overlay2 },
38-
PmenuThumb = { fg = C.none, bg = C.text },
39-
Question = { fg = C.purple, bg = C.none },
40-
QuickFixLine = { fg = C.overlay2, bg = C.yellow },
41-
Search = { fg = C.base, bg = C.blue },
33+
LineNr = { fg = C.syntax.subtext1, bg = C.none },
34+
NonText = { fg = C.syntax.subtext1, bg = C.none },
35+
Pmenu = { fg = C.ui.text, bg = C.ui.popup },
36+
PmenuSel = { fg = C.none, bg = C.ui.current_line },
37+
PmenuSbar = { fg = C.none, bg = C.ui.tabline },
38+
PmenuThumb = { fg = C.none, bg = C.ui.scrollbar },
39+
Question = { fg = C.syntax.purple, bg = C.none },
40+
QuickFixLine = { fg = C.ui.base, bg = C.syntax.yellow },
41+
Search = { fg = C.none, bg = C.ui.selection },
4242
SignColumn = { fg = C.none, bg = C.none },
43-
SpecialKey = { fg = C.subtext1, bg = C.none },
43+
SpecialKey = { fg = C.syntax.subtext1, bg = C.none },
4444
SpellBad = { undercurl = true },
4545
SpellCap = { undercurl = true },
4646
SpellLocal = { undercurl = true },
4747
SpellRare = { undercurl = true },
48-
StatusLine = { fg = C.text, bg = C.status },
49-
StatusLineNC = { fg = C.subtext1, bg = C.none },
50-
StatusLineTerm = { fg = C.text, bg = C.overlay1 },
51-
StatusLineTermNC = { fg = C.crust, bg = C.none },
52-
StatusInactive = { fg = C.crust, bg = C.surface0 },
53-
StatusNormal = { fg = C.crust, bg = C.blue },
54-
StatusInsert = { fg = C.crust, bg = C.green },
55-
StatusVisual = { fg = C.crust, bg = C.purple },
56-
StatusReplace = { fg = C.crust, bg = C.alt_red },
57-
StatusCommand = { fg = C.crust, bg = C.alt_yellow },
48+
StatusLine = { fg = C.syntax.subtext0, bg = C.ui.statusline },
49+
StatusLineNC = { fg = C.syntax.subtext1, bg = C.none },
50+
StatusLineTerm = { fg = C.syntax.text, bg = C.syntax.subtext0 }, -- INFO: Apperantly not needed ?
51+
StatusLineTermNC = { fg = C.ui.tabline, bg = C.none },
52+
StatusInactive = { fg = C.ui.tabline, bg = C.syntax.subtext0 }, -- TODO: find better inactive color
53+
StatusNormal = { fg = C.ui.tabline, bg = C.ui.blue },
54+
StatusInsert = { fg = C.ui.tabline, bg = C.ui.green },
55+
StatusVisual = { fg = C.ui.tabline, bg = C.ui.purple },
56+
StatusReplace = { fg = C.ui.tabline, bg = C.ui.red },
57+
StatusCommand = { fg = C.ui.tabline, bg = C.ui.yellow },
5858
StatusTerminal = { link = "StatusInsert" },
59-
TabLineSel = { fg = C.text, bg = C.none },
60-
WinBar = { fg = C.subtext0, bg = C.base },
61-
WinBarNC = { fg = C.subtext1, bg = opts.inactive and C.crust or C.base },
62-
TabLine = { fg = C.subtext1, bg = C.none },
63-
TabLineFill = { fg = C.none, bg = C.crust },
64-
Terminal = { fg = C.text, bg = C.overlay2 },
65-
Visual = { fg = C.none, bg = C.surface1 },
66-
VisualNOS = { fg = C.surface1, bg = C.none },
67-
VirtSplit = { bg = C.base },
68-
WarningMsg = { fg = C.yellow, bg = C.none },
69-
WildMenu = { fg = C.overlay2, bg = C.blue },
70-
EndOfBuffer = { fg = C.base, bg = C.none },
71-
FloatBorder = { fg = C.surface1, bg = C.base },
72-
MatchParen = { fg = C.none, bg = C.surface1 },
59+
WinBar = { fg = C.syntax.subtext0, bg = C.none },
60+
WinBarNC = { fg = C.syntax.subtext1, bg = opts.inactive and C.ui.tabline or C.none },
61+
TabLine = { fg = C.syntax.subtext1, bg = C.ui.tabline },
62+
TabLineSel = { fg = C.syntax.text, bg = C.ui.base, bold = true },
63+
TabLineFill = { fg = C.none, bg = C.ui.tabline },
64+
Terminal = { fg = C.syntax.text, bg = C.ui.base },
65+
Visual = { fg = C.none, bg = C.ui.selection },
66+
VisualNOS = { fg = C.ui.selection, bg = C.none },
67+
VirtSplit = { bg = C.ui.base },
68+
WarningMsg = { fg = C.syntax.yellow, bg = C.none },
69+
WildMenu = { fg = C.ui.base, bg = C.syntax.blue },
70+
EndOfBuffer = { fg = C.ui.base, bg = C.none },
71+
FloatBorder = { fg = C.ui.border, bg = C.ui.base },
72+
MatchParen = { fg = C.none, bg = C.ui.highlight },
7373
}
7474
end
7575

‎lua/astrotheme/groups/lsp.lua‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,50 @@
11
local function callback()
2+
local error = C.ui.red
3+
local hint = C.ui.cyan
4+
local info = C.ui.blue
5+
local warn = C.ui.yellow
26
return {
3-
DiagnosticError = { fg = C.alt_red },
4-
DiagnosticHint = { fg = C.alt_yellow },
5-
DiagnosticInfo = { fg = C.overlay0 },
6-
DiagnosticWarn = { fg = C.alt_orange },
7-
DiagnosticInformation = { fg = C.yellow, bold = true },
8-
DiagnosticTruncateLine = { fg = C.overlay0, bold = true },
9-
DiagnosticUnderlineError = { sp = C.red, undercurl = true },
10-
DiagnosticUnderlineHint = { sp = C.red, undercurl = true },
11-
DiagnosticUnderlineInfo = { sp = C.red, undercurl = true },
12-
DiagnosticUnderlineWarn = { sp = C.red, undercurl = true },
13-
LspCodeLens = { fg = C.subtext0 },
14-
LspCodeLensSeparator = { fg = C.subtext0 },
15-
LspDiagnosticsFloatingError = { fg = C.alt_red },
16-
LspDiagnosticsFloatingHint = { fg = C.alt_yellow },
17-
LspDiagnosticsFloatingInfor = { fg = C.overlay0 },
18-
LspDiagnosticsFloatingWarn = { fg = C.alt_orange },
19-
LspFloatWinBorder = { fg = C.overlay0 },
20-
LspFloatWinNormal = { fg = C.text, bg = C.crust },
21-
LspInlayHint = { link = "Comment" },
22-
LspReferenceRead = { fg = C.none, bg = C.surface1 },
23-
LspReferenceText = { fg = C.none, bg = C.surface1 },
24-
LspReferenceWrite = { fg = C.none, bg = C.surface1 },
25-
ProviderTruncateLine = { fg = C.overlay0 },
7+
DiagnosticError = { fg = error },
8+
DiagnosticHint = { fg = hint },
9+
DiagnosticInfo = { fg = info },
10+
DiagnosticWarn = { fg = warn },
11+
DiagnosticUnderlineError = { sp = error, undercurl = true },
12+
DiagnosticUnderlineHint = { sp = hint, undercurl = true },
13+
DiagnosticUnderlineInfo = { sp = info, undercurl = true },
14+
DiagnosticUnderlineWarn = { sp = warn, undercurl = true },
15+
LspCodeLens = { fg = C.syntax.subtext0 },
16+
LspCodeLensSeparator = { fg = C.syntax.subtext0 },
17+
LspReferenceRead = { fg = C.none, bg = C.ui.highlight },
18+
LspReferenceText = { fg = C.none, bg = C.ui.highlight },
19+
LspReferenceWrite = { fg = C.none, bg = C.ui.highlight },
2620
-- LSP Semantic Tokens
27-
-- Ref: :help lsp-semantic-highlight
28-
["@lsp.type.builtinType"] = { fg = C.yellow, bg = C.none },
21+
-- Ref: :help lsp-semantics
22+
["@lsp.type.builtinType"] = { fg = C.syntax.yellow, bg = C.none },
2923
["@lsp.type.keyword"] = { link = "Keyword" },
3024
["@lsp.type.operator"] = { link = "Operator" },
3125
["@lsp.type.parameter"] = { link = "@parameter" },
3226
["@lsp.type.property"] = { link = "@property" },
3327
["@lsp.type.variable"] = { link = "@lsp.type.variable" },
34-
["@lsp.typemod.enumMember.defaultLibrary"] = { fg = C.cyan, bg = C.none },
35-
["@lsp.typemod.function.defaultLibrary"] = { fg = C.cyan, bg = C.none },
36-
["@lsp.typemod.function.global"] = { fg = C.cyan, bg = C.none },
37-
["@lsp.typemod.method.defaultLibrary"] = { fg = C.cyan, bg = C.none },
28+
["@lsp.typemod.enumMember.defaultLibrary"] = { fg = C.syntax.cyan, bg = C.none },
29+
["@lsp.typemod.function.defaultLibrary"] = { fg = C.syntax.cyan, bg = C.none },
30+
["@lsp.typemod.function.global"] = { fg = C.syntax.cyan, bg = C.none },
31+
["@lsp.typemod.method.defaultLibrary"] = { fg = C.syntax.cyan, bg = C.none },
3832
["@lsp.typemod.method.reference"] = { link = "Function" },
3933
["@lsp.typemod.method.trait"] = { link = "Function" },
4034
["@lsp.typemod.selfKeyword.defaultLibrary"] = { link = "Keyword" },
41-
["@lsp.typemod.variable.defaultLibrary"] = { fg = C.yellow, bg = C.none },
35+
["@lsp.typemod.variable.defaultLibrary"] = { fg = C.syntax.yellow, bg = C.none },
4236
["@lsp.typemod.variable.readonly"] = { link = "Constant" },
37+
38+
-- rust
39+
["@lsp.typemod.enumMember.defaultLibrary.rust"] = { fg = C.syntax.blue, bg = C.none },
40+
["@lsp.typemod.function.defaultLibrary.rust"] = { fg = C.syntax.text, bg = C.none },
41+
["@lsp.typemod.method.defaultLibrary.rust"] = { fg = C.syntax.blue, bg = C.none },
42+
["@lsp.typemod.function.global.rust"] = { fg = C.syntax.blue, bg = C.none },
43+
["@lsp.type.macro.rust"] = { fg = C.syntax.red, bg = C.none },
44+
["@lsp.type.function.rust"] = { fg = C.syntax.text, bg = C.none },
45+
["@lsp.type.namespace.rust"] = { link = "@namespace.rust" },
46+
-- ["@lsp.type.struct.rust"] = { fg = C.syntax.cyan, bg = C.none },
47+
-- ["@lsp.type.builtinType.rust"] = { fg = C.syntax.cyan, bg = C.none },
4348
}
4449
end
4550

‎lua/astrotheme/groups/plugins/aerial.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ local function callback()
1111
AerialFieldIcon = { link = "@field" },
1212
AerialFileIcon = { link = "@text.uri" },
1313
AerialFunctionIcon = { link = "@function" },
14-
AerialGuide = { fg = C.subtext1 },
14+
AerialGuide = { fg = C.syntax.subtext1 },
1515
AerialInterfaceIcon = { link = "@type" },
1616
AerialKeyIcon = { link = "@type" },
17-
AerialLine = { fg = C.yellow, bg = C.none },
17+
AerialLine = { fg = C.syntax.yellow, bg = C.none },
1818
AerialMethodIcon = { link = "@method" },
1919
AerialModuleIcon = { link = "@namespace" },
2020
AerialNamespaceIcon = { link = "@namespace" },

‎lua/astrotheme/groups/plugins/beacon.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
local function callback() return { Beacon = { bg = C.blue } } end
1+
local function callback() return { Beacon = { bg = C.syntax.blue } } end
22

33
return callback

‎lua/astrotheme/groups/plugins/bufferline.lua‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
local function callback()
22
return {
3-
BufferLineBufferVisible = { fg = C.text, bg = C.base },
4-
BufferLineBufferSelected = { fg = C.surface2, bg = C.base, bold = true },
5-
BufferLineTab = { fg = C.surface0, bg = C.base },
6-
BufferLineTabSelected = { fg = C.text, bg = C.base },
7-
BufferLineTabClose = { fg = C.red, bg = C.base },
8-
BufferLineIndicatorSelected = { fg = C.base, bg = C.base },
9-
BufferLineCloseButtonVisible = { fg = C.surface0, bg = C.base },
10-
BufferLineCloseButtonSelected = { fg = C.red, bg = C.base },
11-
BufferLineModifiedVisible = { fg = C.text, bg = C.base },
12-
BufferLineModifiedSelected = { fg = C.green, bg = C.base },
13-
BufferLineError = { fg = C.alt_red, bg = C.alt_red },
14-
BufferLineErrorDiagnostic = { fg = C.alt_red, bg = C.alt_red },
3+
BufferLineBufferVisible = { fg = C.syntax.subtext0, bg = C.ui.base },
4+
BufferLineBufferSelected = { fg = C.syntax.text, bg = C.ui.base, bold = true },
5+
BufferLineTab = { fg = C.syntax.subtext1, bg = C.ui.tabline },
6+
BufferLineTabSelected = { fg = C.syntax.text, bg = C.ui.tabline },
7+
BufferLineTabClose = { fg = C.syntax.red, bg = C.ui.tabline },
8+
BufferLineIndicatorSelected = { fg = C.ui.base, bg = C.ui.base },
9+
BufferLineCloseButtonVisible = { fg = C.syntax.red, bg = C.tableline },
10+
BufferLineCloseButtonSelected = { fg = C.syntax.red, bg = C.ui.tabline },
11+
BufferLineModifiedVisible = { fg = C.syntax.text, bg = C.ui.base },
12+
BufferLineModifiedSelected = { fg = C.ui.green, bg = C.ui.base },
13+
BufferLineModified = { fg = C.ui.green, bg = C.ui.tabline },
14+
BufferLineError = { fg = C.ui.red, bg = C.ui.red },
15+
BufferLineErrorDiagnostic = { fg = C.ui.red, bg = C.ui.red },
1516
}
1617
end
1718

‎lua/astrotheme/groups/plugins/dashboard-nvim.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
local function callback()
22
return {
3-
DashboardHeader = { fg = C.cyan },
4-
DashboardShortcut = { fg = C.yellow },
5-
DashboardFooter = { fg = C.cyan },
6-
DashboardCenter = { fg = C.blue },
3+
DashboardHeader = { fg = C.syntax.cyan },
4+
DashboardShortcut = { fg = C.syntax.yellow },
5+
DashboardFooter = { fg = C.syntax.cyan },
6+
DashboardCenter = { fg = C.syntax.blue },
77
}
88
end
99

‎lua/astrotheme/groups/plugins/flash.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
local function callback()
22
return {
3-
FlashBackdrop = { fg = C.subtext0 },
4-
FlashLabel = { fg = C.base, bg = C.orange, bold = true },
3+
FlashBackdrop = { fg = C.syntax.subtext0 },
4+
FlashLabel = { fg = C.ui.base, bg = C.ui.orange, bold = true },
55
}
66
end
77

‎lua/astrotheme/groups/plugins/gitsigns.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
local function callback()
22
return {
3-
GitSignsAdd = { fg = C.green, bg = C.none },
4-
GitSignsChange = { fg = C.alt_orange, bg = C.none },
5-
GitSignsDelete = { fg = C.alt_red, bg = C.none },
6-
MoreMsg = { fg = C.green, bold = true },
7-
ModeMsg = { fg = C.subtext1, bold = true },
3+
GitSignsAdd = { fg = C.ui.green, bg = C.none },
4+
GitSignsChange = { fg = C.ui.orange, bg = C.none },
5+
GitSignsDelete = { fg = C.ui.red, bg = C.none },
6+
MoreMsg = { fg = C.ui.green, bold = true },
7+
ModeMsg = { fg = C.syntax.subtext1, bold = true },
88
}
99
end
1010

‎lua/astrotheme/groups/plugins/hop.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
local function callback()
22
return {
3-
HopNextKey = { fg = C.red, bold = true },
4-
HopNextKey1 = { fg = C.cyan, bold = true },
5-
HopNextKey2 = { fg = C.blue },
6-
HopUnmatched = { fg = C.subtext1 },
3+
HopNextKey = { fg = C.syntax.red, bold = true },
4+
HopNextKey1 = { fg = C.syntax.cyan, bold = true },
5+
HopNextKey2 = { fg = C.syntax.blue },
6+
HopUnmatched = { fg = C.syntax.subtext1 },
77
}
88
end
99

‎lua/astrotheme/groups/plugins/indent_blankline.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
local function callback()
22
return {
3-
IndentBlanklineSpaceChar = { fg = C.surface1, nocombine = true },
4-
IndentBlanklineChar = { fg = C.surface1, nocombine = true },
5-
IndentBlanklineContextStart = { fg = C.surface0, underline = true },
6-
IndentBlanklineContextChar = { fg = C.surface0, nocombine = true },
7-
IndentBlanklineSpaceCharBlankline = { fg = C.surface1, nocombine = true },
3+
IndentBlanklineSpaceChar = { fg = C.syntax.subtext1, nocombine = true },
4+
IndentBlanklineChar = { fg = C.syntax.subtext1, nocombine = true },
5+
IndentBlanklineContextStart = { fg = C.syntax.subtext1, underline = true },
6+
IndentBlanklineContextChar = { fg = C.syntax.subtext1, nocombine = true },
7+
IndentBlanklineSpaceCharBlankline = { fg = C.syntax.subtext1, nocombine = true },
88
}
99
end
1010

0 commit comments

Comments
 (0)
⚡