refactor: minify colorscheme files in colors/*.vim

Refactor and centralize all of the duplicated logic in each of the vim
files in `colors/*.vim` into `require('github-theme').load()`. This
removes duplication and moves all of the logic to Lua (file) where it is
easier to maintain.

Remove the deprecated 'github_dimmed' theme. This has been deprecated
for over a year now, so it is probably a good idea to remove it. Plus it
just wastes space and pollutes cmdline completion with an erroneous
value/theme.

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 ## [unreleased]
 
+### Changes
+
+-  Minimized colorscheme files in `colors/*.vim` and refactored-out duplicated logic
+-  Removed the long-since deprecated `github_dimmed` theme (use `github_dark_dimmed` instead)
+
 ### Issues Fix
 
 -  Fixed JSX/TSX tags are missing highlights with nvim 0.10 (#360)

colors/github_dark.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_dark')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_dark' })

colors/github_dark_colorblind.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_dark_colorblind')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_dark_colorblind' })

colors/github_dark_default.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_dark_default')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_dark_default' })

colors/github_dark_dimmed.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_dark_dimmed')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_dark_dimmed' })

colors/github_dark_high_contrast.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_dark_high_contrast')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_dark_high_contrast' })

colors/github_dark_tritanopia.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_dark_tritanopia')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_dark_tritanopia' })

colors/github_light.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_light')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_light' })

colors/github_light_colorblind.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_light_colorblind')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_light_colorblind' })

colors/github_light_default.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_light_default')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_light_default' })

colors/github_light_high_contrast.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_light_high_contrast')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_light_high_contrast' })

colors/github_light_tritanopia.vim

@@ -1,9 +1 @@
-lua << EOF
-
-if vim.g.github_theme_debug then
-  require('github-theme.util.reload')()
-end
-require('github-theme.config').set_theme('github_light_tritanopia')
-require('github-theme').load()
-
-EOF
+lua require('github-theme').load({ theme = 'github_light_tritanopia' })

lua/github-theme/config.lua

@@ -150,8 +150,6 @@ local defaults = {
   },
 }
 
-M.options = collect.deep_copy(defaults)
-
 M.module_names = {
   'cmp',
   'coc',
@@ -193,6 +191,7 @@ end
 
 function M.reset()
   M.options = collect.deep_copy(defaults)
+  return M
 end
 
 function M.get_compiled_info(opts)
@@ -203,8 +202,7 @@ function M.get_compiled_info(opts)
 end
 
 function M.hash()
-  local hash = require('github-theme.lib.hash')(M.options)
-  return hash or 0
+  return require('github-theme.lib.hash')(M.options) or 0
 end
 
-return M
+return M.reset()

lua/github-theme/init.lua

@@ -74,6 +74,15 @@ end
 
 function M.load(opts)
   opts = opts or {}
+
+  if vim.g.github_theme_debug then
+    require('github-theme.util.reload')()
+  end
+
+  if opts.theme then
+    require('github-theme.config').set_theme(opts.theme)
+  end
+
   local _, compiled_file = config.get_compiled_info(opts)
   local f = loadfile(compiled_file)