feat: reuse common color in palettes

Author: ful1e5

CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - feat: Apply highlight's style using `types.HighlightStyle` type
 - refactor: color name changed 'term_fg' -> 'fg_term'
 - feat: suggest config in `vim.g` autocompletion
+- feat: reuse common color in palettes
 
 ### Fixes
 

Makefile

@@ -4,7 +4,7 @@ src = lua/github-theme
 
 terminal: $(src)/terminal
 	@lua $(src)/terminal/init.lua
-	
+
 fmt:
 	stylua --config-path stylua.toml --glob 'lua/**/*.lua' -- lua
 

lua/github-theme/palette.lua

@@ -7,7 +7,7 @@ palette.get_palette = function(theme_style)
   ---@type gt.ColorPalette
   local p
 
-  p = require('github-theme.palette.' .. theme_style)
+  p = require('github-theme.palette.' .. theme_style)()
   p.none = 'NONE'
   p.dev_icons = {
     blue = '#519aba',

lua/github-theme/palette/dark.lua

@@ -1,91 +1,95 @@
----@type gt.ColorPalette
-return {
-  -- Background Colors
-  bg = '#24292e',
-  bg2 = '#1f2428',
+return function()
+  ---@type gt.ColorPalette
+  local palette = {
+    -- Background Colors
+    bg = '#24292e',
+    bg2 = '#1f2428',
 
-  -- Foreground Colors
-  fg = '#c9d1d9',
-  fg_dark = '#666666',
-  fg_gutter = '#e1e4e8',
-  fg_light = '#d1d5da',
-  fg_term = '#d1d5da',
+    -- Foreground Colors
+    fg = '#c9d1d9',
+    fg_dark = '#666666',
+    fg_gutter = '#e1e4e8',
+    fg_light = '#d1d5da',
+    fg_term = '#d1d5da',
 
-  -- Background Highlights Colors
-  bg_highlight = '#2c313a',
-  bg_search = '#404030',
-  bg_visual = '#444c56',
-  bg_visual_selection = '#284566',
-  border = '#c9d1d9',
+    -- Background Highlights Colors
+    bg_highlight = '#2c313a',
+    bg_search = '#404030',
+    bg_visual = '#444c56',
+    bg_visual_selection = '#284566',
+    border = '#c9d1d9',
 
-  -- Cursor & LineNumber Colors
-  cursor = '#c8e1ff',
-  cursor_line_nr = '#e1e4e8',
-  line_nr = '#444d56',
+    -- Cursor & LineNumber Colors
+    cursor = '#c8e1ff',
+    cursor_line_nr = '#e1e4e8',
+    line_nr = '#444d56',
 
-  -- LSP & Diagnostic Colors
-  error = '#f97583',
-  warning = '#cca700',
-  info = '#75beff',
-  hint = '#eeeeb3',
-  lsp = { ref_txt = '#265459' },
+    -- LSP & Diagnostic Colors
+    error = '#f97583',
+    warning = '#cca700',
+    info = '#75beff',
+    hint = '#eeeeb3',
+    lsp = { ref_txt = '#265459' },
 
-  -- Auto-Complication Colors
-  pmenu = { bg = '#1f2428', sbar = '#32383e' },
+    -- Auto-Complication Colors
+    pmenu = { bg = '#1f2428', sbar = '#32383e' },
 
-  -- Git & Diff Colors
-  git = {
-    add = '#34d058',
-    change = '#e2c08d',
-    delete = '#ea4a5a',
-    conflict = '#ffab70',
-    ignore = '#6a737d',
-    renamed = '#73c991',
-  },
-  diff = {
-    add = '#244032',
-    add_fg = '#56d364',
-    change = '#341a00',
-    change_fg = '#e3b341',
-    delete = '#462c32',
-    delete_fg = '#f85149',
-  },
+    -- Git & Diff Colors
+    git = {
+      add = '#34d058',
+      change = '#e2c08d',
+      delete = '#ea4a5a',
+      conflict = '#ffab70',
+      ignore = '#6a737d',
+      renamed = '#73c991',
+    },
+    diff = {
+      add = '#244032',
+      add_fg = '#56d364',
+      change = '#341a00',
+      change_fg = '#e3b341',
+      delete = '#462c32',
+      delete_fg = '#f85149',
+    },
 
-  -- Syntax Colors
-  syntax = {
-    comment = '#6a737d',
-    constant = '#79b8ff',
-    string = '#9ecbff',
-    variable = '#79b8ff',
-    keyword = '#f97583',
-    func = '#b392f0',
-    func_param = '#e1e4e8',
-    match_paren_bg = '#25686c',
-    tag = '#85e89d',
-    html_arg = '#fdaeb7',
-    param = '#ffab70',
-    json_label = '#79b8ff',
-  },
+    -- Syntax Colors
+    syntax = {
+      comment = '#6a737d',
+      constant = '#79b8ff',
+      string = '#9ecbff',
+      variable = '#79b8ff',
+      keyword = '#f97583',
+      func = '#b392f0',
+      func_param = '#e1e4e8',
+      match_paren_bg = '#25686c',
+      tag = '#85e89d',
+      html_arg = '#fdaeb7',
+      param = '#ffab70',
+      json_label = '#79b8ff',
+    },
 
-  -- Terminal Colors
-  orange = '#d18616',
-  black = '#24292e',
-  bright_black = '#666666',
-  white = '#b1bac4',
-  bright_white = '#e5e5e5',
-  red = '#f14c4c',
-  bright_red = '#f14c4c',
-  green = '#23d18b',
-  bright_green = '#23d18b',
-  yellow = '#e2e210',
-  bright_yellow = '#f5f543',
-  blue = '#3b8eea',
-  bright_blue = '#3b8eea',
-  magenta = '#bc3fbc',
-  bright_magenta = '#d670d6',
-  cyan = '#29b7da',
-  bright_cyan = '#29b8db',
+    -- Terminal Colors
+    orange = '#d18616',
+    black = '#24292e',
+    bright_black = '#666666',
+    white = '#b1bac4',
+    bright_white = '#e5e5e5',
+    red = '#f14c4c',
+    bright_red = '#f14c4c',
+    green = '#23d18b',
+    bright_green = '#23d18b',
+    yellow = '#e2e210',
+    bright_yellow = '#f5f543',
+    blue = '#3b8eea',
+    bright_blue = '#3b8eea',
+    magenta = '#bc3fbc',
+    bright_magenta = '#d670d6',
+    cyan = '#29b7da',
+    bright_cyan = '#29b8db',
 
-  -- Plugin Colors
-  git_signs = { add = '#28a745', change = '#2188ff', delete = '#ea4a5a' },
-}
+    -- Plugin Colors
+    git_signs = { add = '#28a745', change = '#2188ff', delete = '#ea4a5a' },
+  }
+
+  return palette
+end

lua/github-theme/palette/dark_default.lua

@@ -1,91 +1,98 @@
----@type gt.ColorPalette
-return {
-  -- Background Colors
-  bg = '#0d1117',
-  bg2 = '#090c10',
+local util = require('github-theme.util')
+local dark_palette = require('github-theme.palette.dark')
 
-  -- foreground colors
-  fg = '#c9d1d9',
-  fg_dark = '#4d5566',
-  fg_gutter = '#c5c5c5',
-  fg_light = '#b3b1ad',
-  fg_term = '#b3b1ad',
+return function()
+  ---@type gt.ColorPalette
+  local palette = {
+    -- Background Colors
+    bg = '#0d1117',
+    bg2 = '#090c10',
 
-  -- Background Highlights Colors
-  bg_highlight = '#161b22',
-  bg_search = '#2c2b1c',
-  bg_visual = '#b3b1ad',
-  bg_visual_selection = '#163356',
-  border = '#b3b1ad',
+    -- foreground colors
+    -- fg = '#c9d1d9',
+    fg_dark = '#4d5566',
+    fg_gutter = '#c5c5c5',
+    fg_light = '#b3b1ad',
+    fg_term = '#b3b1ad',
 
-  -- Cursor & LineNumber Colors
-  cursor = '#73b7f2',
-  cursor_line_nr = '#c9d1d9',
-  line_nr = '#8b949e',
+    -- Background Highlights Colors
+    bg_highlight = '#161b22',
+    bg_search = '#2c2b1c',
+    bg_visual = '#b3b1ad',
+    bg_visual_selection = '#163356',
+    border = '#b3b1ad',
 
-  -- LSP & Diagnostic Colors
-  error = '#f85149',
-  warning = '#f0883e',
-  info = '#75beff',
-  hint = '#eeeeb3',
-  lsp = { ref_txt = '#164449' },
+    -- Cursor & LineNumber Colors
+    cursor = '#73b7f2',
+    cursor_line_nr = '#c9d1d9',
+    line_nr = '#8b949e',
 
-  -- Auto-Complication Colors
-  pmenu = { bg = '#161b22', sbar = '#31373d' },
+    -- LSP & Diagnostic Colors
+    error = '#f85149',
+    warning = '#f0883e',
+    -- info = '#75beff',
+    -- hint = '#eeeeb3',
+    lsp = { ref_txt = '#164449' },
 
-  -- Git & Diff Colors
-  git = {
-    add = '#56d364',
-    change = '#ac8934',
-    delete = '#f85149',
-    conflict = '#e3b341',
-    ignore = '#484f58',
-    renamed = '#73c991',
-  },
-  diff = {
-    add = '#244032',
-    add_fg = '#56d364',
-    change = '#341a00',
-    change_fg = '#e3b341',
-    delete = '#462c32',
-    delete_fg = '#f85149',
-  },
+    -- Auto-Complication Colors
+    pmenu = { bg = '#161b22', sbar = '#31373d' },
 
-  -- Syntax Colors
-  syntax = {
-    comment = '#8b949e',
-    constant = '#79c0ff',
-    string = '#A5D6FF',
-    variable = '#FFA657',
-    keyword = '#ff7b72',
-    func = '#d2a8ff',
-    func_param = '#c9d1d9',
-    match_paren_bg = '#105357',
-    tag = '#7ee787',
-    html_arg = '#ff7b72',
-    param = '#ffa657',
-    json_label = '#79c0ff',
-  },
+    -- Git & Diff Colors
+    git = {
+      add = '#56d364',
+      change = '#ac8934',
+      delete = '#f85149',
+      conflict = '#e3b341',
+      ignore = '#484f58',
+      -- renamed = '#73c991',
+    },
+    -- diff = {
+    --   add = '#244032',
+    --   add_fg = '#56d364',
+    --   change = '#341a00',
+    --   change_fg = '#e3b341',
+    --   delete = '#462c32',
+    --   delete_fg = '#f85149',
+    -- },
 
-  -- Terminal Colors
-  orange = '#d18616',
-  black = '#484f58',
-  bright_black = '#6e7681',
-  white = '#b1bac4',
-  bright_white = '#f0f6fc',
-  red = '#ff7b72',
-  bright_red = '#ffa198',
-  green = '#3fb950',
-  bright_green = '#56d364',
-  yellow = '#d29922',
-  bright_yellow = '#e3b341',
-  blue = '#58a6ff',
-  bright_blue = '#79c0ff',
-  magenta = '#bc8cff',
-  bright_magenta = '#d2a8ff',
-  cyan = '#39c5cf',
-  bright_cyan = '#56d4dd',
+    -- Syntax Colors
+    syntax = {
+      comment = '#8b949e',
+      -- constant = '#79c0ff',
+      string = '#a5d6ff',
+      variable = '#ffa657',
+      keyword = '#ff7b72',
+      func = '#d2a8ff',
+      func_param = '#c9d1d9',
+      match_paren_bg = '#105357',
+      tag = '#7ee787',
+      html_arg = '#ff7b72',
+      param = '#ffa657',
+      json_label = '#79c0ff',
+    },
 
-  -- Plugin Colors
-  git_signs = { add = '#196c2e', change = '#9e6a03', delete = '#b62324' },
-}
+    -- Terminal Colors
+    -- orange = '#d18616',
+    black = '#484f58',
+    bright_black = '#6e7681',
+    -- white = '#b1bac4',
+    bright_white = '#f0f6fc',
+    red = '#ff7b72',
+    bright_red = '#ffa198',
+    green = '#3fb950',
+    bright_green = '#56d364',
+    yellow = '#d29922',
+    bright_yellow = '#e3b341',
+    blue = '#58a6ff',
+    bright_blue = '#79c0ff',
+    magenta = '#bc8cff',
+    bright_magenta = '#d2a8ff',
+    cyan = '#39c5cf',
+    bright_cyan = '#56d4dd',
+
+    -- Plugin Colors
+    git_signs = { add = '#196c2e', change = '#9e6a03', delete = '#b62324' },
+  }
+
+  return util.color_overrides(dark_palette(), palette)
+end