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
AstroNvim · Jul 8, 2023 · 791dad8 · 791dad8
1 parent 7b93f1b
commit 791dad8
Show file tree

Hide file tree

Showing 27 changed files with 470 additions and 456 deletions.
diff --git a/lua/astrotheme/groups/base.lua b/lua/astrotheme/groups/base.lua
@@ -1,75 +1,75 @@
 local function callback(opts)
   return {
-    Normal = { fg = C.text, bg = C.base },
-    NormalNC = { fg = C.text, bg = opts.inactive and C.crust or C.base },
-    Title = { fg = C.cyan, bg = C.none },
-    Cursor = { fg = C.base, bg = C.text },
+    Normal = { fg = C.syntax.text, bg = C.ui.base },
+    NormalNC = { fg = C.syntax.text, bg = opts.inactive and C.ui.tabline or C.ui.base },
+    Title = { fg = C.syntax.cyan, bg = C.none },
+    Cursor = { fg = C.ui.base, bg = C.syntax.text },
     CursorIM = { link = "Cursor" },
     lCursor = { link = "Cursor" },
-    ColorColumn = { fg = C.none, bg = C.overlay1 },
-    CursorLineNr = { fg = C.text, bg = C.none },
-    Conceal = { fg = C.subtext1, bg = C.none },
-    CursorColumn = { fg = C.none, bg = C.overlay1 },
-    CursorLine = { fg = C.none, bg = C.surface0 },
-    Directory = { fg = C.blue, bg = C.none },
-    DiffAdd = { fg = C.base, bg = C.green },
-    DiffChange = { fg = C.yellow, bg = C.none },
-    DiffDelete = { fg = C.base, bg = C.red },
-    DiffText = { fg = C.base, bg = C.yellow },
-    DiffAdded = { fg = C.green },
-    DiffRemoved = { fg = C.red },
-    DiffChanged = { fg = C.blue },
-    DiffOldFile = { fg = C.orange },
-    DiffNewFile = { fg = C.green },
-    DiffFile = { fg = C.blue },
-    DiffLine = { fg = C.overlay0 },
-    DiffIndexLine = { fg = C.cyan },
-    ErrorMsg = { fg = C.red, bg = C.none },
-    WinSeparator = { fg = C.overlay1, bg = C.none },
-    Folded = { fg = C.subtext1, bg = C.none },
+    ColorColumn = { fg = C.none, bg = C.ui.current_line }, -- NOTE: Find better color
+    CursorLineNr = { fg = C.syntax.text, bg = C.none },
+    Conceal = { fg = C.syntax.subtext1, bg = C.none },
+    CursorColumn = { fg = C.none, bg = C.ui.current_line },
+    CursorLine = { fg = C.none, bg = C.ui.current_line },
+    Directory = { fg = C.syntax.blue, bg = C.none },
+    DiffAdd = { fg = C.ui.base, bg = C.syntax.green },
+    DiffChange = { fg = C.ui.base, bg = C.syntax.yellow },
+    DiffDelete = { fg = C.ui.base, bg = C.syntax.red },
+    DiffText = { fg = C.ui.base, bg = C.syntax.yellow },
+    DiffAdded = { fg = C.syntax.green },
+    DiffRemoved = { fg = C.syntax.red },
+    DiffChanged = { fg = C.syntax.blue },
+    DiffOldFile = { fg = C.syntax.orange },
+    DiffNewFile = { fg = C.syntax.green },
+    DiffFile = { fg = C.syntax.blue },
+    DiffLine = { fg = C.syntax.text }, -- NOTE: Find better color
+    DiffIndexLine = { fg = C.syntax.cyan },
+    ErrorMsg = { fg = C.syntax.red, bg = C.none },
+    WinSeparator = { fg = C.ui.split, bg = C.none, bold = true },
+    Folded = { fg = C.syntax.subtext1, bg = C.none },
     FoldColumn = { fg = C.none, bg = C.none },
-    IncSearch = { fg = C.base, bg = C.purple },
+    IncSearch = { fg = C.ui.base, bg = C.ui.purple },
     CurSearch = { link = "IncSearch" },
-    LineNr = { fg = C.subtext1, bg = C.none },
-    NonText = { fg = C.subtext1, bg = C.none },
-    Pmenu = { fg = C.text, bg = C.mantle },
-    PmenuSel = { fg = C.none, bg = C.overlay1 },
-    PmenuSbar = { fg = C.none, bg = C.overlay2 },
-    PmenuThumb = { fg = C.none, bg = C.text },
-    Question = { fg = C.purple, bg = C.none },
-    QuickFixLine = { fg = C.overlay2, bg = C.yellow },
-    Search = { fg = C.base, bg = C.blue },
+    LineNr = { fg = C.syntax.subtext1, bg = C.none },
+    NonText = { fg = C.syntax.subtext1, bg = C.none },
+    Pmenu = { fg = C.ui.text, bg = C.ui.popup },
+    PmenuSel = { fg = C.none, bg = C.ui.current_line },
+    PmenuSbar = { fg = C.none, bg = C.ui.tabline },
+    PmenuThumb = { fg = C.none, bg = C.ui.scrollbar },
+    Question = { fg = C.syntax.purple, bg = C.none },
+    QuickFixLine = { fg = C.ui.base, bg = C.syntax.yellow },
+    Search = { fg = C.none, bg = C.ui.selection },
     SignColumn = { fg = C.none, bg = C.none },
-    SpecialKey = { fg = C.subtext1, bg = C.none },
+    SpecialKey = { fg = C.syntax.subtext1, bg = C.none },
     SpellBad = { undercurl = true },
     SpellCap = { undercurl = true },
     SpellLocal = { undercurl = true },
     SpellRare = { undercurl = true },
-    StatusLine = { fg = C.text, bg = C.status },
-    StatusLineNC = { fg = C.subtext1, bg = C.none },
-    StatusLineTerm = { fg = C.text, bg = C.overlay1 },
-    StatusLineTermNC = { fg = C.crust, bg = C.none },
-    StatusInactive = { fg = C.crust, bg = C.surface0 },
-    StatusNormal = { fg = C.crust, bg = C.blue },
-    StatusInsert = { fg = C.crust, bg = C.green },
-    StatusVisual = { fg = C.crust, bg = C.purple },
-    StatusReplace = { fg = C.crust, bg = C.alt_red },
-    StatusCommand = { fg = C.crust, bg = C.alt_yellow },
+    StatusLine = { fg = C.syntax.subtext0, bg = C.ui.statusline },
+    StatusLineNC = { fg = C.syntax.subtext1, bg = C.none },
+    StatusLineTerm = { fg = C.syntax.text, bg = C.syntax.subtext0 }, -- INFO: Apperantly not needed ?
+    StatusLineTermNC = { fg = C.ui.tabline, bg = C.none },
+    StatusInactive = { fg = C.ui.tabline, bg = C.syntax.subtext0 }, -- TODO: find better inactive color
+    StatusNormal = { fg = C.ui.tabline, bg = C.ui.blue },
+    StatusInsert = { fg = C.ui.tabline, bg = C.ui.green },
+    StatusVisual = { fg = C.ui.tabline, bg = C.ui.purple },
+    StatusReplace = { fg = C.ui.tabline, bg = C.ui.red },
+    StatusCommand = { fg = C.ui.tabline, bg = C.ui.yellow },
     StatusTerminal = { link = "StatusInsert" },
-    TabLineSel = { fg = C.text, bg = C.none },
-    WinBar = { fg = C.subtext0, bg = C.base },
-    WinBarNC = { fg = C.subtext1, bg = opts.inactive and C.crust or C.base },
-    TabLine = { fg = C.subtext1, bg = C.none },
-    TabLineFill = { fg = C.none, bg = C.crust },
-    Terminal = { fg = C.text, bg = C.overlay2 },
-    Visual = { fg = C.none, bg = C.surface1 },
-    VisualNOS = { fg = C.surface1, bg = C.none },
-    VirtSplit = { bg = C.base },
-    WarningMsg = { fg = C.yellow, bg = C.none },
-    WildMenu = { fg = C.overlay2, bg = C.blue },
-    EndOfBuffer = { fg = C.base, bg = C.none },
-    FloatBorder = { fg = C.surface1, bg = C.base },
-    MatchParen = { fg = C.none, bg = C.surface1 },
+    WinBar = { fg = C.syntax.subtext0, bg = C.none },
+    WinBarNC = { fg = C.syntax.subtext1, bg = opts.inactive and C.ui.tabline or C.none },
+    TabLine = { fg = C.syntax.subtext1, bg = C.ui.tabline },
+    TabLineSel = { fg = C.syntax.text, bg = C.ui.base, bold = true },
+    TabLineFill = { fg = C.none, bg = C.ui.tabline },
+    Terminal = { fg = C.syntax.text, bg = C.ui.base },
+    Visual = { fg = C.none, bg = C.ui.selection },
+    VisualNOS = { fg = C.ui.selection, bg = C.none },
+    VirtSplit = { bg = C.ui.base },
+    WarningMsg = { fg = C.syntax.yellow, bg = C.none },
+    WildMenu = { fg = C.ui.base, bg = C.syntax.blue },
+    EndOfBuffer = { fg = C.ui.base, bg = C.none },
+    FloatBorder = { fg = C.ui.border, bg = C.ui.base },
+    MatchParen = { fg = C.none, bg = C.ui.highlight },
   }
 end
 

diff --git a/lua/astrotheme/groups/lsp.lua b/lua/astrotheme/groups/lsp.lua
@@ -1,45 +1,50 @@
 local function callback()
+  local error = C.ui.red
+  local hint = C.ui.cyan
+  local info = C.ui.blue
+  local warn = C.ui.yellow
   return {
-    DiagnosticError = { fg = C.alt_red },
-    DiagnosticHint = { fg = C.alt_yellow },
-    DiagnosticInfo = { fg = C.overlay0 },
-    DiagnosticWarn = { fg = C.alt_orange },
-    DiagnosticInformation = { fg = C.yellow, bold = true },
-    DiagnosticTruncateLine = { fg = C.overlay0, bold = true },
-    DiagnosticUnderlineError = { sp = C.red, undercurl = true },
-    DiagnosticUnderlineHint = { sp = C.red, undercurl = true },
-    DiagnosticUnderlineInfo = { sp = C.red, undercurl = true },
-    DiagnosticUnderlineWarn = { sp = C.red, undercurl = true },
-    LspCodeLens = { fg = C.subtext0 },
-    LspCodeLensSeparator = { fg = C.subtext0 },
-    LspDiagnosticsFloatingError = { fg = C.alt_red },
-    LspDiagnosticsFloatingHint = { fg = C.alt_yellow },
-    LspDiagnosticsFloatingInfor = { fg = C.overlay0 },
-    LspDiagnosticsFloatingWarn = { fg = C.alt_orange },
-    LspFloatWinBorder = { fg = C.overlay0 },
-    LspFloatWinNormal = { fg = C.text, bg = C.crust },
-    LspInlayHint = { link = "Comment" },
-    LspReferenceRead = { fg = C.none, bg = C.surface1 },
-    LspReferenceText = { fg = C.none, bg = C.surface1 },
-    LspReferenceWrite = { fg = C.none, bg = C.surface1 },
-    ProviderTruncateLine = { fg = C.overlay0 },
+    DiagnosticError = { fg = error },
+    DiagnosticHint = { fg = hint },
+    DiagnosticInfo = { fg = info },
+    DiagnosticWarn = { fg = warn },
+    DiagnosticUnderlineError = { sp = error, undercurl = true },
+    DiagnosticUnderlineHint = { sp = hint, undercurl = true },
+    DiagnosticUnderlineInfo = { sp = info, undercurl = true },
+    DiagnosticUnderlineWarn = { sp = warn, undercurl = true },
+    LspCodeLens = { fg = C.syntax.subtext0 },
+    LspCodeLensSeparator = { fg = C.syntax.subtext0 },
+    LspReferenceRead = { fg = C.none, bg = C.ui.highlight },
+    LspReferenceText = { fg = C.none, bg = C.ui.highlight },
+    LspReferenceWrite = { fg = C.none, bg = C.ui.highlight },
     -- LSP Semantic Tokens
-    -- Ref: :help lsp-semantic-highlight
-    ["@lsp.type.builtinType"] = { fg = C.yellow, bg = C.none },
+    -- Ref: :help lsp-semantics
+    ["@lsp.type.builtinType"] = { fg = C.syntax.yellow, bg = C.none },
     ["@lsp.type.keyword"] = { link = "Keyword" },
     ["@lsp.type.operator"] = { link = "Operator" },
     ["@lsp.type.parameter"] = { link = "@parameter" },
     ["@lsp.type.property"] = { link = "@property" },
     ["@lsp.type.variable"] = { link = "@lsp.type.variable" },
-    ["@lsp.typemod.enumMember.defaultLibrary"] = { fg = C.cyan, bg = C.none },
-    ["@lsp.typemod.function.defaultLibrary"] = { fg = C.cyan, bg = C.none },
-    ["@lsp.typemod.function.global"] = { fg = C.cyan, bg = C.none },
-    ["@lsp.typemod.method.defaultLibrary"] = { fg = C.cyan, bg = C.none },
+    ["@lsp.typemod.enumMember.defaultLibrary"] = { fg = C.syntax.cyan, bg = C.none },
+    ["@lsp.typemod.function.defaultLibrary"] = { fg = C.syntax.cyan, bg = C.none },
+    ["@lsp.typemod.function.global"] = { fg = C.syntax.cyan, bg = C.none },
+    ["@lsp.typemod.method.defaultLibrary"] = { fg = C.syntax.cyan, bg = C.none },
     ["@lsp.typemod.method.reference"] = { link = "Function" },
     ["@lsp.typemod.method.trait"] = { link = "Function" },
     ["@lsp.typemod.selfKeyword.defaultLibrary"] = { link = "Keyword" },
-    ["@lsp.typemod.variable.defaultLibrary"] = { fg = C.yellow, bg = C.none },
+    ["@lsp.typemod.variable.defaultLibrary"] = { fg = C.syntax.yellow, bg = C.none },
     ["@lsp.typemod.variable.readonly"] = { link = "Constant" },
+
+    -- rust
+    ["@lsp.typemod.enumMember.defaultLibrary.rust"] = { fg = C.syntax.blue, bg = C.none },
+    ["@lsp.typemod.function.defaultLibrary.rust"] = { fg = C.syntax.text, bg = C.none },
+    ["@lsp.typemod.method.defaultLibrary.rust"] = { fg = C.syntax.blue, bg = C.none },
+    ["@lsp.typemod.function.global.rust"] = { fg = C.syntax.blue, bg = C.none },
+    ["@lsp.type.macro.rust"] = { fg = C.syntax.red, bg = C.none },
+    ["@lsp.type.function.rust"] = { fg = C.syntax.text, bg = C.none },
+    ["@lsp.type.namespace.rust"] = { link = "@namespace.rust" },
+    -- ["@lsp.type.struct.rust"] = { fg = C.syntax.cyan, bg = C.none },
+    -- ["@lsp.type.builtinType.rust"] = { fg = C.syntax.cyan, bg = C.none },
   }
 end
 

diff --git a/lua/astrotheme/groups/plugins/aerial.lua b/lua/astrotheme/groups/plugins/aerial.lua
@@ -11,10 +11,10 @@ local function callback()
     AerialFieldIcon = { link = "@field" },
     AerialFileIcon = { link = "@text.uri" },
     AerialFunctionIcon = { link = "@function" },
-    AerialGuide = { fg = C.subtext1 },
+    AerialGuide = { fg = C.syntax.subtext1 },
     AerialInterfaceIcon = { link = "@type" },
     AerialKeyIcon = { link = "@type" },
-    AerialLine = { fg = C.yellow, bg = C.none },
+    AerialLine = { fg = C.syntax.yellow, bg = C.none },
     AerialMethodIcon = { link = "@method" },
     AerialModuleIcon = { link = "@namespace" },
     AerialNamespaceIcon = { link = "@namespace" },

diff --git a/lua/astrotheme/groups/plugins/beacon.lua b/lua/astrotheme/groups/plugins/beacon.lua
@@ -1,3 +1,3 @@
-local function callback() return { Beacon = { bg = C.blue } } end
+local function callback() return { Beacon = { bg = C.syntax.blue } } end
 
 return callback
diff --git a/lua/astrotheme/groups/plugins/bufferline.lua b/lua/astrotheme/groups/plugins/bufferline.lua
@@ -1,17 +1,18 @@
 local function callback()
   return {
-    BufferLineBufferVisible = { fg = C.text, bg = C.base },
-    BufferLineBufferSelected = { fg = C.surface2, bg = C.base, bold = true },
-    BufferLineTab = { fg = C.surface0, bg = C.base },
-    BufferLineTabSelected = { fg = C.text, bg = C.base },
-    BufferLineTabClose = { fg = C.red, bg = C.base },
-    BufferLineIndicatorSelected = { fg = C.base, bg = C.base },
-    BufferLineCloseButtonVisible = { fg = C.surface0, bg = C.base },
-    BufferLineCloseButtonSelected = { fg = C.red, bg = C.base },
-    BufferLineModifiedVisible = { fg = C.text, bg = C.base },
-    BufferLineModifiedSelected = { fg = C.green, bg = C.base },
-    BufferLineError = { fg = C.alt_red, bg = C.alt_red },
-    BufferLineErrorDiagnostic = { fg = C.alt_red, bg = C.alt_red },
+    BufferLineBufferVisible = { fg = C.syntax.subtext0, bg = C.ui.base },
+    BufferLineBufferSelected = { fg = C.syntax.text, bg = C.ui.base, bold = true },
+    BufferLineTab = { fg = C.syntax.subtext1, bg = C.ui.tabline },
+    BufferLineTabSelected = { fg = C.syntax.text, bg = C.ui.tabline },
+    BufferLineTabClose = { fg = C.syntax.red, bg = C.ui.tabline },
+    BufferLineIndicatorSelected = { fg = C.ui.base, bg = C.ui.base },
+    BufferLineCloseButtonVisible = { fg = C.syntax.red, bg = C.tableline },
+    BufferLineCloseButtonSelected = { fg = C.syntax.red, bg = C.ui.tabline },
+    BufferLineModifiedVisible = { fg = C.syntax.text, bg = C.ui.base },
+    BufferLineModifiedSelected = { fg = C.ui.green, bg = C.ui.base },
+    BufferLineModified = { fg = C.ui.green, bg = C.ui.tabline },
+    BufferLineError = { fg = C.ui.red, bg = C.ui.red },
+    BufferLineErrorDiagnostic = { fg = C.ui.red, bg = C.ui.red },
   }
 end
 

diff --git a/lua/astrotheme/groups/plugins/dashboard-nvim.lua b/lua/astrotheme/groups/plugins/dashboard-nvim.lua
@@ -1,9 +1,9 @@
 local function callback()
   return {
-    DashboardHeader = { fg = C.cyan },
-    DashboardShortcut = { fg = C.yellow },
-    DashboardFooter = { fg = C.cyan },
-    DashboardCenter = { fg = C.blue },
+    DashboardHeader = { fg = C.syntax.cyan },
+    DashboardShortcut = { fg = C.syntax.yellow },
+    DashboardFooter = { fg = C.syntax.cyan },
+    DashboardCenter = { fg = C.syntax.blue },
   }
 end
 

diff --git a/lua/astrotheme/groups/plugins/flash.lua b/lua/astrotheme/groups/plugins/flash.lua
@@ -1,7 +1,7 @@
 local function callback()
   return {
-    FlashBackdrop = { fg = C.subtext0 },
-    FlashLabel = { fg = C.base, bg = C.orange, bold = true },
+    FlashBackdrop = { fg = C.syntax.subtext0 },
+    FlashLabel = { fg = C.ui.base, bg = C.ui.orange, bold = true },
   }
 end
 

diff --git a/lua/astrotheme/groups/plugins/gitsigns.lua b/lua/astrotheme/groups/plugins/gitsigns.lua
@@ -1,10 +1,10 @@
 local function callback()
   return {
-    GitSignsAdd = { fg = C.green, bg = C.none },
-    GitSignsChange = { fg = C.alt_orange, bg = C.none },
-    GitSignsDelete = { fg = C.alt_red, bg = C.none },
-    MoreMsg = { fg = C.green, bold = true },
-    ModeMsg = { fg = C.subtext1, bold = true },
+    GitSignsAdd = { fg = C.ui.green, bg = C.none },
+    GitSignsChange = { fg = C.ui.orange, bg = C.none },
+    GitSignsDelete = { fg = C.ui.red, bg = C.none },
+    MoreMsg = { fg = C.ui.green, bold = true },
+    ModeMsg = { fg = C.syntax.subtext1, bold = true },
   }
 end
 

diff --git a/lua/astrotheme/groups/plugins/hop.lua b/lua/astrotheme/groups/plugins/hop.lua
@@ -1,9 +1,9 @@
 local function callback()
   return {
-    HopNextKey = { fg = C.red, bold = true },
-    HopNextKey1 = { fg = C.cyan, bold = true },
-    HopNextKey2 = { fg = C.blue },
-    HopUnmatched = { fg = C.subtext1 },
+    HopNextKey = { fg = C.syntax.red, bold = true },
+    HopNextKey1 = { fg = C.syntax.cyan, bold = true },
+    HopNextKey2 = { fg = C.syntax.blue },
+    HopUnmatched = { fg = C.syntax.subtext1 },
   }
 end
 

diff --git a/lua/astrotheme/groups/plugins/indent_blankline.lua b/lua/astrotheme/groups/plugins/indent_blankline.lua
@@ -1,10 +1,10 @@
 local function callback()
   return {
-    IndentBlanklineSpaceChar = { fg = C.surface1, nocombine = true },
-    IndentBlanklineChar = { fg = C.surface1, nocombine = true },
-    IndentBlanklineContextStart = { fg = C.surface0, underline = true },
-    IndentBlanklineContextChar = { fg = C.surface0, nocombine = true },
-    IndentBlanklineSpaceCharBlankline = { fg = C.surface1, nocombine = true },
+    IndentBlanklineSpaceChar = { fg = C.syntax.subtext1, nocombine = true },
+    IndentBlanklineChar = { fg = C.syntax.subtext1, nocombine = true },
+    IndentBlanklineContextStart = { fg = C.syntax.subtext1, underline = true },
+    IndentBlanklineContextChar = { fg = C.syntax.subtext1, nocombine = true },
+    IndentBlanklineSpaceCharBlankline = { fg = C.syntax.subtext1, nocombine = true },
   }
 end
 

diff --git a/lua/astrotheme/groups/plugins/lightspeed.lua b/lua/astrotheme/groups/plugins/lightspeed.lua
@@ -1,13 +1,13 @@
 local function callback()
   return {
-    LightspeedLabel = { fg = C.alt_red, underline = true },
-    LightspeedLabelOverlapped = { fg = C.blue, underline = true },
-    LightspeedLabelDistant = { fg = C.alt_red, underline = true },
-    LightspeedLabelDistantOverlapped = { fg = C.alt_blue, underline = true },
-    LightspeedShortcut = { fg = C.mantle, bg = C.alt_red, bold = true, underline = true },
-    LightspeedShortcutOverlapped = { fg = C.mantle, bg = C.blue, bold = true, underline = true },
-    LightspeedMaskedChar = { fg = C.alt_green },
-    LightspeedUnlabeledMatch = { fg = C.surface2, bold = true },
+    LightspeedLabel = { fg = C.ui.red, underline = true },
+    LightspeedLabelOverlapped = { fg = C.syntax.blue, underline = true },
+    LightspeedLabelDistant = { fg = C.ui.red, underline = true },
+    LightspeedLabelDistantOverlapped = { fg = C.ui.blue, underline = true },
+    LightspeedShortcut = { fg = C.ui.tool, bg = C.ui.red, bold = true, underline = true },
+    LightspeedShortcutOverlapped = { fg = C.ui.tool, bg = C.syntax.blue, bold = true, underline = true },
+    LightspeedMaskedChar = { fg = C.ui.green },
+    LightspeedUnlabeledMatch = { fg = C.syntax.text, bold = true },
     LightspeedUniqueChar = { link = "LightspeedUnlabeledMatch" },
     LightspeedGreyWash = { link = "Comment" },
     LightspeedOneCharMatch = { link = "LightspeedShortcut" },