diff --git a/autoload/lightline/colorscheme/neovim_dark.vim b/autoload/lightline/colorscheme/neovim_dark.vim
index cd7dfa7..3b3867d 100644
--- a/autoload/lightline/colorscheme/neovim_dark.vim
+++ b/autoload/lightline/colorscheme/neovim_dark.vim
@@ -1,23 +1,23 @@
" This file is auto-generated from lua/zenbones/template/lightline.lua
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
-let s:p.normal.left = [ [ "#9FBDD1", "#4B7C9B", "bold" ], [ "#9FBDD1", "#33566B" ] ]
-let s:p.normal.middle = [ [ "#C7D6D0", "#284253" ] ]
-let s:p.normal.right = [ [ "#9FBDD1", "#33566B" ], [ "#9FBDD1", "#33566B" ] ]
+let s:p.normal.left = [ [ "#83B4D2", "#4F6F82", "bold" ], [ "#83B4D2", "#334A57" ] ]
+let s:p.normal.middle = [ [ "#C6D5CF", "#273944" ] ]
+let s:p.normal.right = [ [ "#83B4D2", "#334A57" ], [ "#83B4D2", "#334A57" ] ]
let s:p.normal.warning = [ [ "#B77E64", "#362C28" ] ]
let s:p.normal.error = [ [ "#DE6E7C", "#3A2A2C" ] ]
-let s:p.inactive.left = [ [ "#D6E1DC", "#1F3441" ], [ "#D6E1DC", "#1F3441" ] ]
-let s:p.inactive.middle = [ [ "#D6E1DC", "#1F3441" ] ]
-let s:p.inactive.right = [ [ "#D6E1DC", "#1F3441" ] ]
+let s:p.inactive.left = [ [ "#D1E0DA", "#1F2E37" ], [ "#D1E0DA", "#1F2E37" ] ]
+let s:p.inactive.middle = [ [ "#D1E0DA", "#1F2E37" ] ]
+let s:p.inactive.right = [ [ "#D1E0DA", "#1F2E37" ] ]
-let s:p.insert.left = [ [ "#9FBDD1", "#455C6F", "bold" ], [ "#9FBDD1", "#33566B" ] ]
-let s:p.replace.left = [ [ "#9FBDD1", "#5B2E33", "bold" ], [ "#9FBDD1", "#33566B" ] ]
-let s:p.visual.left = [ [ "#9FBDD1", "#3A4A44", "bold" ], [ "#9FBDD1", "#33566B" ] ]
+let s:p.insert.left = [ [ "#83B4D2", "#455C6F", "bold" ], [ "#83B4D2", "#334A57" ] ]
+let s:p.replace.left = [ [ "#83B4D2", "#5B2E33", "bold" ], [ "#83B4D2", "#334A57" ] ]
+let s:p.visual.left = [ [ "#83B4D2", "#3D413F", "bold" ], [ "#83B4D2", "#334A57" ] ]
-let s:p.tabline.left = [ [ "#C7D6D0", "#33566B", "italic" ] ]
-let s:p.tabline.middle = [ [ "#D6E1DC", "#1F3441" ] ]
-let s:p.tabline.right = [ [ "#C7D6D0", "#33566B" ] ]
-let s:p.tabline.tabsel = [ [ "#C7D6D0", "#0F191F", "bold" ] ]
+let s:p.tabline.left = [ [ "#C6D5CF", "#334A57", "italic" ] ]
+let s:p.tabline.middle = [ [ "#D1E0DA", "#1F2E37" ] ]
+let s:p.tabline.right = [ [ "#C6D5CF", "#334A57" ] ]
+let s:p.tabline.tabsel = [ [ "#C6D5CF", "#0F191F", "bold" ] ]
let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p)
diff --git a/autoload/lightline/colorscheme/neovim_light.vim b/autoload/lightline/colorscheme/neovim_light.vim
index 236e8e3..b96311f 100644
--- a/autoload/lightline/colorscheme/neovim_light.vim
+++ b/autoload/lightline/colorscheme/neovim_light.vim
@@ -1,23 +1,23 @@
" This file is auto-generated from lua/zenbones/template/lightline.lua
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
-let s:p.normal.left = [ [ "#46624A", "#9AB79E", "bold" ], [ "#46624A", "#B1C8B5" ] ]
-let s:p.normal.middle = [ [ "#212F19", "#C0D3C3" ] ]
-let s:p.normal.right = [ [ "#46624A", "#B1C8B5" ], [ "#46624A", "#B1C8B5" ] ]
+let s:p.normal.left = [ [ "#4A4F4A", "#9BA69D", "bold" ], [ "#4A4F4A", "#ADB9AF" ] ]
+let s:p.normal.middle = [ [ "#202E18", "#BDCABF" ] ]
+let s:p.normal.right = [ [ "#4A4F4A", "#ADB9AF" ], [ "#4A4F4A", "#ADB9AF" ] ]
let s:p.normal.warning = [ [ "#944927", "#F0E6E4" ] ]
let s:p.normal.error = [ [ "#A8334C", "#E7DDDE" ] ]
-let s:p.inactive.left = [ [ "#597F43", "#CCDBCE" ], [ "#597F43", "#CCDBCE" ] ]
-let s:p.inactive.middle = [ [ "#597F43", "#CCDBCE" ] ]
-let s:p.inactive.right = [ [ "#597F43", "#CCDBCE" ] ]
+let s:p.inactive.left = [ [ "#4B663C", "#C8D5C9" ], [ "#4B663C", "#C8D5C9" ] ]
+let s:p.inactive.middle = [ [ "#4B663C", "#C8D5C9" ] ]
+let s:p.inactive.right = [ [ "#4B663C", "#C8D5C9" ] ]
-let s:p.insert.left = [ [ "#46624A", "#99C6E9", "bold" ], [ "#46624A", "#B1C8B5" ] ]
-let s:p.replace.left = [ [ "#46624A", "#E7CBCE", "bold" ], [ "#46624A", "#B1C8B5" ] ]
-let s:p.visual.left = [ [ "#46624A", "#D8E6D0", "bold" ], [ "#46624A", "#B1C8B5" ] ]
+let s:p.insert.left = [ [ "#4A4F4A", "#99C6E9", "bold" ], [ "#4A4F4A", "#ADB9AF" ] ]
+let s:p.replace.left = [ [ "#4A4F4A", "#E7CBCE", "bold" ], [ "#4A4F4A", "#ADB9AF" ] ]
+let s:p.visual.left = [ [ "#4A4F4A", "#B1EA90", "bold" ], [ "#4A4F4A", "#ADB9AF" ] ]
-let s:p.tabline.left = [ [ "#212F19", "#B1C8B5", "italic" ] ]
-let s:p.tabline.middle = [ [ "#597F43", "#CCDBCE" ] ]
-let s:p.tabline.right = [ [ "#212F19", "#B1C8B5" ] ]
-let s:p.tabline.tabsel = [ [ "#212F19", "#E7EEE8", "bold" ] ]
+let s:p.tabline.left = [ [ "#202E18", "#ADB9AF", "italic" ] ]
+let s:p.tabline.middle = [ [ "#4B663C", "#C8D5C9" ] ]
+let s:p.tabline.right = [ [ "#202E18", "#ADB9AF" ] ]
+let s:p.tabline.tabsel = [ [ "#202E18", "#E5EDE6", "bold" ] ]
let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p)
diff --git a/colors/neovim.lua b/colors/neovim.lua
index 8421353..2855091 100644
--- a/colors/neovim.lua
+++ b/colors/neovim.lua
@@ -11,4 +11,4 @@ package.loaded["zenbones.neovim"] = nil
-- include our theme file and pass it to lush to apply
require "lush"(require "zenbones.neovim")
-require("zenbones.neovim.terminal").setup()
+require("zenbones.neovim.term").setup()
diff --git a/extras/alacritty/neovim_dark.yml b/extras/alacritty/neovim_dark.yml
index 252ddf9..c17d00e 100644
--- a/extras/alacritty/neovim_dark.yml
+++ b/extras/alacritty/neovim_dark.yml
@@ -4,24 +4,24 @@ colors:
# Default colors
primary:
background: '#0F191F'
- foreground: '#C7D6D0'
+ foreground: '#C6D5CF'
# Normal colors
normal:
black: '#0F191F'
red: '#DE6E7C'
- green: '#8EFF6B'
+ green: '#90FF6B'
yellow: '#B77E64'
blue: '#6099C0'
magenta: '#B279A7'
cyan: '#66A5AD'
- white: '#C7D6D0'
+ white: '#C6D5CF'
# Bright colors
bright:
- black: '#264354'
+ black: '#263945'
red: '#E8838F'
- green: '#A1FF85'
+ green: '#A0FF85'
yellow: '#D68C67'
blue: '#61ABDA'
magenta: '#CF86C1'
cyan: '#65B8C1'
- white: '#92AFA3'
+ white: '#98A39E'
diff --git a/extras/alacritty/neovim_light.yml b/extras/alacritty/neovim_light.yml
index 0a508bc..cb8a23e 100644
--- a/extras/alacritty/neovim_light.yml
+++ b/extras/alacritty/neovim_light.yml
@@ -3,25 +3,25 @@
colors:
# Default colors
primary:
- background: '#E7EEE8'
- foreground: '#212F19'
+ background: '#E5EDE6'
+ foreground: '#202E18'
# Normal colors
normal:
- black: '#E7EEE8'
+ black: '#E5EDE6'
red: '#A8334C'
- green: '#567A30'
+ green: '#90FF6B'
yellow: '#944927'
blue: '#286486'
magenta: '#88507D'
cyan: '#3B8992'
- white: '#212F19'
+ white: '#202E18'
# Bright colors
bright:
- black: '#B9D0BC'
+ black: '#B3C6B6'
red: '#94253E'
- green: '#466522'
+ green: '#5AD500'
yellow: '#803D1C'
blue: '#1D5573'
magenta: '#7B3B70'
cyan: '#2B747C'
- white: '#4D6E3A'
+ white: '#415934'
diff --git a/extras/iterm/neovim_dark.itermcolors b/extras/iterm/neovim_dark.itermcolors
index 9d6f35c..5647c15 100644
--- a/extras/iterm/neovim_dark.itermcolors
+++ b/extras/iterm/neovim_dark.itermcolors
@@ -39,7 +39,7 @@
Green Component
1.0000000000000000
Red Component
- 0.6313725490196078
+ 0.6274509803921569
Ansi 11 Color
@@ -98,13 +98,13 @@
Alpha Component
1
Blue Component
- 0.6392156862745098
+ 0.6196078431372549
Color Space
sRGB
Green Component
- 0.6862745098039216
+ 0.6392156862745098
Red Component
- 0.5725490196078431
+ 0.5960784313725490
Ansi 2 Color
@@ -117,7 +117,7 @@
Green Component
1.0000000000000000
Red Component
- 0.5568627450980392
+ 0.5647058823529412
Ansi 3 Color
@@ -176,24 +176,24 @@
Alpha Component
1
Blue Component
- 0.8156862745098039
+ 0.8117647058823529
Color Space
sRGB
Green Component
- 0.8392156862745098
+ 0.8352941176470589
Red Component
- 0.7803921568627451
+ 0.7764705882352941
Ansi 8 Color
Alpha Component
1
Blue Component
- 0.3294117647058823
+ 0.2705882352941176
Color Space
sRGB
Green Component
- 0.2627450980392157
+ 0.2235294117647059
Red Component
0.1490196078431373
@@ -228,24 +228,24 @@
Alpha Component
1
Blue Component
- 0.5568627450980392
+ 0.4666666666666667
Color Space
sRGB
Green Component
- 0.4666666666666667
+ 0.4117647058823529
Red Component
- 0.3215686274509804
+ 0.3254901960784314
Bold Color
Alpha Component
1
Blue Component
- 0.3294117647058823
+ 0.2705882352941176
Color Space
sRGB
Green Component
- 0.2627450980392157
+ 0.2235294117647059
Red Component
0.1490196078431373
@@ -254,37 +254,37 @@
Alpha Component
1
Blue Component
- 0.8549019607843137
+ 0.8431372549019608
Color Space
sRGB
Green Component
- 0.8705882352941177
+ 0.8666666666666667
Red Component
- 0.8274509803921568
+ 0.8078431372549020
Cursor Guide Color
Alpha Component
1
Blue Component
- 0.1764705882352941
+ 0.1568627450980392
Color Space
sRGB
Green Component
- 0.1411764705882353
+ 0.1294117647058824
Red Component
- 0.0862745098039216
+ 0.0823529411764706
Cursor Text Color
Alpha Component
1
Blue Component
- 0.0941176470588235
+ 0.1019607843137255
Color Space
sRGB
Green Component
- 0.0745098039215686
+ 0.0784313725490196
Red Component
0.0470588235294118
@@ -293,13 +293,13 @@
Alpha Component
1
Blue Component
- 0.8156862745098039
+ 0.8117647058823529
Color Space
sRGB
Green Component
- 0.8392156862745098
+ 0.8352941176470589
Red Component
- 0.7803921568627451
+ 0.7764705882352941
Link Color
@@ -319,26 +319,26 @@
Alpha Component
1
Blue Component
- 0.8156862745098039
+ 0.8117647058823529
Color Space
sRGB
Green Component
- 0.8392156862745098
+ 0.8352941176470589
Red Component
- 0.7803921568627451
+ 0.7764705882352941
Selection Color
Alpha Component
1
Blue Component
- 0.2666666666666667
+ 0.2470588235294118
Color Space
sRGB
Green Component
- 0.2901960784313726
+ 0.2549019607843137
Red Component
- 0.2274509803921569
+ 0.2392156862745098
Tab Color
diff --git a/extras/iterm/neovim_light.itermcolors b/extras/iterm/neovim_light.itermcolors
index 8fd1631..a2a64cd 100644
--- a/extras/iterm/neovim_light.itermcolors
+++ b/extras/iterm/neovim_light.itermcolors
@@ -7,13 +7,13 @@
Alpha Component
1
Blue Component
- 0.9098039215686274
+ 0.9019607843137255
Color Space
sRGB
Green Component
- 0.9333333333333333
+ 0.9294117647058824
Red Component
- 0.9058823529411765
+ 0.8980392156862745
Ansi 1 Color
@@ -33,13 +33,13 @@
Alpha Component
1
Blue Component
- 0.1333333333333333
+ 0.0000000000000000
Color Space
sRGB
Green Component
- 0.3960784313725490
+ 0.8352941176470589
Red Component
- 0.2745098039215687
+ 0.3529411764705883
Ansi 11 Color
@@ -98,26 +98,26 @@
Alpha Component
1
Blue Component
- 0.2274509803921569
+ 0.2039215686274510
Color Space
sRGB
Green Component
- 0.4313725490196079
+ 0.3490196078431372
Red Component
- 0.3019607843137255
+ 0.2549019607843137
Ansi 2 Color
Alpha Component
1
Blue Component
- 0.1882352941176471
+ 0.4196078431372549
Color Space
sRGB
Green Component
- 0.4784313725490196
+ 1.0000000000000000
Red Component
- 0.3372549019607843
+ 0.5647058823529412
Ansi 3 Color
@@ -176,26 +176,26 @@
Alpha Component
1
Blue Component
- 0.0980392156862745
+ 0.0941176470588235
Color Space
sRGB
Green Component
- 0.1843137254901961
+ 0.1803921568627451
Red Component
- 0.1294117647058824
+ 0.1254901960784314
Ansi 8 Color
Alpha Component
1
Blue Component
- 0.7372549019607844
+ 0.7137254901960784
Color Space
sRGB
Green Component
- 0.8156862745098039
+ 0.7764705882352941
Red Component
- 0.7254901960784313
+ 0.7019607843137254
Ansi 9 Color
@@ -215,13 +215,13 @@
Alpha Component
1
Blue Component
- 0.9098039215686274
+ 0.9019607843137255
Color Space
sRGB
Green Component
- 0.9333333333333333
+ 0.9294117647058824
Red Component
- 0.9058823529411765
+ 0.8980392156862745
Badge Color
@@ -232,74 +232,74 @@
Color Space
sRGB
Green Component
- 0.6235294117647059
+ 0.5529411764705883
Red Component
- 0.5176470588235295
+ 0.5294117647058824
Bold Color
Alpha Component
1
Blue Component
- 0.7372549019607844
+ 0.7137254901960784
Color Space
sRGB
Green Component
- 0.8156862745098039
+ 0.7764705882352941
Red Component
- 0.7254901960784313
+ 0.7019607843137254
Cursor Color
Alpha Component
1
Blue Component
- 0.0980392156862745
+ 0.0941176470588235
Color Space
sRGB
Green Component
- 0.1843137254901961
+ 0.1803921568627451
Red Component
- 0.1294117647058824
+ 0.1254901960784314
Cursor Guide Color
Alpha Component
1
Blue Component
- 0.8666666666666667
+ 0.8470588235294118
Color Space
sRGB
Green Component
- 0.9019607843137255
+ 0.8901960784313725
Red Component
- 0.8588235294117647
+ 0.8392156862745098
Cursor Text Color
Alpha Component
1
Blue Component
- 0.9333333333333333
+ 0.9176470588235294
Color Space
sRGB
Green Component
- 0.9490196078431372
+ 0.9372549019607843
Red Component
- 0.9294117647058824
+ 0.9137254901960784
Foreground Color
Alpha Component
1
Blue Component
- 0.0980392156862745
+ 0.0941176470588235
Color Space
sRGB
Green Component
- 0.1843137254901961
+ 0.1803921568627451
Red Component
- 0.1294117647058824
+ 0.1254901960784314
Link Color
@@ -319,39 +319,39 @@
Alpha Component
1
Blue Component
- 0.0980392156862745
+ 0.0941176470588235
Color Space
sRGB
Green Component
- 0.1843137254901961
+ 0.1803921568627451
Red Component
- 0.1294117647058824
+ 0.1254901960784314
Selection Color
Alpha Component
1
Blue Component
- 0.8156862745098039
+ 0.5647058823529412
Color Space
sRGB
Green Component
- 0.9019607843137255
+ 0.9176470588235294
Red Component
- 0.8470588235294118
+ 0.6941176470588235
Tab Color
Alpha Component
1
Blue Component
- 0.9098039215686274
+ 0.9019607843137255
Color Space
sRGB
Green Component
- 0.9333333333333333
+ 0.9294117647058824
Red Component
- 0.9058823529411765
+ 0.8980392156862745
\ No newline at end of file
diff --git a/extras/kitty/neovim_dark.conf b/extras/kitty/neovim_dark.conf
index 46ef880..5114ed7 100644
--- a/extras/kitty/neovim_dark.conf
+++ b/extras/kitty/neovim_dark.conf
@@ -6,35 +6,35 @@
## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/neovim_dark.conf
background #0F191F
-foreground #C7D6D0
-selection_background #3A4A44
-selection_foreground #C7D6D0
+foreground #C6D5CF
+selection_background #3D413F
+selection_foreground #C6D5CF
url_color #61ABDA
-cursor #C7D6D0
+cursor #C6D5CF
# Tabs
active_tab_background #73516C
-active_tab_foreground #C7D6D0
-inactive_tab_background #284253
-inactive_tab_foreground #C7D6D0
+active_tab_foreground #C6D5CF
+inactive_tab_background #273944
+inactive_tab_foreground #C6D5CF
#tab_bar_background ${tab_bar_background}
# normal
color0 #0F191F
color1 #DE6E7C
-color2 #8EFF6B
+color2 #90FF6B
color3 #B77E64
color4 #6099C0
color5 #B279A7
color6 #66A5AD
-color7 #C7D6D0
+color7 #C6D5CF
# bright
-color8 #264354
+color8 #263945
color9 #E8838F
-color10 #A1FF85
+color10 #A0FF85
color11 #D68C67
color12 #61ABDA
color13 #CF86C1
color14 #65B8C1
-color15 #92AFA3
+color15 #98A39E
diff --git a/extras/kitty/neovim_light.conf b/extras/kitty/neovim_light.conf
index 6880e49..5164754 100644
--- a/extras/kitty/neovim_light.conf
+++ b/extras/kitty/neovim_light.conf
@@ -5,36 +5,36 @@
## author: Michael Chris Lopez
## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/neovim_light.conf
-background #E7EEE8
-foreground #212F19
-selection_background #D8E6D0
-selection_foreground #212F19
+background #E5EDE6
+foreground #202E18
+selection_background #B1EA90
+selection_foreground #202E18
url_color #1D5573
-cursor #212F19
+cursor #202E18
# Tabs
active_tab_background #D2A6C8
-active_tab_foreground #212F19
-inactive_tab_background #C0D3C3
-inactive_tab_foreground #212F19
+active_tab_foreground #202E18
+inactive_tab_background #BDCABF
+inactive_tab_foreground #202E18
#tab_bar_background ${tab_bar_background}
# normal
-color0 #E7EEE8
+color0 #E5EDE6
color1 #A8334C
-color2 #567A30
+color2 #90FF6B
color3 #944927
color4 #286486
color5 #88507D
color6 #3B8992
-color7 #212F19
+color7 #202E18
# bright
-color8 #B9D0BC
+color8 #B3C6B6
color9 #94253E
-color10 #466522
+color10 #5AD500
color11 #803D1C
color12 #1D5573
color13 #7B3B70
color14 #2B747C
-color15 #4D6E3A
+color15 #415934
diff --git a/extras/tmux/neovim_dark.tmux b/extras/tmux/neovim_dark.tmux
index 4593f7e..90296a3 100644
--- a/extras/tmux/neovim_dark.tmux
+++ b/extras/tmux/neovim_dark.tmux
@@ -1,18 +1,18 @@
# This file is auto-generated from lua/zenbones/template/tmux.lua
set -g status-left ' #[fg=#B279A7,bold]#{s/root//:client_key_table} '
set -g status-right '#[fg=#B279A7,bold] [#S]#[fg=#B279A7,bold] [%d/%m] #[fg=#B279A7,bold][%I:%M%p] '
-set -g status-style fg='#B279A7',bg='#C7D6D0'
+set -g status-style fg='#B279A7',bg='#C6D5CF'
-set -g window-status-current-style fg='#B279A7',bg='#C7D6D0',bold
+set -g window-status-current-style fg='#B279A7',bg='#C6D5CF',bold
set -g pane-border-style fg='#B279A7'
set -g pane-active-border-style fg='#B279A7'
-set -g message-style fg='#0F191F',bg='#3A4A44'
+set -g message-style fg='#0F191F',bg='#3D413F'
set -g display-panes-active-colour '#B279A7'
set -g display-panes-colour '#B279A7'
set -g clock-mode-colour '#B279A7'
-set -g mode-style fg='#0F191F',bg='#3A4A44'
+set -g mode-style fg='#0F191F',bg='#3D413F'
diff --git a/extras/tmux/neovim_light.tmux b/extras/tmux/neovim_light.tmux
index cb723e6..0b089d6 100644
--- a/extras/tmux/neovim_light.tmux
+++ b/extras/tmux/neovim_light.tmux
@@ -1,18 +1,18 @@
# This file is auto-generated from lua/zenbones/template/tmux.lua
set -g status-left ' #[fg=#88507D,bold]#{s/root//:client_key_table} '
set -g status-right '#[fg=#88507D,bold] [#S]#[fg=#88507D,bold] [%d/%m] #[fg=#88507D,bold][%I:%M%p] '
-set -g status-style fg='#88507D',bg='#212F19'
+set -g status-style fg='#88507D',bg='#202E18'
-set -g window-status-current-style fg='#88507D',bg='#212F19',bold
+set -g window-status-current-style fg='#88507D',bg='#202E18',bold
set -g pane-border-style fg='#88507D'
set -g pane-active-border-style fg='#88507D'
-set -g message-style fg='#E7EEE8',bg='#D8E6D0'
+set -g message-style fg='#E5EDE6',bg='#B1EA90'
set -g display-panes-active-colour '#88507D'
set -g display-panes-colour '#88507D'
set -g clock-mode-colour '#88507D'
-set -g mode-style fg='#E7EEE8',bg='#D8E6D0'
+set -g mode-style fg='#E5EDE6',bg='#B1EA90'
diff --git a/extras/wezterm/Neovim_dark.toml b/extras/wezterm/Neovim_dark.toml
index fb8851e..4c1aba5 100644
--- a/extras/wezterm/Neovim_dark.toml
+++ b/extras/wezterm/Neovim_dark.toml
@@ -1,13 +1,13 @@
# This file is auto-generated from lua/zenbones/template/wezterm.lua
# Neovim_dark
[colors]
-foreground = "#C7D6D0"
+foreground = "#C6D5CF"
background = "#0F191F"
-cursor_bg = "#D3DEDA"
-cursor_border = "#0C1318"
-cursor_fg = "#0C1318"
-selection_bg = "#3A4A44"
-selection_fg = "#C7D6D0"
+cursor_bg = "#CEDDD7"
+cursor_border = "#0C141A"
+cursor_fg = "#0C141A"
+selection_bg = "#3D413F"
+selection_fg = "#C6D5CF"
-ansi = ["#0F191F", "#DE6E7C", "#8EFF6B", "#B77E64", "#6099C0", "#B279A7", "#66A5AD", "#C7D6D0"]
-brights = ["#264354", "#E8838F", "#A1FF85", "#D68C67", "#61ABDA", "#CF86C1", "#65B8C1", "#92AFA3"]
+ansi = ["#0F191F", "#DE6E7C", "#90FF6B", "#B77E64", "#6099C0", "#B279A7", "#66A5AD", "#C6D5CF"]
+brights = ["#263945", "#E8838F", "#A0FF85", "#D68C67", "#61ABDA", "#CF86C1", "#65B8C1", "#98A39E"]
diff --git a/extras/wezterm/Neovim_light.toml b/extras/wezterm/Neovim_light.toml
index 606cd9f..81d72e9 100644
--- a/extras/wezterm/Neovim_light.toml
+++ b/extras/wezterm/Neovim_light.toml
@@ -1,13 +1,13 @@
# This file is auto-generated from lua/zenbones/template/wezterm.lua
# Neovim_light
[colors]
-foreground = "#212F19"
-background = "#E7EEE8"
-cursor_bg = "#212F19"
-cursor_border = "#EDF2EE"
-cursor_fg = "#EDF2EE"
-selection_bg = "#D8E6D0"
-selection_fg = "#212F19"
+foreground = "#202E18"
+background = "#E5EDE6"
+cursor_bg = "#202E18"
+cursor_border = "#E9EFEA"
+cursor_fg = "#E9EFEA"
+selection_bg = "#B1EA90"
+selection_fg = "#202E18"
-ansi = ["#E7EEE8", "#A8334C", "#567A30", "#944927", "#286486", "#88507D", "#3B8992", "#212F19"]
-brights = ["#B9D0BC", "#94253E", "#466522", "#803D1C", "#1D5573", "#7B3B70", "#2B747C", "#4D6E3A"]
+ansi = ["#E5EDE6", "#A8334C", "#90FF6B", "#944927", "#286486", "#88507D", "#3B8992", "#202E18"]
+brights = ["#B3C6B6", "#94253E", "#5AD500", "#803D1C", "#1D5573", "#7B3B70", "#2B747C", "#415934"]
diff --git a/lua/lualine/themes/neovim_dark.lua b/lua/lualine/themes/neovim_dark.lua
index 3b55cc9..637a50b 100644
--- a/lua/lualine/themes/neovim_dark.lua
+++ b/lua/lualine/themes/neovim_dark.lua
@@ -1,13 +1,13 @@
-- This file is auto-generated from lua/zenbones/template/lualine.lua
-local common_fg = "#9FBDD1"
-local inactive_bg = "#1F3441"
-local inactive_fg = "#D6E1DC"
+local common_fg = "#83B4D2"
+local inactive_bg = "#1F2E37"
+local inactive_fg = "#D1E0DA"
return {
normal = {
- a = { bg = "#4B7C9B", fg = common_fg, gui = "bold" },
- b = { bg = "#33566B", fg = common_fg },
- c = { bg = "#284253", fg = "#C7D6D0" },
+ a = { bg = "#4F6F82", fg = common_fg, gui = "bold" },
+ b = { bg = "#334A57", fg = common_fg },
+ c = { bg = "#273944", fg = "#C6D5CF" },
},
insert = {
@@ -19,7 +19,7 @@ return {
},
visual = {
- a = { bg = "#3A4A44", fg = common_fg, gui = "bold" },
+ a = { bg = "#3D413F", fg = common_fg, gui = "bold" },
},
replace = {
diff --git a/lua/lualine/themes/neovim_light.lua b/lua/lualine/themes/neovim_light.lua
index c746f23..a8bcf0a 100644
--- a/lua/lualine/themes/neovim_light.lua
+++ b/lua/lualine/themes/neovim_light.lua
@@ -1,13 +1,13 @@
-- This file is auto-generated from lua/zenbones/template/lualine.lua
-local common_fg = "#46624A"
-local inactive_bg = "#CCDBCE"
-local inactive_fg = "#597F43"
+local common_fg = "#4A4F4A"
+local inactive_bg = "#C8D5C9"
+local inactive_fg = "#4B663C"
return {
normal = {
- a = { bg = "#9AB79E", fg = common_fg, gui = "bold" },
- b = { bg = "#B1C8B5", fg = common_fg },
- c = { bg = "#C0D3C3", fg = "#212F19" },
+ a = { bg = "#9BA69D", fg = common_fg, gui = "bold" },
+ b = { bg = "#ADB9AF", fg = common_fg },
+ c = { bg = "#BDCABF", fg = "#202E18" },
},
insert = {
@@ -19,7 +19,7 @@ return {
},
visual = {
- a = { bg = "#D8E6D0", fg = common_fg, gui = "bold" },
+ a = { bg = "#B1EA90", fg = common_fg, gui = "bold" },
},
replace = {
diff --git a/lua/zenbones/neovim/init.lua b/lua/zenbones/neovim/init.lua
index 0b9d400..ac6582d 100644
--- a/lua/zenbones/neovim/init.lua
+++ b/lua/zenbones/neovim/init.lua
@@ -1,30 +1,28 @@
local lush = require "lush"
-local hsl = lush.hsl
+local util = require "zenbones.util"
+local hsluv = lush.hsluv
--- modify base palette (before requiring specs)
-local palette = require "zenbones.neovim.palette"
+local base_name = util.bg_to_base_name()
+local p = require("zenbones.neovim.palette")[base_name]
+
+local specs = require(base_name .. ".specs").generate(p, util.resolve_config(base_name))
-- extend specs using Lush
-local base_name = require("zenbones.util").bg_to_base_name()
-local theme = require(base_name)
-local specs
if base_name == "zenbones" then
- specs = lush.extends({ theme }).with(function()
+ return lush.extends({ specs }).with(function()
return {
- helpHyperTextJump { fg = hsl "#195174" }, -- --link-color
+ helpHyperTextJump { fg = hsluv "#195174" }, -- --link-color
helpOption { helpHyperTextJump },
markdownUrl { helpHyperTextJump },
}
end)
else
- specs = lush.extends({ theme }).with(function()
+ return lush.extends({ specs }).with(function()
return {
- FloatBorder { fg = hsl "#203f57" }, -- --border-color
- helpHyperTextJump { fg = hsl "#8ec77e" }, -- --link-color
+ FloatBorder { fg = hsluv "#203f57" }, -- --border-color
+ helpHyperTextJump { fg = hsluv "#8ec77e" }, -- --link-color
helpOption { helpHyperTextJump },
markdownUrl { helpHyperTextJump },
}
end)
end
-
-return specs
diff --git a/lua/zenbones/neovim/palette.lua b/lua/zenbones/neovim/palette.lua
index 6bf5a25..3cc649a 100644
--- a/lua/zenbones/neovim/palette.lua
+++ b/lua/zenbones/neovim/palette.lua
@@ -1,18 +1,21 @@
local lush = require "lush"
-local hsl = lush.hsl
+local hsluv = lush.hsluv
-local base_name = require("zenbones.util").bg_to_base_name()
-local palette = require(base_name .. ".palette")
+local M = {}
-if base_name == "zenbones" then
- -- palette.bg = hsl "#d3e4db" -- --accent-bg-color
- palette.bg = hsl "#e7eee8" -- --bg-color
- palette.fg = hsl "#202e18" -- --accent-color
- palette.leaf = palette.leaf.sa(24).li(8) -- need to make green more prominent
-else
- palette.bg = hsl "#0f191f" -- --bg-color
- palette.fg = hsl "#c7d6d0" -- --fg-color
- palette.leaf = hsl "#8fff6d" -- --accent-color
-end
+local zenbones = vim.tbl_extend("keep", {
+ -- bg = hsluv "#d3e4db" -- --accent-bg-color
+ bg = hsluv "#e7eee8", -- --bg-color
+ fg = hsluv "#202e18", -- --accent-color
+ leaf = hsluv "#8fff6d", -- need to make green more prominent
+}, require "zenbones.palette")
+M.zenbones = zenbones
-return palette
+local zenflesh = vim.tbl_extend("keep", {
+ bg = hsluv "#0f191f", -- --bg-color
+ fg = hsluv "#c7d6d0", -- --fg-color
+ leaf = hsluv "#8fff6d", -- --accent-color
+}, require "zenflesh.palette")
+M.zenflesh = zenflesh
+
+return M
diff --git a/lua/zenbones/neovim/term.lua b/lua/zenbones/neovim/term.lua
new file mode 100644
index 0000000..a2fd297
--- /dev/null
+++ b/lua/zenbones/neovim/term.lua
@@ -0,0 +1,51 @@
+local palette = require "zenbones.neovim.palette"
+
+local M = { colors = {} }
+
+local p = palette.zenbones
+M.colors.zenbones = {
+ p.bg,
+ p.rose,
+ p.leaf,
+ p.wood,
+ p.water,
+ p.blossom,
+ p.sky,
+ p.fg,
+ p.bg.sa(4).da(16),
+ p.rose.sa(20).da(16),
+ p.leaf.sa(20).da(16),
+ p.wood.sa(18).da(16),
+ p.water.sa(20).da(16),
+ p.blossom.sa(24).da(16),
+ p.sky.sa(20).da(16),
+ p.fg.li(22),
+}
+
+p = palette.zenflesh
+M.colors.zenflesh = {
+ p.bg,
+ p.rose,
+ p.leaf,
+ p.wood,
+ p.water,
+ p.blossom,
+ p.sky,
+ p.fg,
+ p.bg.sa(4).li(16),
+ p.rose.sa(20).li(16),
+ p.leaf.sa(20).li(16),
+ p.wood.sa(18).li(16),
+ p.water.sa(20).li(16),
+ p.blossom.sa(24).li(16),
+ p.sky.sa(20).li(16),
+ p.fg.da(22),
+}
+
+function M.setup(base_name)
+ for i, v in ipairs(M.colors[base_name]) do
+ vim.g["terminal_color_" .. (i - 1)] = v.hex
+ end
+end
+
+return M
diff --git a/lua/zenbones/neovim/terminal.lua b/lua/zenbones/neovim/terminal.lua
deleted file mode 100644
index 6d0afe9..0000000
--- a/lua/zenbones/neovim/terminal.lua
+++ /dev/null
@@ -1 +0,0 @@
-return require(require("zenbones.util").bg_to_base_name() .. ".terminal")