Merge branch 'main' into main

folke · Jul 18, 2024 · c47229c · c47229c
2 parents e859155 + 2e41c5f
commit c47229c
Show file tree

Hide file tree

Showing 14 changed files with 328 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ TokyoNight](https://github.com/enkia/tokyo-night-vscode-theme) theme. Includes
 | [vim-gitgutter](https://github.com/airblade/vim-gitgutter) | [`gitgutter`](lua/tokyonight/groups/gitgutter.lua) |
 | [gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim) | [`gitsigns`](lua/tokyonight/groups/gitsigns.lua) |
 | [glyph-palette.vim](https://github.com/lambdalisue/glyph-palette.vim) | [`glyph-palette`](lua/tokyonight/groups/glyph-palette.lua) |
+| [grug-far.nvim](https://github.com/MagicDuck/grug-far.nvim) | [`grug-far`](lua/tokyonight/groups/grug-far.lua) |
 | [headlines.nvim](https://github.com/lukas-reineke/headlines.nvim) | [`headlines`](lua/tokyonight/groups/headlines.lua) |
 | [hop.nvim](https://github.com/phaazon/hop.nvim) | [`hop`](lua/tokyonight/groups/hop.lua) |
 | [vim-illuminate](https://github.com/RRethy/vim-illuminate) | [`illuminate`](lua/tokyonight/groups/illuminate.lua) |
@@ -138,6 +139,7 @@ TokyoNight](https://github.com/enkia/tokyo-night-vscode-theme) theme. Includes
 | [Lazygit](https://github.com/jesseduffield/lazygit) | [extras/lazygit](extras/lazygit) |
 | [Lua Table for testing](https://www.lua.org) | [extras/lua](extras/lua) |
 | [Prism](https://prismjs.com) | [extras/prism](extras/prism) |
+| [process-compose](https://f1bonacc1.github.io/process-compose/) | [extras/process_compose](extras/process_compose) |
 | [Slack](https://slack.com) | [extras/slack](extras/slack) |
 | [Spotify Player](https://github.com/aome510/spotify-player) | [extras/spotify_player](extras/spotify_player) |
 | [Sublime Text](https://www.sublimetext.com/docs/themes) | [extras/sublime](extras/sublime) |

diff --git a/doc/tokyonight.nvim.txt b/doc/tokyonight.nvim.txt
@@ -1,4 +1,4 @@
-*tokyonight.nvim.txt*           For Neovim           Last change: 2024 July 15
+*tokyonight.nvim.txt*           For Neovim           Last change: 2024 July 18
 
 ==============================================================================
 Table of Contents                          *tokyonight.nvim-table-of-contents*
@@ -66,6 +66,8 @@ Supported Plugins ~
 
   glyph-palette.vim                   glyph-palette
 
+  grug-far.nvim                       grug-far
+
   headlines.nvim                      headlines
 
   hop.nvim                            hop
@@ -195,6 +197,8 @@ Extras ~
 
   Prism                               extras/prism
 
+  process-compose                     extras/process_compose
+
   Slack                               extras/slack
 
   Spotify Player                      extras/spotify_player

diff --git a/extras/lua/tokyonight_day.lua b/extras/lua/tokyonight_day.lua
@@ -898,6 +898,31 @@ local highlights = {
   GlyphPalette9 = {
     fg = "#f52a65"
   },
+  GrugFarHelpHeader = {
+    fg = "#848cb5"
+  },
+  GrugFarHelpHeaderKey = {
+    fg = "#007197"
+  },
+  GrugFarInputLabel = {
+    fg = "#188092"
+  },
+  GrugFarInputPlaceholder = {
+    fg = "#8990b3"
+  },
+  GrugFarResultsChangeIndicator = {
+    fg = "#506d9c"
+  },
+  GrugFarResultsHeader = {
+    fg = "#b15c00"
+  },
+  GrugFarResultsMatch = {
+    bg = "#f52a65",
+    fg = "#b4b5b9"
+  },
+  GrugFarResultsStats = {
+    fg = "#2e7de9"
+  },
   Headline = "Headline1",
   Headline1 = {
     bg = "#d8dde7"

diff --git a/extras/lua/tokyonight_moon.lua b/extras/lua/tokyonight_moon.lua
@@ -898,6 +898,31 @@ local highlights = {
   GlyphPalette9 = {
     fg = "#ff757f"
   },
+  GrugFarHelpHeader = {
+    fg = "#636da6"
+  },
+  GrugFarHelpHeaderKey = {
+    fg = "#86e1fc"
+  },
+  GrugFarInputLabel = {
+    fg = "#65bcff"
+  },
+  GrugFarInputPlaceholder = {
+    fg = "#545c7e"
+  },
+  GrugFarResultsChangeIndicator = {
+    fg = "#7ca1f2"
+  },
+  GrugFarResultsHeader = {
+    fg = "#ff966c"
+  },
+  GrugFarResultsMatch = {
+    bg = "#ff757f",
+    fg = "#1b1d2b"
+  },
+  GrugFarResultsStats = {
+    fg = "#82aaff"
+  },
   Headline = "Headline1",
   Headline1 = {
     bg = "#272b40"

diff --git a/extras/lua/tokyonight_night.lua b/extras/lua/tokyonight_night.lua
@@ -898,6 +898,31 @@ local highlights = {
   GlyphPalette9 = {
     fg = "#f7768e"
   },
+  GrugFarHelpHeader = {
+    fg = "#565f89"
+  },
+  GrugFarHelpHeaderKey = {
+    fg = "#7dcfff"
+  },
+  GrugFarInputLabel = {
+    fg = "#2ac3de"
+  },
+  GrugFarInputPlaceholder = {
+    fg = "#545c7e"
+  },
+  GrugFarResultsChangeIndicator = {
+    fg = "#6183bb"
+  },
+  GrugFarResultsHeader = {
+    fg = "#ff9e64"
+  },
+  GrugFarResultsMatch = {
+    bg = "#f7768e",
+    fg = "#15161e"
+  },
+  GrugFarResultsStats = {
+    fg = "#7aa2f7"
+  },
   Headline = "Headline1",
   Headline1 = {
     bg = "#1f2230"

diff --git a/extras/lua/tokyonight_storm.lua b/extras/lua/tokyonight_storm.lua
@@ -898,6 +898,31 @@ local highlights = {
   GlyphPalette9 = {
     fg = "#f7768e"
   },
+  GrugFarHelpHeader = {
+    fg = "#565f89"
+  },
+  GrugFarHelpHeaderKey = {
+    fg = "#7dcfff"
+  },
+  GrugFarInputLabel = {
+    fg = "#2ac3de"
+  },
+  GrugFarInputPlaceholder = {
+    fg = "#545c7e"
+  },
+  GrugFarResultsChangeIndicator = {
+    fg = "#6183bb"
+  },
+  GrugFarResultsHeader = {
+    fg = "#ff9e64"
+  },
+  GrugFarResultsMatch = {
+    bg = "#f7768e",
+    fg = "#1d202f"
+  },
+  GrugFarResultsStats = {
+    fg = "#7aa2f7"
+  },
   Headline = "Headline1",
   Headline1 = {
     bg = "#282e44"

diff --git a/extras/process_compose/tokyonight_day.yaml b/extras/process_compose/tokyonight_day.yaml
@@ -0,0 +1,36 @@
+style:
+  name: tokyonight_day
+  body:
+    fgColor: '#3760bf'
+    bgColor: '#d0d5e3'
+    secondaryTextColor: '#6172b0'
+    tertiaryTextColor: '${fg_visual}'
+    borderColor: '#a8aecb'
+  stat_table:
+    keyFgColor: '#8c6c3e'
+    valueFgColor: '#3760bf'
+    logoColor: '#8c6c3e'
+  proc_table:
+    fgColor: '#2e7de9'
+    fgWarning: '#8c6c3e'
+    fgPending: '#8990b3'
+    fgCompleted: '#587539'
+    fgError: '#c64343'
+    headerFgColor: '#3760bf'
+  help:
+    fgColor: '#188092'
+    keyColor: '#3760bf'
+    hlColor: '#587539'
+    categoryFgColor: '#006a83'
+  dialog:
+    fgColor: '#188092'
+    bgColor: '#b4b5b9'
+    contrastBgColor: '#e1e2e7'
+    attentionBgColor: '#c64343'
+    buttonFgColor: '#b4b5b9'
+    buttonBgColor: '#c4c8da'
+    buttonFocusFgColor: '#b4b5b9'
+    buttonFocusBgColor: '#2e7de9'
+    labelFgColor: '#8c6c3e'
+    fieldFgColor: '#b4b5b9'
+    fieldBgColor: '#92a6d5'
diff --git a/extras/process_compose/tokyonight_moon.yaml b/extras/process_compose/tokyonight_moon.yaml
@@ -0,0 +1,36 @@
+style:
+  name: tokyonight_moon
+  body:
+    fgColor: '#c8d3f5'
+    bgColor: '#1e2030'
+    secondaryTextColor: '#828bb8'
+    tertiaryTextColor: '${fg_visual}'
+    borderColor: '#3b4261'
+  stat_table:
+    keyFgColor: '#ffc777'
+    valueFgColor: '#c8d3f5'
+    logoColor: '#ffc777'
+  proc_table:
+    fgColor: '#82aaff'
+    fgWarning: '#ffc777'
+    fgPending: '#545c7e'
+    fgCompleted: '#c3e88d'
+    fgError: '#c53b53'
+    headerFgColor: '#c8d3f5'
+  help:
+    fgColor: '#65bcff'
+    keyColor: '#c8d3f5'
+    hlColor: '#c3e88d'
+    categoryFgColor: '#89ddff'
+  dialog:
+    fgColor: '#65bcff'
+    bgColor: '#1b1d2b'
+    contrastBgColor: '#222436'
+    attentionBgColor: '#c53b53'
+    buttonFgColor: '#1b1d2b'
+    buttonBgColor: '#2f334d'
+    buttonFocusFgColor: '#1b1d2b'
+    buttonFocusBgColor: '#82aaff'
+    labelFgColor: '#ffc777'
+    fieldFgColor: '#1b1d2b'
+    fieldBgColor: '#394b70'
diff --git a/extras/process_compose/tokyonight_night.yaml b/extras/process_compose/tokyonight_night.yaml
@@ -0,0 +1,36 @@
+style:
+  name: tokyonight_night
+  body:
+    fgColor: '#c0caf5'
+    bgColor: '#16161e'
+    secondaryTextColor: '#a9b1d6'
+    tertiaryTextColor: '${fg_visual}'
+    borderColor: '#3b4261'
+  stat_table:
+    keyFgColor: '#e0af68'
+    valueFgColor: '#c0caf5'
+    logoColor: '#e0af68'
+  proc_table:
+    fgColor: '#7aa2f7'
+    fgWarning: '#e0af68'
+    fgPending: '#545c7e'
+    fgCompleted: '#9ece6a'
+    fgError: '#db4b4b'
+    headerFgColor: '#c0caf5'
+  help:
+    fgColor: '#2ac3de'
+    keyColor: '#c0caf5'
+    hlColor: '#9ece6a'
+    categoryFgColor: '#89ddff'
+  dialog:
+    fgColor: '#2ac3de'
+    bgColor: '#15161e'
+    contrastBgColor: '#1a1b26'
+    attentionBgColor: '#db4b4b'
+    buttonFgColor: '#15161e'
+    buttonBgColor: '#292e42'
+    buttonFocusFgColor: '#15161e'
+    buttonFocusBgColor: '#7aa2f7'
+    labelFgColor: '#e0af68'
+    fieldFgColor: '#15161e'
+    fieldBgColor: '#394b70'
diff --git a/extras/process_compose/tokyonight_storm.yaml b/extras/process_compose/tokyonight_storm.yaml
@@ -0,0 +1,36 @@
+style:
+  name: tokyonight_storm
+  body:
+    fgColor: '#c0caf5'
+    bgColor: '#1f2335'
+    secondaryTextColor: '#a9b1d6'
+    tertiaryTextColor: '${fg_visual}'
+    borderColor: '#3b4261'
+  stat_table:
+    keyFgColor: '#e0af68'
+    valueFgColor: '#c0caf5'
+    logoColor: '#e0af68'
+  proc_table:
+    fgColor: '#7aa2f7'
+    fgWarning: '#e0af68'
+    fgPending: '#545c7e'
+    fgCompleted: '#9ece6a'
+    fgError: '#db4b4b'
+    headerFgColor: '#c0caf5'
+  help:
+    fgColor: '#2ac3de'
+    keyColor: '#c0caf5'
+    hlColor: '#9ece6a'
+    categoryFgColor: '#89ddff'
+  dialog:
+    fgColor: '#2ac3de'
+    bgColor: '#1d202f'
+    contrastBgColor: '#24283b'
+    attentionBgColor: '#db4b4b'
+    buttonFgColor: '#1d202f'
+    buttonBgColor: '#292e42'
+    buttonFocusFgColor: '#1d202f'
+    buttonFocusBgColor: '#7aa2f7'
+    labelFgColor: '#e0af68'
+    fieldFgColor: '#1d202f'
+    fieldBgColor: '#394b70'
diff --git a/lua/tokyonight/extra/init.lua b/lua/tokyonight/extra/init.lua
@@ -6,7 +6,7 @@ local M = {}
 --- @type table<string, {ext:string, url:string, label:string, subdir?: string, sep?:string}>
 -- stylua: ignore
 M.extras = {
-  aerc             = { ext = "ini", url = "https://git.sr.ht/~rjarry/aerc/", label = "Aerc"},
+  aerc             = { ext = "ini", url = "https://git.sr.ht/~rjarry/aerc/", label = "Aerc" },
   alacritty        = { ext = "toml", url = "https://github.com/alacritty/alacritty", label = "Alacritty" },
   delta            = { ext = "gitconfig", url = "https://github.com/dandavison/delta", label = "Delta" },
   dunst            = { ext = "dunstrc", url = "https://dunst-project.org/", label = "Dunst" },
@@ -15,16 +15,17 @@ M.extras = {
   foot             = { ext = "ini", url = "https://codeberg.org/dnkl/foot", label = "Foot" },
   fzf              = { ext = "sh", url = "https://github.com/junegunn/fzf", label = "Fzf" },
   gitui            = { ext = "ron", url = "https://github.com/extrawurst/gitui", label = "GitUI" },
-  gnome_terminal   = { ext = "dconf", url = "https://gitlab.gnome.org/GNOME/gnome-terminal", label = "GNOME Terminal"},
+  gnome_terminal   = { ext = "dconf", url = "https://gitlab.gnome.org/GNOME/gnome-terminal", label = "GNOME Terminal" },
   helix            = { ext = "toml", url = "https://helix-editor.com/", label = "Helix" },
   iterm            = { ext = "itermcolors", url = "https://iterm2.com/", label = "iTerm" },
   kitty            = { ext = "conf", url = "https://sw.kovidgoyal.net/kitty/conf.html", label = "Kitty" },
   lazygit          = { ext = "yml", url = "https://github.com/jesseduffield/lazygit", label = "Lazygit" },
   lua              = { ext = "lua", url = "https://www.lua.org", label = "Lua Table for testing" },
   prism            = { ext = "js", url = "https://prismjs.com", label = "Prism" },
-  slack            = {ext = "txt", url = "https://slack.com", label = "Slack"},
+  process_compose  = { ext = "yaml", url = "https://f1bonacc1.github.io/process-compose/", label = "process-compose" },
+  slack            = { ext = "txt", url = "https://slack.com", label = "Slack" },
   sublime          = { ext = "tmTheme", url = "https://www.sublimetext.com/docs/themes", label = "Sublime Text" },
-  spotify_player   = {ext = "toml", url = "https://github.com/aome510/spotify-player", label = "Spotify Player"},
+  spotify_player   = { ext = "toml", url = "https://github.com/aome510/spotify-player", label = "Spotify Player" },
   terminator       = { ext = "conf", url = "https://gnome-terminator.readthedocs.io/en/latest/config.html", label = "Terminator" },
   tilix            = { ext = "json", url = "https://github.com/gnunn1/tilix", label = "Tilix" },
   tmux             = { ext = "tmux", url = "https://github.com/tmux/tmux/wiki", label = "Tmux" },

diff --git a/lua/tokyonight/extra/process_compose.lua b/lua/tokyonight/extra/process_compose.lua
@@ -0,0 +1,51 @@
+local util = require("tokyonight.util")
+local M = {}
+
+--- @param colors ColorScheme
+function M.generate(colors)
+  local process_compose = util.template(
+    [=[
+style:
+  name: ${_name}
+  body:
+    fgColor: '${fg}'
+    bgColor: '${bg_dark}'
+    secondaryTextColor: '${fg_dark}'
+    tertiaryTextColor: '${fg_visual}'
+    borderColor: '${fg_gutter}'
+  stat_table:
+    keyFgColor: '${yellow}'
+    valueFgColor: '${fg}'
+    logoColor: '${yellow}'
+  proc_table:
+    fgColor: '${blue}'
+    fgWarning: '${yellow}'
+    fgPending: '${dark3}'
+    fgCompleted: '${green}'
+    fgError: '${red1}'
+    headerFgColor: '${fg}'
+  help:
+    fgColor: '${blue1}'
+    keyColor: '${fg}'
+    hlColor: '${green}'
+    categoryFgColor: '${blue5}'
+  dialog:
+    fgColor: '${blue1}'
+    bgColor: '${black}'
+    contrastBgColor: '${bg}'
+    attentionBgColor: '${red1}'
+    buttonFgColor: '${black}'
+    buttonBgColor: '${bg_highlight}'
+    buttonFocusFgColor: '${black}'
+    buttonFocusBgColor: '${blue}'
+    labelFgColor: '${yellow}'
+    fieldFgColor: '${black}'
+    fieldBgColor: '${blue7}'
+]=],
+    colors
+  )
+
+  return process_compose
+end
+
+return M