Merge branch 'main' into refactor/config.lua

CHANGELOG.md

@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add proper `Description` inside `konsole` theme (bug from #33)
 - Lualine `normal` section background color set blue color #43
 - Kitty window border colors fix #47
+- refactored `lua/github-theme/config.lua`
 
 ## [v0.0.1] - 9 Jul 2021
 

lua/github-theme/config.lua

@@ -3,19 +3,11 @@ local config
 
 -- shim vim for kitty and other generators
 vim = vim or {g = {}, o = {}}
-vim.g.githubThemeStyle = "dark"
 
--- @return string
-local function getThemeStyle()
-  if vim.g.githubThemeStyle == nil then
-    return config.themeStyle
-  else
-    return vim.g.githubThemeStyle
-  end
-end
+vim.g.github_theme_style = "dark"
 
 config = {
-  themeStyle = getThemeStyle(),
+  themeStyle = vim.g.github_theme_style,
   transparent = false,
   commentStyle = "italic",
   keywordStyle = "italic",
@@ -37,9 +29,8 @@ local function applyConfiguration(userConfig)
     if value ~= nil then
       if config[key] ~= nil then
         config[key] = value
-        -- useful for `lualine`
-        if key == "themeStyle" and value ~= vim.g.githubThemeStyle then
-          vim.g.githubThemeStyle = value
+        if key == "themeStyle" and value ~= vim.g.github_theme_style then
+          vim.g.github_theme_style = value
         end
       else
         error("projekt0n/github-nvim-theme: Option " .. key .. " does not exist") -- luacheck: ignore
@@ -48,8 +39,4 @@ local function applyConfiguration(userConfig)
   end
 end
 
-return {
-  config = config,
-  applyConfiguration = applyConfiguration,
-  getThemeStyle = getThemeStyle
-}
+return {config = config, applyConfiguration = applyConfiguration}

lua/lualine/themes/github.lua

@@ -1,8 +1,6 @@
 local configModule = require("github-theme.config")
 
 local config = configModule.config
-config.themeStyle = configModule.getThemeStyle()
-
 local colors = require("github-theme.colors").setup(config)
 
 return {