Merge branch 'up-main'

* up-main: (29 commits) chore(build): auto-generate vimdoc chore(build): auto-generate extras fix(treesitter): correctly link up delimiters again chore(build): auto-generate vimdoc chore(build): auto-generate extras fix: re-add `@punctuation.special` (folke#484) chore(main): release 3.0.1 (folke#479) chore(build): auto-generate extras fix(treesitter): defaults for @namespace.builtin chore(build): auto-generate vimdoc chore(build): auto-generate extras fix(treesitter): consolidate notes chore(main): release 3.0.0 (folke#475) chore(build): auto-generate extras feat(wezterm): add color for scrollbar (folke#470) feat: changed alacritty .yml to .toml (folke#450) chore(build): auto-generate vimdoc chore(build): auto-generate extras feat(extras): add fzf colors (folke#464) chore(build): auto-generate extras ...
patnr · Mar 5, 2024 · 2ef21b6 · 2ef21b6
2 parents 53af0b4 + 610179f
commit 2ef21b6
Show file tree

Hide file tree

Showing 36 changed files with 1,467 additions and 994 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Changelog
 
+## [3.0.1](https://github.com/folke/tokyonight.nvim/compare/v3.0.0...v3.0.1) (2024-01-21)
+
+
+### Bug Fixes
+
+* **treesitter:** consolidate notes ([ba35fbe](https://github.com/folke/tokyonight.nvim/commit/ba35fbe16ceea7e5fbe8b9a0247c06804c385538))
+* **treesitter:** defaults for [@namespace](https://github.com/namespace).builtin ([65a88b1](https://github.com/folke/tokyonight.nvim/commit/65a88b14d9c132daa678d0c5f0aa70dccdc0d6a5))
+
+## [3.0.0](https://github.com/folke/tokyonight.nvim/compare/v2.9.0...v3.0.0) (2024-01-20)
+
+
+### ⚠ BREAKING CHANGES
+
+* added support for treesitter 0.9.2. Eearlier TS versions are no longer supported.
+* add treesitter default groups to theme
+* remove compat with old treesitter group names from over a year ago
+
+### Features
+
+* added support for treesitter 0.9.2. Eearlier TS versions are no longer supported. ([18d46ae](https://github.com/folke/tokyonight.nvim/commit/18d46aeca7fa62a1c2d816fd0df4bc553412bc30))
+* changed alacritty .yml to .toml ([#450](https://github.com/folke/tokyonight.nvim/issues/450)) ([ffc7505](https://github.com/folke/tokyonight.nvim/commit/ffc7505a1426ec2472c75d8e8712df611a5ef5a2))
+* **extras:** add fzf colors ([#464](https://github.com/folke/tokyonight.nvim/issues/464)) ([75c60d5](https://github.com/folke/tokyonight.nvim/commit/75c60d569481aa8ec36c857701b6c5c5aaef3340))
+* **wezterm:** add color for scrollbar ([#470](https://github.com/folke/tokyonight.nvim/issues/470)) ([5b2d7ab](https://github.com/folke/tokyonight.nvim/commit/5b2d7ab1bae530f662713820957665c87a774873))
+
+
+### Bug Fixes
+
+* add treesitter default groups to theme ([bddedb1](https://github.com/folke/tokyonight.nvim/commit/bddedb17bd5d8f47a8d8b1febea7c0b9a585e4ef))
+* **helix:** fixed helix theme with new TS groups ([2e00d06](https://github.com/folke/tokyonight.nvim/commit/2e00d06319072953b54b0316146151d31e71680c))
+* remove compat with old treesitter group names from over a year ago ([66cfdc1](https://github.com/folke/tokyonight.nvim/commit/66cfdc12b009b45c92d52d48bea30a105d7012d9))
+* **theme:** added support for WinBar and WinBarNC. Fixes [#466](https://github.com/folke/tokyonight.nvim/issues/466) ([29b7960](https://github.com/folke/tokyonight.nvim/commit/29b796021d82f1faf989a00ba8b86cfe83ace130))
+
 ## [2.9.0](https://github.com/folke/tokyonight.nvim/compare/v2.8.0...v2.9.0) (2023-10-16)
 
 

diff --git a/README.md b/README.md
@@ -43,6 +43,7 @@ TokyoNight](https://github.com/enkia/tokyo-night-vscode-theme) theme. Includes
 - [Fish](https://fishshell.com/docs/current/index.html) ([fish](extras/fish))
 - [Fish Themes](https://fishshell.com/docs/current/interactive.html#syntax-highlighting) ([fish_themes](extras/fish_themes))
 - [Foot](https://codeberg.org/dnkl/foot) ([foot](extras/foot))
+- [Fzf](https://github.com/junegunn/fzf) ([fzf](extras/fzf))
 - [GitUI](https://github.com/extrawurst/gitui) ([gitui](extras/gitui))
 - [Helix](https://helix-editor.com/) ([helix](extras/helix))
 - [iTerm](https://iterm2.com/) ([iterm](extras/iterm))

diff --git a/doc/tokyonight.nvim.txt b/doc/tokyonight.nvim.txt
@@ -1,4 +1,4 @@
-*tokyonight.nvim.txt*     For Neovim >= 0.8.0     Last change: 2023 October 25
+*tokyonight.nvim.txt*     For Neovim >= 0.8.0     Last change: 2024 January 31
 
 ==============================================================================
 Table of Contents                          *tokyonight.nvim-table-of-contents*
@@ -60,6 +60,7 @@ EXTRAS ~
 - Fish <https://fishshell.com/docs/current/index.html> (fish <extras/fish>)
 - Fish Themes <https://fishshell.com/docs/current/interactive.html#syntax-highlighting> (fish_themes <extras/fish_themes>)
 - Foot <https://codeberg.org/dnkl/foot> (foot <extras/foot>)
+- Fzf <https://github.com/junegunn/fzf> (fzf <extras/fzf>)
 - GitUI <https://github.com/extrawurst/gitui> (gitui <extras/gitui>)
 - Helix <https://helix-editor.com/> (helix <extras/helix>)
 - iTerm <https://iterm2.com/> (iterm <extras/iterm>)

diff --git a/extras/alacritty/tokyonight_day.toml b/extras/alacritty/tokyonight_day.toml
@@ -0,0 +1,41 @@
+# TokyoNight Alacritty Colors
+# Default colors
+[colors.primary]
+background = '#e1e2e7'
+foreground = '#3760bf'
+
+#[colors.cursor]
+#cursor = '#3760bf'
+#text = '#e1e2e7'
+
+# Normal colors
+[colors.normal]
+black = '#e9e9ed'
+red = '#f52a65'
+green = '#587539'
+yellow = '#8c6c3e'
+blue = '#2e7de9'
+magenta = '#9854f1'
+cyan = '#007197'
+white = '#6172b0'
+
+# Bright colors
+[colors.bright]
+black = '#a1a6c5'
+red = '#f52a65'
+green = '#587539'
+yellow = '#8c6c3e'
+blue = '#2e7de9'
+magenta = '#9854f1'
+cyan = '#007197'
+white = '#3760bf'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#b15c00'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#c64343'
+
diff --git a/extras/alacritty/tokyonight_day.yml b/extras/alacritty/tokyonight_day.yml
diff --git a/extras/alacritty/tokyonight_moon.toml b/extras/alacritty/tokyonight_moon.toml
@@ -0,0 +1,41 @@
+# TokyoNight Alacritty Colors
+# Default colors
+[colors.primary]
+background = '#222436'
+foreground = '#c8d3f5'
+
+#[colors.cursor]
+#cursor = '#c8d3f5'
+#text = '#222436'
+
+# Normal colors
+[colors.normal]
+black = '#1b1d2b'
+red = '#ff757f'
+green = '#c3e88d'
+yellow = '#ffc777'
+blue = '#82aaff'
+magenta = '#c099ff'
+cyan = '#86e1fc'
+white = '#828bb8'
+
+# Bright colors
+[colors.bright]
+black = '#444a73'
+red = '#ff757f'
+green = '#c3e88d'
+yellow = '#ffc777'
+blue = '#82aaff'
+magenta = '#c099ff'
+cyan = '#86e1fc'
+white = '#c8d3f5'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#ff966c'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#c53b53'
+
diff --git a/extras/alacritty/tokyonight_moon.yml b/extras/alacritty/tokyonight_moon.yml
diff --git a/extras/alacritty/tokyonight_night.toml b/extras/alacritty/tokyonight_night.toml
@@ -0,0 +1,41 @@
+# TokyoNight Alacritty Colors
+# Default colors
+[colors.primary]
+background = '#1a1b26'
+foreground = '#c0caf5'
+
+#[colors.cursor]
+#cursor = '#c0caf5'
+#text = '#1a1b26'
+
+# Normal colors
+[colors.normal]
+black = '#15161e'
+red = '#f7768e'
+green = '#9ece6a'
+yellow = '#e0af68'
+blue = '#7aa2f7'
+magenta = '#bb9af7'
+cyan = '#7dcfff'
+white = '#a9b1d6'
+
+# Bright colors
+[colors.bright]
+black = '#414868'
+red = '#f7768e'
+green = '#9ece6a'
+yellow = '#e0af68'
+blue = '#7aa2f7'
+magenta = '#bb9af7'
+cyan = '#7dcfff'
+white = '#c0caf5'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#ff9e64'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#db4b4b'
+
diff --git a/extras/alacritty/tokyonight_night.yml b/extras/alacritty/tokyonight_night.yml
diff --git a/extras/alacritty/tokyonight_storm.toml b/extras/alacritty/tokyonight_storm.toml
@@ -0,0 +1,41 @@
+# TokyoNight Alacritty Colors
+# Default colors
+[colors.primary]
+background = '#24283b'
+foreground = '#c0caf5'
+
+#[colors.cursor]
+#cursor = '#c0caf5'
+#text = '#24283b'
+
+# Normal colors
+[colors.normal]
+black = '#1d202f'
+red = '#f7768e'
+green = '#9ece6a'
+yellow = '#e0af68'
+blue = '#7aa2f7'
+magenta = '#bb9af7'
+cyan = '#7dcfff'
+white = '#a9b1d6'
+
+# Bright colors
+[colors.bright]
+black = '#414868'
+red = '#f7768e'
+green = '#9ece6a'
+yellow = '#e0af68'
+blue = '#7aa2f7'
+magenta = '#bb9af7'
+cyan = '#7dcfff'
+white = '#c0caf5'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#ff9e64'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#db4b4b'
+
diff --git a/extras/alacritty/tokyonight_storm.yml b/extras/alacritty/tokyonight_storm.yml
diff --git a/extras/fzf/tokyonight_day.zsh b/extras/fzf/tokyonight_day.zsh
@@ -0,0 +1,5 @@
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:#3760bf,bg:#e1e2e7,hl:#b15c00 \
+--color=fg+:#3760bf,bg+:#c4c8da,hl+:#b15c00 \
+--color=info:#2e7de9,prompt:#007197,pointer:#007197 \
+--color=marker:#587539,spinner:#587539,header:#587539"
diff --git a/extras/fzf/tokyonight_moon.zsh b/extras/fzf/tokyonight_moon.zsh
@@ -0,0 +1,5 @@
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:#c8d3f5,bg:#222436,hl:#ff966c \
+--color=fg+:#c8d3f5,bg+:#2f334d,hl+:#ff966c \
+--color=info:#82aaff,prompt:#86e1fc,pointer:#86e1fc \
+--color=marker:#c3e88d,spinner:#c3e88d,header:#c3e88d"
diff --git a/extras/fzf/tokyonight_night.zsh b/extras/fzf/tokyonight_night.zsh
@@ -0,0 +1,5 @@
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:#c0caf5,bg:#1a1b26,hl:#ff9e64 \
+--color=fg+:#c0caf5,bg+:#292e42,hl+:#ff9e64 \
+--color=info:#7aa2f7,prompt:#7dcfff,pointer:#7dcfff \
+--color=marker:#9ece6a,spinner:#9ece6a,header:#9ece6a"
diff --git a/extras/fzf/tokyonight_storm.zsh b/extras/fzf/tokyonight_storm.zsh
@@ -0,0 +1,5 @@
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:#c0caf5,bg:#24283b,hl:#ff9e64 \
+--color=fg+:#c0caf5,bg+:#292e42,hl+:#ff9e64 \
+--color=info:#7aa2f7,prompt:#7dcfff,pointer:#7dcfff \
+--color=marker:#9ece6a,spinner:#9ece6a,header:#9ece6a"