From 4c561e0aa24649eb1131f49a05ef23e470840fff Mon Sep 17 00:00:00 2001 From: Karim Mk Date: Tue, 19 Mar 2024 23:32:47 +0100 Subject: [PATCH 1/5] Add Gruvfox. A theme based on Gruvbox Hard. --- autoload/lightline/colorscheme/gruvfox.vim | 8 ++ colors/gruvfox.vim | 9 ++ lua/lualine/themes/gruvfox.lua | 1 + lua/nightfox/palette.lua | 1 + lua/nightfox/palette/gruvfox.lua | 117 +++++++++++++++++++++ 5 files changed, 136 insertions(+) create mode 100644 autoload/lightline/colorscheme/gruvfox.vim create mode 100644 colors/gruvfox.vim create mode 100644 lua/lualine/themes/gruvfox.lua create mode 100644 lua/nightfox/palette/gruvfox.lua diff --git a/autoload/lightline/colorscheme/gruvfox.vim b/autoload/lightline/colorscheme/gruvfox.vim new file mode 100644 index 00000000..13fe2057 --- /dev/null +++ b/autoload/lightline/colorscheme/gruvfox.vim @@ -0,0 +1,8 @@ +if has('nvim') + let s:p = v:lua.require('nightfox.util.lightline').generate('gruvfox') +else + lua nightfox_vim = require('nightfox.util.lightline').dump('gruvfox') + let s:palette_str = luaeval('nightfox_vim') + let s:p = eval(s:palette_str) +endif +let g:lightline#colorscheme#duskfox#palette = lightline#colorscheme#fill(s:p) diff --git a/colors/gruvfox.vim b/colors/gruvfox.vim new file mode 100644 index 00000000..fd0bc959 --- /dev/null +++ b/colors/gruvfox.vim @@ -0,0 +1,9 @@ +lua << EOF +-- Useful when debugging +if vim.g.nightfox_debug then + require("nightfox.util.reload")() +end + +require("nightfox.config").set_fox("gruvfox") +require("nightfox").load() +EOF diff --git a/lua/lualine/themes/gruvfox.lua b/lua/lualine/themes/gruvfox.lua new file mode 100644 index 00000000..825940eb --- /dev/null +++ b/lua/lualine/themes/gruvfox.lua @@ -0,0 +1 @@ +return require("nightfox.util.lualine")("gruvfox") diff --git a/lua/nightfox/palette.lua b/lua/nightfox/palette.lua index 0a828d87..e8e0d2c4 100644 --- a/lua/nightfox/palette.lua +++ b/lua/nightfox/palette.lua @@ -41,6 +41,7 @@ M.foxes = { "dawnfox", "dayfox", "duskfox", + "gruvfox", "nightfox", "nordfox", "terafox", diff --git a/lua/nightfox/palette/gruvfox.lua b/lua/nightfox/palette/gruvfox.lua new file mode 100644 index 00000000..48efd19d --- /dev/null +++ b/lua/nightfox/palette/gruvfox.lua @@ -0,0 +1,117 @@ +local C = require("nightfox.lib.color") +local Shade = require("nightfox.lib.shade") + +local meta = { + name = "gruvfox", + light = false, +} + +-- stylua: ignore +local palette = { + black = Shade.new("#282828", 0, 0), + red = Shade.new("#fb4934", 0, 0), + green = Shade.new("#b8bb26", 0, 0), + yellow = Shade.new("#fabd2f", 0, 0), + blue = Shade.new("#83a598", 0, 0), + magenta = Shade.new("#d3869b", 0, 0), + cyan = Shade.new("#8ec07c", 0, 0), + white = Shade.new("#ebdbb2", 0, 0), + orange = Shade.new("#f28019", 0, 0), + pink = Shade.new("#b16286", 0, 0), + + comment = "#928374", + + bg0 = "#141617", -- Dark bg (status line and float) + bg1 = "#1d2021", -- Default bg + bg2 = "#282828", -- Lighter bg (colorcolm folds) + bg3 = "#3c3836", -- Lighter bg (cursor line) + bg4 = "#3c3836", -- Conceal, border fg + + fg0 = "#fbf1c7", -- Lighter fg + fg1 = "#ebdbb2", -- Default fg + fg2 = "#d5c4a1", -- Darker fg (status line) + fg3 = "#bdae93", -- Darker fg (line numbers, fold colums) + + sel0 = "#3c3836", -- Popup bg, visual selection bg + sel1 = "#665C54", -- Popup sel bg, search bg +} + +local function generate_spec(pal) + -- stylua: ignore start + local spec = { + bg0 = pal.bg0, -- Dark bg (status line and float) + bg1 = pal.bg1, -- Default bg + bg2 = pal.bg2, -- Lighter bg (colorcolm folds) + bg3 = pal.bg3, -- Lighter bg (cursor line) + bg4 = pal.bg4, -- Conceal, border fg + + fg0 = pal.fg0, -- Lighter fg + fg1 = pal.fg1, -- Default fg + fg2 = pal.fg2, -- Darker fg (status line) + fg3 = pal.fg3, -- Darker fg (line numbers, fold colums) + + sel0 = pal.sel0, -- Popup bg, visual selection bg + sel1 = pal.sel1, -- Popup sel bg, search bg + } + + spec.syntax = { + bracket = spec.fg2, -- Brackets and Punctuation + builtin0 = pal.red.base, -- Builtin variable + builtin1 = pal.cyan.bright, -- Builtin type + builtin2 = pal.orange.bright, -- Builtin const + builtin3 = pal.red.bright, -- Not used + comment = pal.comment, -- Comment + conditional = pal.magenta.bright, -- Conditional and loop + const = pal.orange.bright, -- Constants, imports and booleans + dep = spec.fg3, -- Deprecated + field = pal.blue.base, -- Field + func = pal.blue.bright, -- Functions and Titles + ident = pal.cyan.base, -- Identifiers + keyword = pal.magenta.base, -- Keywords + number = pal.orange.base, -- Numbers + operator = spec.fg2, -- Operators + preproc = pal.pink.bright, -- PreProc + regex = pal.yellow.bright, -- Regex + statement = pal.magenta.base, -- Statements + string = pal.green.base, -- Strings + type = pal.yellow.base, -- Types + variable = pal.white.base, -- Variables + } + + spec.diag = { + error = pal.red.base, + warn = pal.yellow.base, + info = pal.blue.base, + hint = pal.green.base, + ok = pal.green.base, + } + + spec.diag_bg = { + error = C(spec.bg1):blend(C(spec.diag.error), 0.2):to_css(), + warn = C(spec.bg1):blend(C(spec.diag.warn), 0.2):to_css(), + info = C(spec.bg1):blend(C(spec.diag.info), 0.2):to_css(), + hint = C(spec.bg1):blend(C(spec.diag.hint), 0.2):to_css(), + ok = C(spec.bg1):blend(C(spec.diag.ok), 0.2):to_css(), + } + + spec.diff = { + add = C(spec.bg1):blend(C(pal.green.dim), 0.15):to_css(), + delete = C(spec.bg1):blend(C(pal.red.dim), 0.15):to_css(), + change = C(spec.bg1):blend(C(pal.blue.dim), 0.15):to_css(), + text = C(spec.bg1):blend(C(pal.cyan.dim), 0.2):to_css(), + } + + spec.git = { + add = pal.green.base, + removed = pal.red.base, + changed = pal.yellow.base, + conflict = pal.orange.base, + ignored = pal.comment, + } + + -- stylua: ignore start + + return spec +end + +return { meta = meta, palette = palette, generate_spec = generate_spec } From c15f37084a675ae1d0afc165f3bcdda313c73c8a Mon Sep 17 00:00:00 2001 From: Karim Mk Date: Tue, 19 Mar 2024 23:40:33 +0100 Subject: [PATCH 2/5] Generate the extra themes. --- extra/gruvfox/alacritty.toml | 79 +++++++++ extra/gruvfox/base16.yaml | 18 ++ extra/gruvfox/gruvfox.Xresources | 21 +++ extra/gruvfox/gruvfox.fish | 35 ++++ extra/gruvfox/gruvfox.ghostty | 32 ++++ extra/gruvfox/gruvfox.itermcolors | 262 ++++++++++++++++++++++++++++ extra/gruvfox/gruvfox.nu | 43 +++++ extra/gruvfox/gruvfox.tmux | 23 +++ extra/gruvfox/kitty.conf | 50 ++++++ extra/gruvfox/konsole.colorscheme | 95 ++++++++++ extra/gruvfox/warp.yaml | 26 +++ extra/gruvfox/wezterm.toml | 69 ++++++++ extra/gruvfox/windows_terminal.json | 23 +++ extra/zellij/nightfox.kdl | 13 ++ 14 files changed, 789 insertions(+) create mode 100644 extra/gruvfox/alacritty.toml create mode 100644 extra/gruvfox/base16.yaml create mode 100644 extra/gruvfox/gruvfox.Xresources create mode 100644 extra/gruvfox/gruvfox.fish create mode 100644 extra/gruvfox/gruvfox.ghostty create mode 100644 extra/gruvfox/gruvfox.itermcolors create mode 100644 extra/gruvfox/gruvfox.nu create mode 100644 extra/gruvfox/gruvfox.tmux create mode 100644 extra/gruvfox/kitty.conf create mode 100644 extra/gruvfox/konsole.colorscheme create mode 100644 extra/gruvfox/warp.yaml create mode 100644 extra/gruvfox/wezterm.toml create mode 100644 extra/gruvfox/windows_terminal.json diff --git a/extra/gruvfox/alacritty.toml b/extra/gruvfox/alacritty.toml new file mode 100644 index 00000000..ee0278e0 --- /dev/null +++ b/extra/gruvfox/alacritty.toml @@ -0,0 +1,79 @@ +# Nightfox Alacritty Colors +## name: gruvfox +## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/gruvfox/alacritty.toml + +[colors.primary] +background = "#1d2021" +foreground = "#ebdbb2" +dim_foreground = "#d5c4a1" +bright_foreground = "#fbf1c7" + +[colors.cursor] +text = "#ebdbb2" +cursor = "#d5c4a1" + +[colors.vi_mode_cursor] +text = "#ebdbb2" +cursor = "#8ec07c" + +[colors.search.matches] +foreground = "#ebdbb2" +background = "#665C54" + +[colors.search.focused_match] +foreground = "#ebdbb2" +background = "#b8bb26" + +[colors.footer_bar] +foreground = "#ebdbb2" +background = "#3c3836" + +[colors.hints.start] +foreground = "#ebdbb2" +background = "#f28019" + +[colors.hints.end] +foreground = "#ebdbb2" +background = "#3c3836" + +[colors.selection] +text = "#ebdbb2" +background = "#3c3836" + +[colors.normal] +black = "#282828" +red = "#fb4934" +green = "#b8bb26" +yellow = "#fabd2f" +blue = "#83a598" +magenta = "#d3869b" +cyan = "#8ec07c" +white = "#ebdbb2" + +[colors.bright] +black = "#282828" +red = "#fb4934" +green = "#b8bb26" +yellow = "#fabd2f" +blue = "#83a598" +magenta = "#d3869b" +cyan = "#8ec07c" +white = "#ebdbb2" + +[colors.dim] +black = "#282828" +red = "#fb4934" +green = "#b8bb26" +yellow = "#fabd2f" +blue = "#83a598" +magenta = "#d3869b" +cyan = "#8ec07c" +white = "#ebdbb2" + +[[colors.indexed_colors]] +index = 16 +color = "#f28019" + +[[colors.indexed_colors]] +index = 17 +color = "#b16286" diff --git a/extra/gruvfox/base16.yaml b/extra/gruvfox/base16.yaml new file mode 100644 index 00000000..c5d654b5 --- /dev/null +++ b/extra/gruvfox/base16.yaml @@ -0,0 +1,18 @@ +scheme: "gruvfox" +author: "EdenEast" +base00: "1d2021" +base01: "282828" +base02: "3c3836" +base03: "282828" +base04: "bdae93" +base05: "ebdbb2" +base06: "d5c4a1" +base07: "ebdbb2" +base08: "fb4934" +base09: "f28019" +base0A: "fabd2f" +base0B: "b8bb26" +base0C: "8ec07c" +base0D: "83a598" +base0E: "d3869b" +base0F: "b16286" diff --git a/extra/gruvfox/gruvfox.Xresources b/extra/gruvfox/gruvfox.Xresources new file mode 100644 index 00000000..1a8fbbfc --- /dev/null +++ b/extra/gruvfox/gruvfox.Xresources @@ -0,0 +1,21 @@ +! Nightfox colors for Xresources +! Style: gruvfox +! Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/gruvfox/gruvfox.Xresources +*background: #1d2021 +*foreground: #ebdbb2 +*color0: #282828 +*color1: #fb4934 +*color2: #b8bb26 +*color3: #fabd2f +*color4: #83a598 +*color5: #d3869b +*color6: #8ec07c +*color7: #ebdbb2 +*color8: #282828 +*color9: #fb4934 +*color10: #b8bb26 +*color11: #fabd2f +*color12: #83a598 +*color13: #d3869b +*color14: #8ec07c +*color15: #ebdbb2 diff --git a/extra/gruvfox/gruvfox.fish b/extra/gruvfox/gruvfox.fish new file mode 100644 index 00000000..9566751e --- /dev/null +++ b/extra/gruvfox/gruvfox.fish @@ -0,0 +1,35 @@ +# Nightfox Color Palette +# Style: gruvfox +# Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/gruvfox/gruvfox.fish +set -l foreground ebdbb2 +set -l selection 3c3836 +set -l comment 928374 +set -l red fb4934 +set -l orange f28019 +set -l yellow fabd2f +set -l green b8bb26 +set -l purple d3869b +set -l cyan 8ec07c +set -l pink b16286 + +# Syntax Highlighting Colors +set -g fish_color_normal $foreground +set -g fish_color_command $cyan +set -g fish_color_keyword $pink +set -g fish_color_quote $yellow +set -g fish_color_redirection $foreground +set -g fish_color_end $orange +set -g fish_color_error $red +set -g fish_color_param $purple +set -g fish_color_comment $comment +set -g fish_color_selection --background=$selection +set -g fish_color_search_match --background=$selection +set -g fish_color_operator $green +set -g fish_color_escape $pink +set -g fish_color_autosuggestion $comment + +# Completion Pager Colors +set -g fish_pager_color_progress $comment +set -g fish_pager_color_prefix $cyan +set -g fish_pager_color_completion $foreground +set -g fish_pager_color_description $comment diff --git a/extra/gruvfox/gruvfox.ghostty b/extra/gruvfox/gruvfox.ghostty new file mode 100644 index 00000000..fdd284ee --- /dev/null +++ b/extra/gruvfox/gruvfox.ghostty @@ -0,0 +1,32 @@ +# Nightfox colors for Ghostty +## name: gruvfox +## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/gruvfox/gruvfox.ghostty + +background = #1d2021 +foreground = #ebdbb2 +selection-background = #3c3836 +selection-foreground = #ebdbb2 +cursor-color = #ebdbb2 + +# normal +palette = 0=#282828 +palette = 1=#fb4934 +palette = 2=#b8bb26 +palette = 3=#fabd2f +palette = 4=#83a598 +palette = 5=#d3869b +palette = 6=#8ec07c +palette = 7=#ebdbb2 + +# bright +palette = 8=#282828 +palette = 9=#fb4934 +palette = 10=#b8bb26 +palette = 11=#fabd2f +palette = 12=#83a598 +palette = 13=#d3869b +palette = 14=#8ec07c +palette = 15=#ebdbb2 + +# extended colors +palette = 16=#f28019 diff --git a/extra/gruvfox/gruvfox.itermcolors b/extra/gruvfox/gruvfox.itermcolors new file mode 100644 index 00000000..18e382e6 --- /dev/null +++ b/extra/gruvfox/gruvfox.itermcolors @@ -0,0 +1,262 @@ + + + + + + + + Ansi 0 Color + + Color Space + sRGB + Blue Component + 0.15686274509804 + Green Component + 0.15686274509804 + Red Component + 0.15686274509804 + + Ansi 1 Color + + Color Space + sRGB + Blue Component + 0.20392156862745 + Green Component + 0.28627450980392 + Red Component + 0.9843137254902 + + Ansi 10 Color + + Color Space + sRGB + Blue Component + 0.14901960784314 + Green Component + 0.73333333333333 + Red Component + 0.72156862745098 + + Ansi 11 Color + + Color Space + sRGB + Blue Component + 0.1843137254902 + Green Component + 0.74117647058824 + Red Component + 0.98039215686275 + + Ansi 12 Color + + Color Space + sRGB + Blue Component + 0.59607843137255 + Green Component + 0.64705882352941 + Red Component + 0.51372549019608 + + Ansi 13 Color + + Color Space + sRGB + Blue Component + 0.6078431372549 + Green Component + 0.52549019607843 + Red Component + 0.82745098039216 + + Ansi 14 Color + + Color Space + sRGB + Blue Component + 0.48627450980392 + Green Component + 0.75294117647059 + Red Component + 0.55686274509804 + + Ansi 15 Color + + Color Space + sRGB + Blue Component + 0.69803921568627 + Green Component + 0.85882352941176 + Red Component + 0.92156862745098 + + Ansi 2 Color + + Color Space + sRGB + Blue Component + 0.14901960784314 + Green Component + 0.73333333333333 + Red Component + 0.72156862745098 + + Ansi 3 Color + + Color Space + sRGB + Blue Component + 0.1843137254902 + Green Component + 0.74117647058824 + Red Component + 0.98039215686275 + + Ansi 4 Color + + Color Space + sRGB + Blue Component + 0.59607843137255 + Green Component + 0.64705882352941 + Red Component + 0.51372549019608 + + Ansi 5 Color + + Color Space + sRGB + Blue Component + 0.6078431372549 + Green Component + 0.52549019607843 + Red Component + 0.82745098039216 + + Ansi 6 Color + + Color Space + sRGB + Blue Component + 0.48627450980392 + Green Component + 0.75294117647059 + Red Component + 0.55686274509804 + + Ansi 7 Color + + Color Space + sRGB + Blue Component + 0.69803921568627 + Green Component + 0.85882352941176 + Red Component + 0.92156862745098 + + Ansi 8 Color + + Color Space + sRGB + Blue Component + 0.15686274509804 + Green Component + 0.15686274509804 + Red Component + 0.15686274509804 + + Ansi 9 Color + + Color Space + sRGB + Blue Component + 0.20392156862745 + Green Component + 0.28627450980392 + Red Component + 0.9843137254902 + + Background Color + + Color Space + sRGB + Blue Component + 0.12941176470588 + Green Component + 0.12549019607843 + Red Component + 0.11372549019608 + + Bold Color + + Color Space + sRGB + Blue Component + 0.69803921568627 + Green Component + 0.85882352941176 + Red Component + 0.92156862745098 + + Cursor Color + + Color Space + sRGB + Blue Component + 0.69803921568627 + Green Component + 0.85882352941176 + Red Component + 0.92156862745098 + + Cursor Text Color + + Color Space + sRGB + Blue Component + 0.12941176470588 + Green Component + 0.12549019607843 + Red Component + 0.11372549019608 + + Foreground Color + + Color Space + sRGB + Blue Component + 0.69803921568627 + Green Component + 0.85882352941176 + Red Component + 0.92156862745098 + + Selected Text Color + + Color Space + sRGB + Blue Component + 0.69803921568627 + Green Component + 0.85882352941176 + Red Component + 0.92156862745098 + + Selection Color + + Color Space + sRGB + Blue Component + 0.21176470588235 + Green Component + 0.21960784313725 + Red Component + 0.23529411764706 + + + diff --git a/extra/gruvfox/gruvfox.nu b/extra/gruvfox/gruvfox.nu new file mode 100644 index 00000000..66631cb2 --- /dev/null +++ b/extra/gruvfox/gruvfox.nu @@ -0,0 +1,43 @@ +let gruvfox_theme = { + binary: "#f28019" + block: "#d5c4a1" + bool: "#f28019" + cellpath: "#ebdbb2" + date: "#b8bb26" + duration: "#b8bb26" + filesize: "#f28019" + float: "#f28019" + int: "#f28019" + list: "#d5c4a1" + nothing: "#ebdbb2" + range: "#ebdbb2" + record: "#ebdbb2" + string: "#b8bb26" + + leading_trailing_space_bg: "#3c3836" + header: "#d5c4a1" + empty: "#83a598" + row_index: "#bdae93" + hints: "#bdae93" + separator: "#928374" + + shape_block: "#d5c4a1" + shape_bool: "#f28019" + shape_external: "#d3869b" + shape_externalarg: "#ebdbb2" + shape_filepath: "#ebdbb2" + shape_flag: "#8ec07c" + shape_float: "#f28019" + shape_globpattern: "#fabd2f" + shape_int: "#f28019" + shape_internalcall: "#d3869b" + shape_list: "#d5c4a1" + shape_literal: "#b8bb26" + shape_nothing: "#8ec07c" + shape_operator: "#d5c4a1" + shape_record: "#d5c4a1" + shape_string: "#b8bb26" + shape_string_interpolation: "#fabd2f" + shape_table: "#d5c4a1" + shape_variable: "#ebdbb2" +} diff --git a/extra/gruvfox/gruvfox.tmux b/extra/gruvfox/gruvfox.tmux new file mode 100644 index 00000000..58d1e13c --- /dev/null +++ b/extra/gruvfox/gruvfox.tmux @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# Nightfox colors for Tmux +# Style: gruvfox +# Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/gruvfox/gruvfox.tmux +set -g mode-style "fg=#141617,bg=#d5c4a1" +set -g message-style "fg=#141617,bg=#d5c4a1" +set -g message-command-style "fg=#141617,bg=#d5c4a1" +set -g pane-border-style "fg=#d5c4a1" +set -g pane-active-border-style "fg=#83a598" +set -g status "on" +set -g status-justify "left" +set -g status-style "fg=#d5c4a1,bg=#141617" +set -g status-left-length "100" +set -g status-right-length "100" +set -g status-left-style NONE +set -g status-right-style NONE +set -g status-left "#[fg=#141617,bg=#83a598,bold] #S #[fg=#83a598,bg=#141617,nobold,nounderscore,noitalics]" +set -g status-right "#[fg=#141617,bg=#141617,nobold,nounderscore,noitalics]#[fg=#83a598,bg=#141617] #{prefix_highlight} #[fg=#d5c4a1,bg=#141617,nobold,nounderscore,noitalics]#[fg=#141617,bg=#d5c4a1] %Y-%m-%d  %I:%M %p #[fg=#83a598,bg=#d5c4a1,nobold,nounderscore,noitalics]#[fg=#141617,bg=#83a598,bold] #h " +setw -g window-status-activity-style "underscore,fg=#bdae93,bg=#141617" +setw -g window-status-separator "" +setw -g window-status-style "NONE,fg=#bdae93,bg=#141617" +setw -g window-status-format "#[fg=#141617,bg=#141617,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#141617,bg=#141617,nobold,nounderscore,noitalics]" +setw -g window-status-current-format "#[fg=#141617,bg=#d5c4a1,nobold,nounderscore,noitalics]#[fg=#141617,bg=#d5c4a1,bold] #I  #W #F #[fg=#d5c4a1,bg=#141617,nobold,nounderscore,noitalics]" diff --git a/extra/gruvfox/kitty.conf b/extra/gruvfox/kitty.conf new file mode 100644 index 00000000..361a4eab --- /dev/null +++ b/extra/gruvfox/kitty.conf @@ -0,0 +1,50 @@ +# Nightfox colors for Kitty +## name: gruvfox +## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/gruvfox/kitty.conf + +background #1d2021 +foreground #ebdbb2 +selection_background #3c3836 +selection_foreground #ebdbb2 +cursor_text_color #1d2021 +url_color #b8bb26 + +# Cursor +# uncomment for reverse background +# cursor none +cursor #ebdbb2 + +# Border +active_border_color #83a598 +inactive_border_color #3c3836 +bell_border_color #f28019 + +# Tabs +active_tab_background #83a598 +active_tab_foreground #141617 +inactive_tab_background #3c3836 +inactive_tab_foreground #928374 + +# normal +color0 #282828 +color1 #fb4934 +color2 #b8bb26 +color3 #fabd2f +color4 #83a598 +color5 #d3869b +color6 #8ec07c +color7 #ebdbb2 + +# bright +color8 #282828 +color9 #fb4934 +color10 #b8bb26 +color11 #fabd2f +color12 #83a598 +color13 #d3869b +color14 #8ec07c +color15 #ebdbb2 + +# extended colors +color16 #f28019 +color17 #b16286 diff --git a/extra/gruvfox/konsole.colorscheme b/extra/gruvfox/konsole.colorscheme new file mode 100644 index 00000000..b9cace7a --- /dev/null +++ b/extra/gruvfox/konsole.colorscheme @@ -0,0 +1,95 @@ +[Background] +Color=29,32,33 + +[BackgroundFaint] +Color=20,22,23 + +[BackgroundIntense] +Color=60,56,54 + +[Color0] +Color=40,40,40 + +[Color0Faint] +Color=40,40,40 + +[Color0Intense] +Color=40,40,40 + +[Color1] +Color=251,73,52 + +[Color1Faint] +Color=251,73,52 + +[Color1Intense] +Color=251,73,52 + +[Color2] +Color=184,187,38 + +[Color2Faint] +Color=184,187,38 + +[Color2Intense] +Color=184,187,38 + +[Color3] +Color=250,189,47 + +[Color3Faint] +Color=250,189,47 + +[Color3Intense] +Color=250,189,47 + +[Color4] +Color=131,165,152 + +[Color4Faint] +Color=131,165,152 + +[Color4Intense] +Color=131,165,152 + +[Color5] +Color=211,134,155 + +[Color5Faint] +Color=211,134,155 + +[Color5Intense] +Color=211,134,155 + +[Color6] +Color=142,192,124 + +[Color6Faint] +Color=142,192,124 + +[Color6Intense] +Color=142,192,124 + +[Color7] +Color=235,219,178 + +[Color7Faint] +Color=235,219,178 + +[Color7Intense] +Color=235,219,178 + +[Foreground] +Color=235,219,178 + +[ForegroundFaint] +Color=213,196,161 + +[ForegroundIntense] +Color=251,241,199 + +[General] +Blur=false +ColorRandomization=false +Description=Nightfox +Opacity=1 diff --git a/extra/gruvfox/warp.yaml b/extra/gruvfox/warp.yaml new file mode 100644 index 00000000..3afb57d7 --- /dev/null +++ b/extra/gruvfox/warp.yaml @@ -0,0 +1,26 @@ +# Nightfox Warp Colors +# Style: gruvfox +# Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/gruvfox/warp.yaml +accent: '#ebdbb2' +background: '#1d2021' +foreground: '#ebdbb2' +details: 'darker' +terminal_colors: + normal: + black: '#282828' + red: '#fb4934' + green: '#b8bb26' + yellow: '#fabd2f' + blue: '#83a598' + magenta: '#d3869b' + cyan: '#8ec07c' + white: '#ebdbb2' + bright: + black: '#282828' + red: '#fb4934' + green: '#b8bb26' + yellow: '#fabd2f' + blue: '#83a598' + magenta: '#d3869b' + cyan: '#8ec07c' + white: '#ebdbb2' diff --git a/extra/gruvfox/wezterm.toml b/extra/gruvfox/wezterm.toml new file mode 100644 index 00000000..6434d952 --- /dev/null +++ b/extra/gruvfox/wezterm.toml @@ -0,0 +1,69 @@ +[metadata] +name = "gruvfox" +author = "EdenEast" +origin_url = "https://github.com/EdenEast/nightfox.nvim" + +[colors] +foreground = "#ebdbb2" +background = "#1d2021" +cursor_bg = "#ebdbb2" +cursor_border = "#ebdbb2" +cursor_fg = "#1d2021" +compose_cursor = '#f28019' +selection_bg = "#3c3836" +selection_fg = "#ebdbb2" +scrollbar_thumb = "#bdae93" +split = "#141617" +visual_bell = "#ebdbb2" +ansi = ["#282828", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2"] +brights = ["#282828", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2"] + +[colors.indexed] +16 = "#b16286" +17 = "#f28019" + +[colors.tab_bar] +background = "#141617" +inactive_tab_edge = "#141617" +inactive_tab_edge_hover = "#282828" + +[colors.tab_bar.active_tab] +bg_color = "#bdae93" +fg_color = "#1d2021" +intensity = "Normal" +italic = false +strikethrough = false +underline = "None" + +[colors.tab_bar.inactive_tab] +bg_color = "#282828" +fg_color = "#d5c4a1" +intensity = "Normal" +italic = false +strikethrough = false +underline = "None" + +[colors.tab_bar.inactive_tab_hover] +bg_color = "#3c3836" +fg_color = "#ebdbb2" +intensity = "Normal" +italic = false +strikethrough = false +underline = "None" + +[colors.tab_bar.new_tab] +bg_color = "#1d2021" +fg_color = "#d5c4a1" +intensity = "Normal" +italic = false +strikethrough = false +underline = "None" + +[colors.tab_bar.new_tab_hover] +bg_color = "#3c3836" +fg_color = "#ebdbb2" +intensity = "Normal" +italic = false +strikethrough = false +underline = "None" + diff --git a/extra/gruvfox/windows_terminal.json b/extra/gruvfox/windows_terminal.json new file mode 100644 index 00000000..deb7890f --- /dev/null +++ b/extra/gruvfox/windows_terminal.json @@ -0,0 +1,23 @@ +{ + "name" : "gruvfox", + "background" : "#1d2021", + "foreground" : "#ebdbb2", + "cursorColor": "#ebdbb2", + "selectionBackground": "#3c3836", + "black" : "#282828", + "blue" : "#83a598", + "cyan" : "#8ec07c", + "green" : "#b8bb26", + "purple" : "#d3869b", + "red" : "#fb4934", + "white" : "#ebdbb2", + "yellow" : "#fabd2f", + "brightBlack" : "#282828", + "brightBlue" : "#83a598", + "brightCyan" : "#8ec07c", + "brightGreen" : "#b8bb26", + "brightPurple" : "#d3869b", + "brightRed" : "#fb4934", + "brightWhite" : "#ebdbb2", + "brightYellow" : "#fabd2f" +} diff --git a/extra/zellij/nightfox.kdl b/extra/zellij/nightfox.kdl index 8a7f2079..d41531be 100644 --- a/extra/zellij/nightfox.kdl +++ b/extra/zellij/nightfox.kdl @@ -54,6 +54,19 @@ themes { black "#373354" white "#cdcbe0" } + gruvfox { + bg "#1d2021" + fg "#ebdbb2" + red "#fb4934" + green "#b8bb26" + blue "#83a598" + yellow "#fabd2f" + magenta "#d3869b" + orange "#f28019" + cyan "#8ec07c" + black "#3c3836" + white "#d5c4a1" + } nightfox { bg "#192330" fg "#cdcecf" From a5257826cd995a81d766ac5d11bcbc3e73f77886 Mon Sep 17 00:00:00 2001 From: Karim Mk Date: Wed, 20 Mar 2024 00:02:38 +0100 Subject: [PATCH 3/5] Tweaking the palette. and generating new extras --- extra/gruvfox/alacritty.toml | 32 +++++++++---------- extra/gruvfox/base16.yaml | 4 +-- extra/gruvfox/gruvfox.Xresources | 16 +++++----- extra/gruvfox/gruvfox.ghostty | 16 +++++----- extra/gruvfox/gruvfox.itermcolors | 48 ++++++++++++++--------------- extra/gruvfox/gruvfox.nu | 10 +++--- extra/gruvfox/kitty.conf | 16 +++++----- extra/gruvfox/konsole.colorscheme | 32 +++++++++---------- extra/gruvfox/warp.yaml | 16 +++++----- extra/gruvfox/wezterm.toml | 2 +- extra/gruvfox/windows_terminal.json | 16 +++++----- lua/nightfox/palette/gruvfox.lua | 20 ++++++------ 12 files changed, 114 insertions(+), 114 deletions(-) diff --git a/extra/gruvfox/alacritty.toml b/extra/gruvfox/alacritty.toml index ee0278e0..44f05c38 100644 --- a/extra/gruvfox/alacritty.toml +++ b/extra/gruvfox/alacritty.toml @@ -51,24 +51,24 @@ cyan = "#8ec07c" white = "#ebdbb2" [colors.bright] -black = "#282828" -red = "#fb4934" -green = "#b8bb26" -yellow = "#fabd2f" -blue = "#83a598" -magenta = "#d3869b" -cyan = "#8ec07c" -white = "#ebdbb2" +black = "#484848" +red = "#fc6452" +green = "#bfc23c" +yellow = "#fbc74e" +blue = "#96b3a7" +magenta = "#e0aab9" +cyan = "#9fc990" +white = "#eee0be" [colors.dim] -black = "#282828" -red = "#fb4934" -green = "#b8bb26" -yellow = "#fabd2f" -blue = "#83a598" -magenta = "#d3869b" -cyan = "#8ec07c" -white = "#ebdbb2" +black = "#222222" +red = "#d53e2c" +green = "#9c9f20" +yellow = "#d4a128" +blue = "#6f8c81" +magenta = "#b37284" +cyan = "#79a369" +white = "#c8ba97" [[colors.indexed_colors]] index = 16 diff --git a/extra/gruvfox/base16.yaml b/extra/gruvfox/base16.yaml index c5d654b5..68b38409 100644 --- a/extra/gruvfox/base16.yaml +++ b/extra/gruvfox/base16.yaml @@ -3,11 +3,11 @@ author: "EdenEast" base00: "1d2021" base01: "282828" base02: "3c3836" -base03: "282828" +base03: "484848" base04: "bdae93" base05: "ebdbb2" base06: "d5c4a1" -base07: "ebdbb2" +base07: "eee0be" base08: "fb4934" base09: "f28019" base0A: "fabd2f" diff --git a/extra/gruvfox/gruvfox.Xresources b/extra/gruvfox/gruvfox.Xresources index 1a8fbbfc..09ba4252 100644 --- a/extra/gruvfox/gruvfox.Xresources +++ b/extra/gruvfox/gruvfox.Xresources @@ -11,11 +11,11 @@ *color5: #d3869b *color6: #8ec07c *color7: #ebdbb2 -*color8: #282828 -*color9: #fb4934 -*color10: #b8bb26 -*color11: #fabd2f -*color12: #83a598 -*color13: #d3869b -*color14: #8ec07c -*color15: #ebdbb2 +*color8: #484848 +*color9: #fc6452 +*color10: #bfc23c +*color11: #fbc74e +*color12: #96b3a7 +*color13: #e0aab9 +*color14: #9fc990 +*color15: #eee0be diff --git a/extra/gruvfox/gruvfox.ghostty b/extra/gruvfox/gruvfox.ghostty index fdd284ee..aa5f6a7d 100644 --- a/extra/gruvfox/gruvfox.ghostty +++ b/extra/gruvfox/gruvfox.ghostty @@ -19,14 +19,14 @@ palette = 6=#8ec07c palette = 7=#ebdbb2 # bright -palette = 8=#282828 -palette = 9=#fb4934 -palette = 10=#b8bb26 -palette = 11=#fabd2f -palette = 12=#83a598 -palette = 13=#d3869b -palette = 14=#8ec07c -palette = 15=#ebdbb2 +palette = 8=#484848 +palette = 9=#fc6452 +palette = 10=#bfc23c +palette = 11=#fbc74e +palette = 12=#96b3a7 +palette = 13=#e0aab9 +palette = 14=#9fc990 +palette = 15=#eee0be # extended colors palette = 16=#f28019 diff --git a/extra/gruvfox/gruvfox.itermcolors b/extra/gruvfox/gruvfox.itermcolors index 18e382e6..fdf93b7c 100644 --- a/extra/gruvfox/gruvfox.itermcolors +++ b/extra/gruvfox/gruvfox.itermcolors @@ -32,66 +32,66 @@ Color Space sRGB Blue Component - 0.14901960784314 + 0.23529411764706 Green Component - 0.73333333333333 + 0.76078431372549 Red Component - 0.72156862745098 + 0.74901960784314 Ansi 11 Color Color Space sRGB Blue Component - 0.1843137254902 + 0.30588235294118 Green Component - 0.74117647058824 + 0.78039215686275 Red Component - 0.98039215686275 + 0.9843137254902 Ansi 12 Color Color Space sRGB Blue Component - 0.59607843137255 + 0.65490196078431 Green Component - 0.64705882352941 + 0.70196078431373 Red Component - 0.51372549019608 + 0.58823529411765 Ansi 13 Color Color Space sRGB Blue Component - 0.6078431372549 + 0.72549019607843 Green Component - 0.52549019607843 + 0.66666666666667 Red Component - 0.82745098039216 + 0.87843137254902 Ansi 14 Color Color Space sRGB Blue Component - 0.48627450980392 + 0.56470588235294 Green Component - 0.75294117647059 + 0.78823529411765 Red Component - 0.55686274509804 + 0.62352941176471 Ansi 15 Color Color Space sRGB Blue Component - 0.69803921568627 + 0.74509803921569 Green Component - 0.85882352941176 + 0.87843137254902 Red Component - 0.92156862745098 + 0.93333333333333 Ansi 2 Color @@ -164,22 +164,22 @@ Color Space sRGB Blue Component - 0.15686274509804 + 0.28235294117647 Green Component - 0.15686274509804 + 0.28235294117647 Red Component - 0.15686274509804 + 0.28235294117647 Ansi 9 Color Color Space sRGB Blue Component - 0.20392156862745 + 0.32156862745098 Green Component - 0.28627450980392 + 0.3921568627451 Red Component - 0.9843137254902 + 0.98823529411765 Background Color diff --git a/extra/gruvfox/gruvfox.nu b/extra/gruvfox/gruvfox.nu index 66631cb2..b2a841cc 100644 --- a/extra/gruvfox/gruvfox.nu +++ b/extra/gruvfox/gruvfox.nu @@ -1,7 +1,7 @@ let gruvfox_theme = { binary: "#f28019" block: "#d5c4a1" - bool: "#f28019" + bool: "#f4933c" cellpath: "#ebdbb2" date: "#b8bb26" duration: "#b8bb26" @@ -22,22 +22,22 @@ let gruvfox_theme = { separator: "#928374" shape_block: "#d5c4a1" - shape_bool: "#f28019" + shape_bool: "#f4933c" shape_external: "#d3869b" shape_externalarg: "#ebdbb2" shape_filepath: "#ebdbb2" shape_flag: "#8ec07c" shape_float: "#f28019" - shape_globpattern: "#fabd2f" + shape_globpattern: "#fbc74e" shape_int: "#f28019" shape_internalcall: "#d3869b" shape_list: "#d5c4a1" shape_literal: "#b8bb26" - shape_nothing: "#8ec07c" + shape_nothing: "#9fc990" shape_operator: "#d5c4a1" shape_record: "#d5c4a1" shape_string: "#b8bb26" - shape_string_interpolation: "#fabd2f" + shape_string_interpolation: "#fbc74e" shape_table: "#d5c4a1" shape_variable: "#ebdbb2" } diff --git a/extra/gruvfox/kitty.conf b/extra/gruvfox/kitty.conf index 361a4eab..f12dbb2d 100644 --- a/extra/gruvfox/kitty.conf +++ b/extra/gruvfox/kitty.conf @@ -36,14 +36,14 @@ color6 #8ec07c color7 #ebdbb2 # bright -color8 #282828 -color9 #fb4934 -color10 #b8bb26 -color11 #fabd2f -color12 #83a598 -color13 #d3869b -color14 #8ec07c -color15 #ebdbb2 +color8 #484848 +color9 #fc6452 +color10 #bfc23c +color11 #fbc74e +color12 #96b3a7 +color13 #e0aab9 +color14 #9fc990 +color15 #eee0be # extended colors color16 #f28019 diff --git a/extra/gruvfox/konsole.colorscheme b/extra/gruvfox/konsole.colorscheme index b9cace7a..e41cacfc 100644 --- a/extra/gruvfox/konsole.colorscheme +++ b/extra/gruvfox/konsole.colorscheme @@ -11,73 +11,73 @@ Color=60,56,54 Color=40,40,40 [Color0Faint] -Color=40,40,40 +Color=34,34,34 [Color0Intense] -Color=40,40,40 +Color=72,72,72 [Color1] Color=251,73,52 [Color1Faint] -Color=251,73,52 +Color=213,62,44 [Color1Intense] -Color=251,73,52 +Color=252,100,82 [Color2] Color=184,187,38 [Color2Faint] -Color=184,187,38 +Color=156,159,32 [Color2Intense] -Color=184,187,38 +Color=191,194,60 [Color3] Color=250,189,47 [Color3Faint] -Color=250,189,47 +Color=212,161,40 [Color3Intense] -Color=250,189,47 +Color=251,199,78 [Color4] Color=131,165,152 [Color4Faint] -Color=131,165,152 +Color=111,140,129 [Color4Intense] -Color=131,165,152 +Color=150,179,167 [Color5] Color=211,134,155 [Color5Faint] -Color=211,134,155 +Color=179,114,132 [Color5Intense] -Color=211,134,155 +Color=224,170,185 [Color6] Color=142,192,124 [Color6Faint] -Color=142,192,124 +Color=121,163,105 [Color6Intense] -Color=142,192,124 +Color=159,201,144 [Color7] Color=235,219,178 [Color7Faint] -Color=235,219,178 +Color=200,186,151 [Color7Intense] -Color=235,219,178 +Color=238,224,190 [Foreground] Color=235,219,178 diff --git a/extra/gruvfox/warp.yaml b/extra/gruvfox/warp.yaml index 3afb57d7..855bccfa 100644 --- a/extra/gruvfox/warp.yaml +++ b/extra/gruvfox/warp.yaml @@ -16,11 +16,11 @@ terminal_colors: cyan: '#8ec07c' white: '#ebdbb2' bright: - black: '#282828' - red: '#fb4934' - green: '#b8bb26' - yellow: '#fabd2f' - blue: '#83a598' - magenta: '#d3869b' - cyan: '#8ec07c' - white: '#ebdbb2' + black: '#484848' + red: '#fc6452' + green: '#bfc23c' + yellow: '#fbc74e' + blue: '#96b3a7' + magenta: '#e0aab9' + cyan: '#9fc990' + white: '#eee0be' diff --git a/extra/gruvfox/wezterm.toml b/extra/gruvfox/wezterm.toml index 6434d952..1fec8204 100644 --- a/extra/gruvfox/wezterm.toml +++ b/extra/gruvfox/wezterm.toml @@ -16,7 +16,7 @@ scrollbar_thumb = "#bdae93" split = "#141617" visual_bell = "#ebdbb2" ansi = ["#282828", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2"] -brights = ["#282828", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2"] +brights = ["#484848", "#fc6452", "#bfc23c", "#fbc74e", "#96b3a7", "#e0aab9", "#9fc990", "#eee0be"] [colors.indexed] 16 = "#b16286" diff --git a/extra/gruvfox/windows_terminal.json b/extra/gruvfox/windows_terminal.json index deb7890f..854dbb00 100644 --- a/extra/gruvfox/windows_terminal.json +++ b/extra/gruvfox/windows_terminal.json @@ -12,12 +12,12 @@ "red" : "#fb4934", "white" : "#ebdbb2", "yellow" : "#fabd2f", - "brightBlack" : "#282828", - "brightBlue" : "#83a598", - "brightCyan" : "#8ec07c", - "brightGreen" : "#b8bb26", - "brightPurple" : "#d3869b", - "brightRed" : "#fb4934", - "brightWhite" : "#ebdbb2", - "brightYellow" : "#fabd2f" + "brightBlack" : "#484848", + "brightBlue" : "#96b3a7", + "brightCyan" : "#9fc990", + "brightGreen" : "#bfc23c", + "brightPurple" : "#e0aab9", + "brightRed" : "#fc6452", + "brightWhite" : "#eee0be", + "brightYellow" : "#fbc74e" } diff --git a/lua/nightfox/palette/gruvfox.lua b/lua/nightfox/palette/gruvfox.lua index 48efd19d..68b00bb4 100644 --- a/lua/nightfox/palette/gruvfox.lua +++ b/lua/nightfox/palette/gruvfox.lua @@ -8,16 +8,16 @@ local meta = { -- stylua: ignore local palette = { - black = Shade.new("#282828", 0, 0), - red = Shade.new("#fb4934", 0, 0), - green = Shade.new("#b8bb26", 0, 0), - yellow = Shade.new("#fabd2f", 0, 0), - blue = Shade.new("#83a598", 0, 0), - magenta = Shade.new("#d3869b", 0, 0), - cyan = Shade.new("#8ec07c", 0, 0), - white = Shade.new("#ebdbb2", 0, 0), - orange = Shade.new("#f28019", 0, 0), - pink = Shade.new("#b16286", 0, 0), + black = Shade.new("#282828", 0.15, -0.150), + red = Shade.new("#fb4934", 0.15, -0.150), + green = Shade.new("#b8bb26", 0.10, -0.150), + yellow = Shade.new("#fabd2f", 0.15, -0.150), + blue = Shade.new("#83a598", 0.15, -0.150), + magenta = Shade.new("#d3869b", 0.30, -0.150), + cyan = Shade.new("#8ec07c", 0.15, -0.150), + white = Shade.new("#ebdbb2", 0.15, -0.150), + orange = Shade.new("#f28019", 0.15, -0.150), + pink = Shade.new("#b16286", 0.15, -0.150), comment = "#928374", From 26e0569bbe70a43ff08a4eccbebd7b0a49ef384f Mon Sep 17 00:00:00 2001 From: Karim Mk Date: Wed, 20 Mar 2024 01:07:03 +0100 Subject: [PATCH 4/5] Use more accurate colors. --- extra/gruvfox/alacritty.toml | 22 ++++++------- extra/gruvfox/base16.yaml | 8 ++--- extra/gruvfox/gruvfox.Xresources | 16 +++++----- extra/gruvfox/gruvfox.fish | 4 +-- extra/gruvfox/gruvfox.ghostty | 18 +++++------ extra/gruvfox/gruvfox.itermcolors | 48 ++++++++++++++--------------- extra/gruvfox/gruvfox.nu | 22 ++++++------- extra/gruvfox/kitty.conf | 22 ++++++------- extra/gruvfox/konsole.colorscheme | 16 +++++----- extra/gruvfox/warp.yaml | 16 +++++----- extra/gruvfox/wezterm.toml | 8 ++--- extra/gruvfox/windows_terminal.json | 16 +++++----- extra/zellij/nightfox.kdl | 2 +- lua/nightfox/palette/gruvfox.lua | 20 ++++++------ 14 files changed, 119 insertions(+), 119 deletions(-) diff --git a/extra/gruvfox/alacritty.toml b/extra/gruvfox/alacritty.toml index 44f05c38..fd5e9063 100644 --- a/extra/gruvfox/alacritty.toml +++ b/extra/gruvfox/alacritty.toml @@ -30,7 +30,7 @@ background = "#3c3836" [colors.hints.start] foreground = "#ebdbb2" -background = "#f28019" +background = "#fe8019" [colors.hints.end] foreground = "#ebdbb2" @@ -51,14 +51,14 @@ cyan = "#8ec07c" white = "#ebdbb2" [colors.bright] -black = "#484848" -red = "#fc6452" -green = "#bfc23c" -yellow = "#fbc74e" -blue = "#96b3a7" -magenta = "#e0aab9" -cyan = "#9fc990" -white = "#eee0be" +black = "#928374" +red = "#cc241d" +green = "#98971a" +yellow = "#d79921" +blue = "#458588" +magenta = "#b16286" +cyan = "#689d6a" +white = "#a89984" [colors.dim] black = "#222222" @@ -72,8 +72,8 @@ white = "#c8ba97" [[colors.indexed_colors]] index = 16 -color = "#f28019" +color = "#fe8019" [[colors.indexed_colors]] index = 17 -color = "#b16286" +color = "#ff79c6" diff --git a/extra/gruvfox/base16.yaml b/extra/gruvfox/base16.yaml index 68b38409..e9b16709 100644 --- a/extra/gruvfox/base16.yaml +++ b/extra/gruvfox/base16.yaml @@ -3,16 +3,16 @@ author: "EdenEast" base00: "1d2021" base01: "282828" base02: "3c3836" -base03: "484848" +base03: "928374" base04: "bdae93" base05: "ebdbb2" base06: "d5c4a1" -base07: "eee0be" +base07: "a89984" base08: "fb4934" -base09: "f28019" +base09: "fe8019" base0A: "fabd2f" base0B: "b8bb26" base0C: "8ec07c" base0D: "83a598" base0E: "d3869b" -base0F: "b16286" +base0F: "ff79c6" diff --git a/extra/gruvfox/gruvfox.Xresources b/extra/gruvfox/gruvfox.Xresources index 09ba4252..2c21f822 100644 --- a/extra/gruvfox/gruvfox.Xresources +++ b/extra/gruvfox/gruvfox.Xresources @@ -11,11 +11,11 @@ *color5: #d3869b *color6: #8ec07c *color7: #ebdbb2 -*color8: #484848 -*color9: #fc6452 -*color10: #bfc23c -*color11: #fbc74e -*color12: #96b3a7 -*color13: #e0aab9 -*color14: #9fc990 -*color15: #eee0be +*color8: #928374 +*color9: #cc241d +*color10: #98971a +*color11: #d79921 +*color12: #458588 +*color13: #b16286 +*color14: #689d6a +*color15: #a89984 diff --git a/extra/gruvfox/gruvfox.fish b/extra/gruvfox/gruvfox.fish index 9566751e..0db9d131 100644 --- a/extra/gruvfox/gruvfox.fish +++ b/extra/gruvfox/gruvfox.fish @@ -5,12 +5,12 @@ set -l foreground ebdbb2 set -l selection 3c3836 set -l comment 928374 set -l red fb4934 -set -l orange f28019 +set -l orange fe8019 set -l yellow fabd2f set -l green b8bb26 set -l purple d3869b set -l cyan 8ec07c -set -l pink b16286 +set -l pink ff79c6 # Syntax Highlighting Colors set -g fish_color_normal $foreground diff --git a/extra/gruvfox/gruvfox.ghostty b/extra/gruvfox/gruvfox.ghostty index aa5f6a7d..c17b8c61 100644 --- a/extra/gruvfox/gruvfox.ghostty +++ b/extra/gruvfox/gruvfox.ghostty @@ -19,14 +19,14 @@ palette = 6=#8ec07c palette = 7=#ebdbb2 # bright -palette = 8=#484848 -palette = 9=#fc6452 -palette = 10=#bfc23c -palette = 11=#fbc74e -palette = 12=#96b3a7 -palette = 13=#e0aab9 -palette = 14=#9fc990 -palette = 15=#eee0be +palette = 8=#928374 +palette = 9=#cc241d +palette = 10=#98971a +palette = 11=#d79921 +palette = 12=#458588 +palette = 13=#b16286 +palette = 14=#689d6a +palette = 15=#a89984 # extended colors -palette = 16=#f28019 +palette = 16=#fe8019 diff --git a/extra/gruvfox/gruvfox.itermcolors b/extra/gruvfox/gruvfox.itermcolors index fdf93b7c..6fd896af 100644 --- a/extra/gruvfox/gruvfox.itermcolors +++ b/extra/gruvfox/gruvfox.itermcolors @@ -32,66 +32,66 @@ Color Space sRGB Blue Component - 0.23529411764706 + 0.10196078431373 Green Component - 0.76078431372549 + 0.5921568627451 Red Component - 0.74901960784314 + 0.59607843137255 Ansi 11 Color Color Space sRGB Blue Component - 0.30588235294118 + 0.12941176470588 Green Component - 0.78039215686275 + 0.6 Red Component - 0.9843137254902 + 0.84313725490196 Ansi 12 Color Color Space sRGB Blue Component - 0.65490196078431 + 0.53333333333333 Green Component - 0.70196078431373 + 0.52156862745098 Red Component - 0.58823529411765 + 0.27058823529412 Ansi 13 Color Color Space sRGB Blue Component - 0.72549019607843 + 0.52549019607843 Green Component - 0.66666666666667 + 0.3843137254902 Red Component - 0.87843137254902 + 0.69411764705882 Ansi 14 Color Color Space sRGB Blue Component - 0.56470588235294 + 0.4156862745098 Green Component - 0.78823529411765 + 0.6156862745098 Red Component - 0.62352941176471 + 0.4078431372549 Ansi 15 Color Color Space sRGB Blue Component - 0.74509803921569 + 0.51764705882353 Green Component - 0.87843137254902 + 0.6 Red Component - 0.93333333333333 + 0.65882352941176 Ansi 2 Color @@ -164,22 +164,22 @@ Color Space sRGB Blue Component - 0.28235294117647 + 0.45490196078431 Green Component - 0.28235294117647 + 0.51372549019608 Red Component - 0.28235294117647 + 0.57254901960784 Ansi 9 Color Color Space sRGB Blue Component - 0.32156862745098 + 0.11372549019608 Green Component - 0.3921568627451 + 0.14117647058824 Red Component - 0.98823529411765 + 0.8 Background Color diff --git a/extra/gruvfox/gruvfox.nu b/extra/gruvfox/gruvfox.nu index b2a841cc..6264aaf7 100644 --- a/extra/gruvfox/gruvfox.nu +++ b/extra/gruvfox/gruvfox.nu @@ -1,13 +1,13 @@ let gruvfox_theme = { - binary: "#f28019" + binary: "#fe8019" block: "#d5c4a1" - bool: "#f4933c" + bool: "#d65d0e" cellpath: "#ebdbb2" date: "#b8bb26" duration: "#b8bb26" - filesize: "#f28019" - float: "#f28019" - int: "#f28019" + filesize: "#fe8019" + float: "#fe8019" + int: "#fe8019" list: "#d5c4a1" nothing: "#ebdbb2" range: "#ebdbb2" @@ -22,22 +22,22 @@ let gruvfox_theme = { separator: "#928374" shape_block: "#d5c4a1" - shape_bool: "#f4933c" + shape_bool: "#d65d0e" shape_external: "#d3869b" shape_externalarg: "#ebdbb2" shape_filepath: "#ebdbb2" shape_flag: "#8ec07c" - shape_float: "#f28019" - shape_globpattern: "#fbc74e" - shape_int: "#f28019" + shape_float: "#fe8019" + shape_globpattern: "#d79921" + shape_int: "#fe8019" shape_internalcall: "#d3869b" shape_list: "#d5c4a1" shape_literal: "#b8bb26" - shape_nothing: "#9fc990" + shape_nothing: "#689d6a" shape_operator: "#d5c4a1" shape_record: "#d5c4a1" shape_string: "#b8bb26" - shape_string_interpolation: "#fbc74e" + shape_string_interpolation: "#d79921" shape_table: "#d5c4a1" shape_variable: "#ebdbb2" } diff --git a/extra/gruvfox/kitty.conf b/extra/gruvfox/kitty.conf index f12dbb2d..87464f07 100644 --- a/extra/gruvfox/kitty.conf +++ b/extra/gruvfox/kitty.conf @@ -17,7 +17,7 @@ cursor #ebdbb2 # Border active_border_color #83a598 inactive_border_color #3c3836 -bell_border_color #f28019 +bell_border_color #fe8019 # Tabs active_tab_background #83a598 @@ -36,15 +36,15 @@ color6 #8ec07c color7 #ebdbb2 # bright -color8 #484848 -color9 #fc6452 -color10 #bfc23c -color11 #fbc74e -color12 #96b3a7 -color13 #e0aab9 -color14 #9fc990 -color15 #eee0be +color8 #928374 +color9 #cc241d +color10 #98971a +color11 #d79921 +color12 #458588 +color13 #b16286 +color14 #689d6a +color15 #a89984 # extended colors -color16 #f28019 -color17 #b16286 +color16 #fe8019 +color17 #ff79c6 diff --git a/extra/gruvfox/konsole.colorscheme b/extra/gruvfox/konsole.colorscheme index e41cacfc..458c9ed8 100644 --- a/extra/gruvfox/konsole.colorscheme +++ b/extra/gruvfox/konsole.colorscheme @@ -14,7 +14,7 @@ Color=40,40,40 Color=34,34,34 [Color0Intense] -Color=72,72,72 +Color=146,131,116 [Color1] Color=251,73,52 @@ -23,7 +23,7 @@ Color=251,73,52 Color=213,62,44 [Color1Intense] -Color=252,100,82 +Color=204,36,29 [Color2] Color=184,187,38 @@ -32,7 +32,7 @@ Color=184,187,38 Color=156,159,32 [Color2Intense] -Color=191,194,60 +Color=152,151,26 [Color3] Color=250,189,47 @@ -41,7 +41,7 @@ Color=250,189,47 Color=212,161,40 [Color3Intense] -Color=251,199,78 +Color=215,153,33 [Color4] Color=131,165,152 @@ -50,7 +50,7 @@ Color=131,165,152 Color=111,140,129 [Color4Intense] -Color=150,179,167 +Color=69,133,136 [Color5] Color=211,134,155 @@ -59,7 +59,7 @@ Color=211,134,155 Color=179,114,132 [Color5Intense] -Color=224,170,185 +Color=177,98,134 [Color6] Color=142,192,124 @@ -68,7 +68,7 @@ Color=142,192,124 Color=121,163,105 [Color6Intense] -Color=159,201,144 +Color=104,157,106 [Color7] Color=235,219,178 @@ -77,7 +77,7 @@ Color=235,219,178 Color=200,186,151 [Color7Intense] -Color=238,224,190 +Color=168,153,132 [Foreground] Color=235,219,178 diff --git a/extra/gruvfox/warp.yaml b/extra/gruvfox/warp.yaml index 855bccfa..43b08aab 100644 --- a/extra/gruvfox/warp.yaml +++ b/extra/gruvfox/warp.yaml @@ -16,11 +16,11 @@ terminal_colors: cyan: '#8ec07c' white: '#ebdbb2' bright: - black: '#484848' - red: '#fc6452' - green: '#bfc23c' - yellow: '#fbc74e' - blue: '#96b3a7' - magenta: '#e0aab9' - cyan: '#9fc990' - white: '#eee0be' + black: '#928374' + red: '#cc241d' + green: '#98971a' + yellow: '#d79921' + blue: '#458588' + magenta: '#b16286' + cyan: '#689d6a' + white: '#a89984' diff --git a/extra/gruvfox/wezterm.toml b/extra/gruvfox/wezterm.toml index 1fec8204..413d1831 100644 --- a/extra/gruvfox/wezterm.toml +++ b/extra/gruvfox/wezterm.toml @@ -9,18 +9,18 @@ background = "#1d2021" cursor_bg = "#ebdbb2" cursor_border = "#ebdbb2" cursor_fg = "#1d2021" -compose_cursor = '#f28019' +compose_cursor = '#fe8019' selection_bg = "#3c3836" selection_fg = "#ebdbb2" scrollbar_thumb = "#bdae93" split = "#141617" visual_bell = "#ebdbb2" ansi = ["#282828", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2"] -brights = ["#484848", "#fc6452", "#bfc23c", "#fbc74e", "#96b3a7", "#e0aab9", "#9fc990", "#eee0be"] +brights = ["#928374", "#cc241d", "#98971a", "#d79921", "#458588", "#b16286", "#689d6a", "#a89984"] [colors.indexed] -16 = "#b16286" -17 = "#f28019" +16 = "#ff79c6" +17 = "#fe8019" [colors.tab_bar] background = "#141617" diff --git a/extra/gruvfox/windows_terminal.json b/extra/gruvfox/windows_terminal.json index 854dbb00..34171401 100644 --- a/extra/gruvfox/windows_terminal.json +++ b/extra/gruvfox/windows_terminal.json @@ -12,12 +12,12 @@ "red" : "#fb4934", "white" : "#ebdbb2", "yellow" : "#fabd2f", - "brightBlack" : "#484848", - "brightBlue" : "#96b3a7", - "brightCyan" : "#9fc990", - "brightGreen" : "#bfc23c", - "brightPurple" : "#e0aab9", - "brightRed" : "#fc6452", - "brightWhite" : "#eee0be", - "brightYellow" : "#fbc74e" + "brightBlack" : "#928374", + "brightBlue" : "#458588", + "brightCyan" : "#689d6a", + "brightGreen" : "#98971a", + "brightPurple" : "#b16286", + "brightRed" : "#cc241d", + "brightWhite" : "#a89984", + "brightYellow" : "#d79921" } diff --git a/extra/zellij/nightfox.kdl b/extra/zellij/nightfox.kdl index d41531be..49f02cb2 100644 --- a/extra/zellij/nightfox.kdl +++ b/extra/zellij/nightfox.kdl @@ -62,7 +62,7 @@ themes { blue "#83a598" yellow "#fabd2f" magenta "#d3869b" - orange "#f28019" + orange "#fe8019" cyan "#8ec07c" black "#3c3836" white "#d5c4a1" diff --git a/lua/nightfox/palette/gruvfox.lua b/lua/nightfox/palette/gruvfox.lua index 68b00bb4..cb1b7127 100644 --- a/lua/nightfox/palette/gruvfox.lua +++ b/lua/nightfox/palette/gruvfox.lua @@ -8,16 +8,16 @@ local meta = { -- stylua: ignore local palette = { - black = Shade.new("#282828", 0.15, -0.150), - red = Shade.new("#fb4934", 0.15, -0.150), - green = Shade.new("#b8bb26", 0.10, -0.150), - yellow = Shade.new("#fabd2f", 0.15, -0.150), - blue = Shade.new("#83a598", 0.15, -0.150), - magenta = Shade.new("#d3869b", 0.30, -0.150), - cyan = Shade.new("#8ec07c", 0.15, -0.150), - white = Shade.new("#ebdbb2", 0.15, -0.150), - orange = Shade.new("#f28019", 0.15, -0.150), - pink = Shade.new("#b16286", 0.15, -0.150), + black = Shade.new("#282828", "#928374", -0.150), + red = Shade.new("#fb4934", "#cc241d", -0.150), + green = Shade.new("#b8bb26", "#98971a", -0.150), + yellow = Shade.new("#fabd2f", "#d79921", -0.150), + blue = Shade.new("#83a598", "#458588", -0.150), + magenta = Shade.new("#d3869b", "#b16286", -0.150), + cyan = Shade.new("#8ec07c", "#689d6a", -0.150), + white = Shade.new("#ebdbb2", "#a89984", -0.150), + orange = Shade.new("#fe8019", "#d65d0e", -0.150), + pink = Shade.new("#ff79c6", "#d65d8b", -0.150), comment = "#928374", From 5d6b6947bf25f491770389428343d4bcea960f51 Mon Sep 17 00:00:00 2001 From: Karim Mk Date: Wed, 20 Mar 2024 12:01:06 +0100 Subject: [PATCH 5/5] Change the syntax colors to match the real gruvbox theme. --- lua/nightfox/palette/gruvfox.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/nightfox/palette/gruvfox.lua b/lua/nightfox/palette/gruvfox.lua index cb1b7127..17778775 100644 --- a/lua/nightfox/palette/gruvfox.lua +++ b/lua/nightfox/palette/gruvfox.lua @@ -56,7 +56,7 @@ local function generate_spec(pal) spec.syntax = { bracket = spec.fg2, -- Brackets and Punctuation - builtin0 = pal.red.base, -- Builtin variable + builtin0 = pal.magenta.base, -- Builtin variable builtin1 = pal.cyan.bright, -- Builtin type builtin2 = pal.orange.bright, -- Builtin const builtin3 = pal.red.bright, -- Not used @@ -65,15 +65,15 @@ local function generate_spec(pal) const = pal.orange.bright, -- Constants, imports and booleans dep = spec.fg3, -- Deprecated field = pal.blue.base, -- Field - func = pal.blue.bright, -- Functions and Titles + func = pal.green.base, -- Functions and Titles ident = pal.cyan.base, -- Identifiers - keyword = pal.magenta.base, -- Keywords + keyword = pal.red.base, -- Keywords number = pal.orange.base, -- Numbers operator = spec.fg2, -- Operators preproc = pal.pink.bright, -- PreProc regex = pal.yellow.bright, -- Regex statement = pal.magenta.base, -- Statements - string = pal.green.base, -- Strings + string = pal.green.bright, -- Strings type = pal.yellow.base, -- Types variable = pal.white.base, -- Variables }