galaxyline will follow theme colors, still need themes that support these hl groups tho

2 files changed, 84 insertions, 46 deletions

diff --git a/lua/lv-galaxyline/init.lua b/lua/lv-galaxyline/init.lua
index 685d38e7..fece7a04 100644
--- a/lua/lv-galaxyline/init.lua
+++ b/lua/lv-galaxyline/init.lua
@@ -102,9 +102,10 @@ table.insert(gls.left, {
                 t = colors.blue
             }
             vim.api.nvim_command('hi GalaxyViMode guifg=' .. mode_color[vim.fn.mode()])
-            return '▊ '
+            return '▊'
         end,
-        highlight = {colors.red, colors.bg}
+        -- highlight = 'TabLineSel'
+        -- highlight = {colors.red, colors.bg}
     }
 })
 -- print(vim.fn.getbufvar(0, 'ts'))
@@ -113,12 +114,12 @@ vim.fn.getbufvar(0, 'ts')
 table.insert(gls.left, {
     GitIcon = {
         provider = function()
-            return ' '
+            return '  '
         end,
         condition = condition.check_git_workspace,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.orange, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineGit'
     }
 })
 
@@ -127,8 +128,8 @@ table.insert(gls.left, {
         provider = 'GitBranch',
         condition = condition.check_git_workspace,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -137,7 +138,7 @@ table.insert(gls.left, {
         provider = 'DiffAdd',
         condition = condition.hide_in_width,
         icon = '  ',
-        highlight = {colors.green, colors.bg}
+        highlight = 'StatusLineGitAdd'
     }
 })
 
@@ -146,7 +147,7 @@ table.insert(gls.left, {
         provider = 'DiffModified',
         condition = condition.hide_in_width,
         icon = ' 柳',
-        highlight = {colors.blue, colors.bg}
+        highlight = 'StatusLineGitChange'
     }
 })
 
@@ -155,30 +156,52 @@ table.insert(gls.left, {
         provider = 'DiffRemove',
         condition = condition.hide_in_width,
         icon = '  ',
-        highlight = {colors.red, colors.bg}
+        highlight = 'StatusLineGitDelete'
     }
 })
 
 table.insert(gls.right, {
-    DiagnosticError = {provider = 'DiagnosticError', icon = '  ', highlight = {colors.error_red, colors.bg}}
+    DiagnosticError = {provider = 'DiagnosticError', icon = '  ', 
+        highlight = 'StatusLineLspDiagnosticsError'
+    }
 })
-table.insert(gls.right, {DiagnosticWarn = {provider = 'DiagnosticWarn', icon = '  ', highlight = {colors.orange, colors.bg}}})
+table.insert(gls.right, {DiagnosticWarn = {provider = 'DiagnosticWarn', icon = '  ', 
+
+
+        highlight = 'StatusLineLspDiagnosticsWarning'
+
+
+}})
+
+
+table.insert(gls.right, {DiagnosticInfo = {provider = 'DiagnosticInfo', icon = '  ', 
+
+    highlight = 'StatusLineLspDiagnosticsInformation'
+
+
+}})
+
+
 
 table.insert(gls.right, {
-    DiagnosticHint = {provider = 'DiagnosticHint', icon = '  ', highlight = {colors.vivid_blue, colors.bg}}
-})
+    DiagnosticHint = {provider = 'DiagnosticHint', icon = '  ', 
+
 
-table.insert(gls.right, {DiagnosticInfo = {provider = 'DiagnosticInfo', icon = '  ', highlight = {colors.info_yellow, colors.bg}}})
+        highlight = 'StatusLineLspDiagnosticsHint'
+
+
+    }
+})
 
 table.insert(gls.right, {
     TreesitterIcon = {
         provider = function()
-            if next(vim.treesitter.highlighter.active) ~= nil then return ' ' end
+            if next(vim.treesitter.highlighter.active) ~= nil then return '  ' end
             return ''
         end,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.green, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineTreeSitter'
     }
 })
 
@@ -220,7 +243,7 @@ table.insert(gls.right, {
             return true
         end,
         icon = '  ',
-        highlight = {colors.grey, colors.bg}
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -228,8 +251,8 @@ table.insert(gls.right, {
     LineInfo = {
         provider = 'LineColumn',
         separator = '  ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -237,8 +260,8 @@ table.insert(gls.right, {
     PerCent = {
         provider = 'LinePercent',
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -249,8 +272,8 @@ table.insert(gls.right, {
         end,
         condition = condition.hide_in_width,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -259,8 +282,8 @@ table.insert(gls.right, {
         provider = 'FileTypeName',
         condition = condition.hide_in_width,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -269,8 +292,8 @@ table.insert(gls.right, {
         provider = 'FileEncode',
         condition = condition.hide_in_width,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -280,8 +303,8 @@ table.insert(gls.right, {
             return ' '
         end,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.orange, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -289,13 +312,18 @@ table.insert(gls.short_line_left, {
     BufferType = {
         provider = 'FileTypeName',
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
 table.insert(gls.short_line_left, {
-    SFileName = {provider = 'SFileName', condition = condition.buffer_not_empty, highlight = {colors.grey, colors.bg}}
+    SFileName = {provider = 'SFileName', condition = condition.buffer_not_empty, 
+
+        highlight = 'StatusLineNC'
+
+
+    }
 })
 
 --table.insert(gls.short_line_right[1] = {BufferIcon = {provider = 'BufferIcon', highlight = {colors.grey, colors.bg}}})
diff --git a/lua/lv-themes/spacegray.lua b/lua/lv-themes/spacegray.lua
index d21c0037..ef4ecc17 100644
--- a/lua/lv-themes/spacegray.lua
+++ b/lua/lv-themes/spacegray.lua
@@ -307,18 +307,28 @@ local theme = lush(function()
         markdownItalic {fg = "NONE", gui = "italic"}, -- flutter-tools.nvim
         FlutterWidgetGuides {fg = c.gray.li(10)}, -- statusline
 
-        StatusLine {bg = c.bg1, fg = c.white},
-        StatusLineNC {bg = c.bg1, fg = c.gray},
-        StatusLineMode {bg = c.gray, fg = c.bg, gui = "bold"},
-        StatusLineDeco {bg = c.bg2, fg = c.yellow},
-        StatusLineLCol {bg = c.bg2, fg = c.white},
-        StatusLineLColAlt {bg = c.bg1, fg = c.white},
-        StatusLineFT {bg = c.bg2, fg = c.white},
-        StatusLineFTAlt {bg = c.bg2, fg = c.white},
-        StatusLineGit {bg = c.gray, fg = c.bg},
-        StatusLineGitAlt {bg = c.gray, fg = c.bg},
-        StatusLineLSP {bg = c.bg1, fg = c.gray.li(25)},
-        StatusLineFileName {bg = c.bg1, fg = c.white, gui = "bold"},
+        StatusLine {bg = c.bg1, fg = c.white}, -- status line of current window
+        StatusLineNC {bg = c.bg1, fg = c.light_gray}, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
+        StatusLineSeparator {bg = c.bg1, fg = "NONE"},
+        StatusLineGit {bg = c.bg1, fg = c.orange},
+        StatusLineGitAdd {bg = c.bg1, fg = c.green},
+        StatusLineGitChange {bg = c.bg1, fg = c.blue},
+        StatusLineGitDelete {bg = c.bg1, fg = c.red},
+        StatusLineLspDiagnosticsError {bg = c.bg1, fg = c.error_red, gui = "NONE"},
+        StatusLineLspDiagnosticsWarning {bg = c.bg1, fg = c.warning_orange, gui = "NONE"},
+        StatusLineLspDiagnosticsInformation {bg = c.bg1, fg = c.info_yellow, gui = "NONE"},
+        StatusLineLspDiagnosticsHint {bg = c.bg1, fg = c.hint_blue, gui = "NONE"},
+        StatusLineTreeSitter {bg = c.bg1, fg = c.green},
+
+        -- StatusLineMode {bg = c.gray, fg = c.bg, gui = "bold"},
+        -- StatusLineDeco {bg = c.bg2, fg = c.yellow},
+        -- StatusLineLCol {bg = c.bg2, fg = c.white},
+        -- StatusLineLColAlt {bg = c.bg1, fg = c.white},
+        -- StatusLineFT {bg = c.bg2, fg = c.white},
+        -- StatusLineFTAlt {bg = c.bg2, fg = c.white},
+        -- StatusLineGitAlt {bg = c.gray, fg = c.bg},
+        -- StatusLineLSP {bg = c.bg1, fg = c.gray.li(25)},
+        -- StatusLineFileName {bg = c.bg1, fg = c.white, gui = "bold"},
 
 
         -- lsp-trouble.nvim