Merge pull request #81 from ful1e5/main

fix: lualine colors with bg color support #80
projekt0n · Sep 21, 2021 · c321253 · c321253
2 parents 379d0d2 + 6fcc04d
commit c321253
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,13 +17,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `hide_inactive_statusline` default value is `true`
 - `dark_float` default value is `false`
 - feat: vim config support with "vim.g"
+- lualine colors refactored inside `colors.lua` (related to #80)
 
 ### Fixes
 
 - Fixed `diff` highlight colors for `dark_default` & `light_default`
 - Screenshots and docs updated #63 #16
 - #72 fixed
 - #73 fixed
+- #80 fixed
 
 ## [v0.0.2] - 15 Sep 2021
 

diff --git a/lua/github-theme/colors.lua b/lua/github-theme/colors.lua
@@ -530,6 +530,24 @@ function M.setup(config)
 
   }
 
+  -- lualine colors are configurable
+  colors.lualine = {
+    normal = {
+      a = {bg = colors.blue, fg = colors.bg},
+      b = {bg = colors.bg2, fg = colors.blue},
+      c = {bg = colors.bg, fg = colors.fg_light}
+    },
+    insert = {a = {bg = colors.green, fg = colors.bg}, b = {bg = colors.bg2, fg = colors.green}},
+    command = {a = {bg = colors.magenta, fg = colors.bg}, b = {bg = colors.bg2, fg = colors.magenta}},
+    visual = {a = {bg = colors.yellow, fg = colors.bg}, b = {bg = colors.bg2, fg = colors.yellow}},
+    replace = {a = {bg = colors.red, fg = colors.bg}, b = {bg = colors.bg2, fg = colors.red}},
+    inactive = {
+      a = {bg = colors.bg_statusline, fg = colors.green},
+      b = {bg = colors.bg_statusline, fg = colors.bg2, gui = "bold"},
+      c = {bg = colors.bg_statusline, fg = colors.bg2}
+    }
+  }
+
   -- EndOfBuffer colors are configurable
   colors.sidebar_eob = config.dark_sidebar and colors.bg2 or colors.bg
   colors.sidebar_eob = config.hide_end_of_buffer and colors.sidebar_eob or colors.fg_light

diff --git a/lua/lualine/themes/github.lua b/lua/lualine/themes/github.lua
@@ -3,19 +3,4 @@ local configModule = require("github-theme.config")
 local config = configModule.config
 local colors = require("github-theme.colors").setup(config)
 
-return {
-  normal = {
-    a = {bg = colors.blue, fg = colors.bg},
-    b = {bg = colors.bg2, fg = colors.blue},
-    c = {bg = colors.bg, fg = colors.fg_light}
-  },
-  insert = {a = {bg = colors.green, fg = colors.bg}, b = {bg = colors.bg2, fg = colors.green}},
-  command = {a = {bg = colors.magenta, fg = colors.bg}, b = {bg = colors.bg2, fg = colors.magenta}},
-  visual = {a = {bg = colors.yellow, fg = colors.bg}, b = {bg = colors.bg2, fg = colors.yellow}},
-  replace = {a = {bg = colors.red, fg = colors.bg}, b = {bg = colors.bg2, fg = colors.red}},
-  inactive = {
-    a = {bg = colors.bg_statusline, fg = colors.green},
-    b = {bg = colors.bg_statusline, fg = colors.bg2, gui = "bold"},
-    c = {bg = colors.bg_statusline, fg = colors.bg2}
-  }
-}
+return colors.lualine