Skip to content

Commit 2643ccf

Browse files
A-Lamiamehalter
A-Lamia
authored and
mehalter
committed
feat: change subtext0 & subtext1 to better names; more palette properties
1 parent 567f886 commit 2643ccf

File tree

18 files changed

+98
-152
lines changed

18 files changed

+98
-152
lines changed

‎lua/astrotheme/groups/base.lua‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ local function callback(opts)
1717
CursorIM = { link = "Cursor" },
1818
lCursor = { link = "Cursor" },
1919
ColorColumn = { fg = C.none, bg = C.ui.current_line }, -- NOTE: Find better color
20-
CursorLineNr = { fg = C.syntax.text, bg = C.none },
21-
Conceal = { fg = C.syntax.subtext1, bg = C.none },
20+
CursorLineNr = { fg = C.ui.text_active, bg = C.none }, --NOTE: active line number
21+
Conceal = { fg = C.ui.text_inactive, bg = C.none },
2222
CursorColumn = { fg = C.none, bg = C.ui.current_line },
2323
CursorLine = { fg = C.none, bg = C.ui.current_line },
2424
Directory = { fg = C.ui.blue, bg = C.none },
@@ -36,52 +36,50 @@ local function callback(opts)
3636
DiffIndexLine = { fg = C.syntax.cyan },
3737
ErrorMsg = { fg = C.syntax.red, bg = C.none },
3838
WinSeparator = { fg = C.ui.split, bg = opts.transparent and C.none or C.ui.base, bold = false },
39-
Folded = { fg = C.syntax.subtext1, bg = C.none },
40-
FoldColumn = { fg = C.syntax.subtext1, bg = C.none },
39+
Folded = { fg = C.ui.none_text, bg = C.none },
40+
FoldColumn = { fg = C.ui.none_text, bg = C.none },
4141
IncSearch = { fg = C.ui.base, bg = C.ui.purple },
4242
CurSearch = { link = "IncSearch" },
43-
LineNr = { fg = C.syntax.subtext1, bg = C.none },
44-
NonText = { fg = C.syntax.subtext1, bg = C.none },
43+
LineNr = { fg = C.ui.none_text, bg = C.none },
44+
NonText = { fg = C.ui.none_text, bg = C.none },
4545
Pmenu = { fg = C.ui.text, bg = C.ui.popup },
4646
PmenuSel = { fg = C.none, bg = C.ui.current_line },
4747
PmenuSbar = { fg = C.none, bg = C.ui.tabline },
4848
PmenuThumb = { fg = C.none, bg = C.ui.scrollbar },
49-
Question = { fg = C.syntax.purple, bg = C.none },
50-
QuickFixLine = { fg = C.ui.base, bg = C.syntax.yellow },
49+
Question = { fg = C.ui.purple, bg = C.none },
50+
QuickFixLine = { fg = C.ui.base, bg = C.ui.yellow },
5151
Search = { fg = C.none, bg = C.ui.selection },
5252
SignColumn = { fg = C.none, bg = C.none },
53-
SpecialKey = { fg = C.syntax.subtext1, bg = C.none },
53+
SpecialKey = { fg = C.ui.text, bg = C.none },
5454
SpellBad = { undercurl = true },
5555
SpellCap = { undercurl = true },
5656
SpellLocal = { undercurl = true },
5757
SpellRare = { undercurl = true },
58-
StatusLine = { fg = C.syntax.subtext0, bg = C.ui.statusline },
59-
StatusLineNC = { fg = C.syntax.subtext1, bg = C.none },
60-
StatusLineTerm = { fg = C.syntax.text, bg = C.syntax.subtext0 }, -- INFO: Apperantly not needed ?
61-
StatusLineTermNC = { fg = C.ui.tabline, bg = C.none },
62-
StatusInactive = { fg = C.ui.tabline, bg = C.syntax.subtext0 }, -- TODO: find better inactive color
58+
StatusLine = { fg = C.ui.text, bg = C.ui.statusline },
59+
StatusLineNC = { fg = C.ui.text_inactive, bg = C.none },
60+
StatusInactive = { fg = C.ui.tabline, bg = C.ui.text_inactive }, -- TODO: find better inactive color
6361
StatusNormal = { fg = C.ui.tabline, bg = C.ui.blue },
6462
StatusInsert = { fg = C.ui.tabline, bg = C.ui.green },
6563
StatusVisual = { fg = C.ui.tabline, bg = C.ui.purple },
6664
StatusReplace = { fg = C.ui.tabline, bg = C.ui.red },
6765
StatusCommand = { fg = C.ui.tabline, bg = C.ui.yellow },
6866
StatusTerminal = { link = "StatusInsert" },
69-
WinBar = { fg = C.syntax.subtext0, bg = C.none },
67+
WinBar = { fg = C.ui.winbar, bg = C.none },
7068
WinBarNC = {
71-
fg = C.syntax.subtext1,
69+
fg = C.ui.text_inactive,
7270
bg = (opts.transparent and opts.inactive and C.ui.inactive_base)
7371
or (opts.transparent and C.none)
7472
or (opts.inactive and C.ui.inactive_base)
7573
or C.ui.base,
7674
},
77-
TabLine = { fg = C.syntax.subtext1, bg = C.ui.tabline },
78-
TabLineSel = { fg = C.syntax.text, bg = C.ui.base, bold = true },
75+
TabLine = { fg = C.ui.text_inactive, bg = C.ui.tabline },
76+
TabLineSel = { fg = C.ui.text_active, bg = C.ui.base, bold = true },
7977
TabLineFill = { fg = C.none, bg = C.ui.tabline },
80-
Terminal = { fg = C.syntax.text, bg = C.ui.base },
78+
Terminal = { fg = C.ui.text, bg = C.ui.base },
8179
Visual = { fg = C.none, bg = C.ui.selection },
8280
VisualNOS = { fg = C.ui.selection, bg = C.none },
8381
VertSplit = { fg = C.ui.split, bg = opts.transparent and C.none or C.ui.base },
84-
WarningMsg = { fg = C.syntax.yellow, bg = C.none },
82+
WarningMsg = { fg = C.ui.yellow, bg = C.none },
8583
WildMenu = { fg = C.ui.base, bg = C.syntax.blue },
8684
EndOfBuffer = { fg = C.ui.base, bg = C.none },
8785
FloatTitle = { fg = C.ui.title },

‎lua/astrotheme/groups/lsp.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ local function callback()
1010
DiagnosticWarn = { fg = warn },
1111
DiagnosticUnderlineError = { sp = error, undercurl = true },
1212
DiagnosticUnderlineHint = { sp = hint, undercurl = true },
13-
DiagnosticUnderlineInfo = { sp = info, undercurl = true },
13+
DiagnosticUnderliyneInfo = { sp = info, undercurl = true },
1414
DiagnosticUnderlineWarn = { sp = warn, undercurl = true },
15-
LspCodeLens = { fg = C.syntax.subtext0 },
16-
LspCodeLensSeparator = { fg = C.syntax.subtext0 },
15+
LspCodeLens = { fg = C.ui.none_text },
16+
LspCodeLensSeparator = { fg = C.ui.none_text },
1717
LspReferenceRead = { fg = C.none, bg = C.ui.highlight },
1818
LspReferenceText = { fg = C.none, bg = C.ui.highlight },
1919
LspReferenceWrite = { fg = C.none, bg = C.ui.highlight },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ local function callback()
1111
AerialFieldIcon = { link = "@field" },
1212
AerialFileIcon = { link = "@text.uri" },
1313
AerialFunctionIcon = { link = "@function" },
14-
AerialGuide = { fg = C.syntax.subtext1 },
14+
AerialGuide = { fg = C.ui.none_text },
1515
AerialInterfaceIcon = { link = "@type" },
1616
AerialKeyIcon = { link = "@type" },
1717
AerialLine = { fg = C.syntax.yellow, bg = C.none },

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
local function callback()
22
return {
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 },
3+
BufferLineBufferVisible = { fg = C.ui.text_inactive, bg = C.ui.base },
4+
BufferLineBufferSelected = { fg = C.ui.text_active, bg = C.ui.base, bold = true },
5+
BufferLineTab = { fg = C.ui.text_inactve, bg = C.ui.tabline },
6+
BufferLineTabSelected = { fg = C.ui.text, bg = C.ui.tabline },
7+
BufferLineTabClose = { fg = C.ui.red, bg = C.ui.tabline },
88
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 },
9+
BufferLineCloseButtonVisible = { fg = C.ui.red, bg = C.tableline },
10+
BufferLineCloseButtonSelected = { fg = C.ui.red, bg = C.ui.tabline },
11+
BufferLineModifiedVisible = { fg = C.ui.text, bg = C.ui.base },
1212
BufferLineModifiedSelected = { fg = C.ui.green, bg = C.ui.base },
1313
BufferLineModified = { fg = C.ui.green, bg = C.ui.tabline },
1414
BufferLineError = { fg = C.ui.red, bg = C.ui.red },

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
-- this is a test to see what i like
12
local function callback()
23
return {
3-
FlashBackdrop = { fg = C.syntax.subtext0 },
4+
FlashBackdrop = { fg = C.syntax.mute },
45
FlashLabel = { fg = C.ui.base, bg = C.ui.orange, bold = true },
56
}
67
end

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ local function callback()
33
GitSignsAdd = { fg = C.ui.green, bg = C.none },
44
GitSignsChange = { fg = C.ui.orange, bg = C.none },
55
GitSignsDelete = { fg = C.ui.red, bg = C.none },
6-
MoreMsg = { fg = C.ui.green, bold = true },
7-
ModeMsg = { fg = C.syntax.subtext1, bold = true },
6+
MoreMsg = { fg = C.ui.text, bold = true },
7+
ModeMsg = { fg = C.ui.text, 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.syntax.red, bold = true },
4-
HopNextKey1 = { fg = C.syntax.cyan, bold = true },
5-
HopNextKey2 = { fg = C.syntax.blue },
6-
HopUnmatched = { fg = C.syntax.subtext1 },
3+
HopNextKey = { fg = C.ui.red, bold = true },
4+
HopNextKey1 = { fg = C.ui.cyan, bold = true },
5+
HopNextKey2 = { fg = C.ui.blue },
6+
HopUnmatched = { fg = C.syntax.mute },
77
}
88
end
99

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
11
local function callback(opts)
22
return {
33
NeoTreeDirectoryIcon = { fg = C.ui.blue },
4-
NeoTreeRootName = { fg = C.syntax.text, bold = true },
5-
NeoTreeFileName = { fg = C.syntax.text },
6-
NeoTreeFileIcon = { fg = C.syntax.text },
4+
NeoTreeRootName = { fg = C.ui.text, bold = true },
5+
NeoTreeFileName = { fg = C.ui.text },
6+
NeoTreeFileIcon = { fg = C.ui.text },
77
NeoTreeFileNameOpened = { fg = C.ui.green },
88
NeoTreeFloatBorder = { fg = C.ui.border },
99
NeoTreeFloatTitle = { fg = C.ui.title, bg = C.ui.tool },
10-
NeoTreeIndentMarker = { fg = C.syntax.subtext1 },
10+
NeoTreeIndentMarker = { fg = C.ui.none_text },
1111
NeoTreeGitAdded = { fg = C.ui.green },
1212
NeoTreeGitConflict = { fg = C.ui.red },
1313
NeoTreeGitModified = { fg = C.ui.orange },
1414
NeoTreeGitUntracked = { fg = C.ui.yellow },
1515
NeoTreeTitleBar = { fg = C.ui.tool, bg = C.ui.border },
1616
NeoTreeNormal = {
17-
fg = C.syntax.text,
17+
fg = C.ui.text,
1818
bg = (opts.neotree and C.ui.tool) or (opts.transparent and C.none) or C.ui.base,
1919
},
2020
NeoTreeNormalNC = {
21-
fg = C.syntax.text,
21+
fg = C.ui.text,
2222
bg = (opts.transparent and C.none) or C.ui.tool,
2323
},
24-
NeoTreeSymbolicLinkTarget = { fg = C.syntax.cyan },
24+
NeoTreeSymbolicLinkTarget = { fg = C.ui.cyan },
2525
NeoTreeTabActive = {
26-
fg = C.syntax.text,
26+
fg = C.ui.text_active,
2727
bg = opts.transparent and C.none or C.ui.tool,
2828
bold = true,
2929
},
30-
NeoTreeTabInactive = { fg = C.syntax.subtext1, bg = C.ui.tabline },
30+
NeoTreeTabInactive = { fg = C.ui.text_inactive, bg = C.ui.tabline },
3131
NeoTreeTabSeparatorActive = { fg = C.ui.tool, bg = C.ui.tool },
3232
NeoTreeTabSeparatorInactive = { fg = C.ui.tabline, bg = C.ui.tabline },
3333
NeoTreeVertSplit = { fg = C.ui.split, bg = opts.transparent and C.none or C.ui.base },
3434
NeoTreeWinSeparator = { fg = C.ui.split, bg = opts.transparent and C.none or C.ui.base, bold = true },
35-
NeoTreeStatusLineNC = { fg = C.ui.text, bg = C.ui.statusline },
3635
}
3736
end
3837

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
local function callback()
22
return {
3-
CmpItemAbbr = { fg = C.syntax.text },
3+
CmpItemAbbr = { fg = C.ui.text },
44
CmpItemAbbrDeprecated = { fg = C.syntax.red, strikethrough = true },
5-
CmpItemAbbrMatch = { fg = C.ui.cyan },
6-
CmpItemAbbrMatchFuzzy = { fg = C.ui.cyan },
5+
CmpItemAbbrMatch = { fg = C.ui.accent },
6+
CmpItemAbbrMatchFuzzy = { fg = C.ui.accent },
77
CmpItemKind = { fg = C.syntax.yellow },
88
CmpItemKindClass = { link = "@type" },
99
CmpItemKindColor = { link = "@constant" },

0 commit comments

Comments
 (0)
⚡