diff --git a/CHANGELOG.md b/CHANGELOG.md index a9755231..b259144e 100644 --- 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 index 36314683..d271288d 100644 --- 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 index acd29c45..fe95ee10 100644 --- 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 (fish ) - Fish Themes (fish_themes ) - Foot (foot ) +- Fzf (fzf ) - GitUI (gitui ) - Helix (helix ) - iTerm (iterm ) diff --git a/extras/alacritty/tokyonight_day.toml b/extras/alacritty/tokyonight_day.toml new file mode 100644 index 00000000..4a7e1592 --- /dev/null +++ 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 deleted file mode 100644 index b1add141..00000000 --- a/extras/alacritty/tokyonight_day.yml +++ /dev/null @@ -1,34 +0,0 @@ -# TokyoNight Alacritty Colors -colors: - # Default colors - primary: - background: '0xe1e2e7' - foreground: '0x3760bf' - - # Normal colors - normal: - black: '0xe9e9ed' - red: '0xf52a65' - green: '0x587539' - yellow: '0x8c6c3e' - blue: '0x2e7de9' - magenta: '0x9854f1' - cyan: '0x007197' - white: '0x6172b0' - - # Bright colors - bright: - black: '0xa1a6c5' - red: '0xf52a65' - green: '0x587539' - yellow: '0x8c6c3e' - blue: '0x2e7de9' - magenta: '0x9854f1' - cyan: '0x007197' - white: '0x3760bf' - - indexed_colors: - - { index: 16, color: '0xb15c00' } - - { index: 17, color: '0xc64343' } - - \ No newline at end of file diff --git a/extras/alacritty/tokyonight_moon.toml b/extras/alacritty/tokyonight_moon.toml new file mode 100644 index 00000000..96b45a69 --- /dev/null +++ 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 deleted file mode 100644 index c2889ce0..00000000 --- a/extras/alacritty/tokyonight_moon.yml +++ /dev/null @@ -1,34 +0,0 @@ -# TokyoNight Alacritty Colors -colors: - # Default colors - primary: - background: '0x222436' - foreground: '0xc8d3f5' - - # Normal colors - normal: - black: '0x1b1d2b' - red: '0xff757f' - green: '0xc3e88d' - yellow: '0xffc777' - blue: '0x82aaff' - magenta: '0xc099ff' - cyan: '0x86e1fc' - white: '0x828bb8' - - # Bright colors - bright: - black: '0x444a73' - red: '0xff757f' - green: '0xc3e88d' - yellow: '0xffc777' - blue: '0x82aaff' - magenta: '0xc099ff' - cyan: '0x86e1fc' - white: '0xc8d3f5' - - indexed_colors: - - { index: 16, color: '0xff966c' } - - { index: 17, color: '0xc53b53' } - - \ No newline at end of file diff --git a/extras/alacritty/tokyonight_night.toml b/extras/alacritty/tokyonight_night.toml new file mode 100644 index 00000000..d3835542 --- /dev/null +++ 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 deleted file mode 100644 index 5990ac38..00000000 --- a/extras/alacritty/tokyonight_night.yml +++ /dev/null @@ -1,34 +0,0 @@ -# TokyoNight Alacritty Colors -colors: - # Default colors - primary: - background: '0x1a1b26' - foreground: '0xc0caf5' - - # Normal colors - normal: - black: '0x15161e' - red: '0xf7768e' - green: '0x9ece6a' - yellow: '0xe0af68' - blue: '0x7aa2f7' - magenta: '0xbb9af7' - cyan: '0x7dcfff' - white: '0xa9b1d6' - - # Bright colors - bright: - black: '0x414868' - red: '0xf7768e' - green: '0x9ece6a' - yellow: '0xe0af68' - blue: '0x7aa2f7' - magenta: '0xbb9af7' - cyan: '0x7dcfff' - white: '0xc0caf5' - - indexed_colors: - - { index: 16, color: '0xff9e64' } - - { index: 17, color: '0xdb4b4b' } - - \ No newline at end of file diff --git a/extras/alacritty/tokyonight_storm.toml b/extras/alacritty/tokyonight_storm.toml new file mode 100644 index 00000000..7fe38475 --- /dev/null +++ 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 deleted file mode 100644 index fc337c39..00000000 --- a/extras/alacritty/tokyonight_storm.yml +++ /dev/null @@ -1,34 +0,0 @@ -# TokyoNight Alacritty Colors -colors: - # Default colors - primary: - background: '0x24283b' - foreground: '0xc0caf5' - - # Normal colors - normal: - black: '0x1d202f' - red: '0xf7768e' - green: '0x9ece6a' - yellow: '0xe0af68' - blue: '0x7aa2f7' - magenta: '0xbb9af7' - cyan: '0x7dcfff' - white: '0xa9b1d6' - - # Bright colors - bright: - black: '0x414868' - red: '0xf7768e' - green: '0x9ece6a' - yellow: '0xe0af68' - blue: '0x7aa2f7' - magenta: '0xbb9af7' - cyan: '0x7dcfff' - white: '0xc0caf5' - - indexed_colors: - - { index: 16, color: '0xff9e64' } - - { index: 17, color: '0xdb4b4b' } - - \ No newline at end of file diff --git a/extras/fzf/tokyonight_day.zsh b/extras/fzf/tokyonight_day.zsh new file mode 100644 index 00000000..5fb7a029 --- /dev/null +++ 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 new file mode 100644 index 00000000..1d5f464b --- /dev/null +++ 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 new file mode 100644 index 00000000..e92f3bb3 --- /dev/null +++ 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 new file mode 100644 index 00000000..ed673f45 --- /dev/null +++ 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" diff --git a/extras/helix/tokyonight_day.toml b/extras/helix/tokyonight_day.toml index 2e43ff0b..42ff220c 100644 --- a/extras/helix/tokyonight_day.toml +++ b/extras/helix/tokyonight_day.toml @@ -22,7 +22,7 @@ error = { fg = "#c64343" } function = { fg = "#2e7de9" } "function.builtin" = { fg = "#188092" } "function.macro" = { fg = "#007197" } -"function.method" = { fg = "#2e7de9" } +"function.method" = "function.special" = { fg = "#007197" } hint = { fg = "#118c74" } info = { fg = "#07879d" } @@ -37,7 +37,7 @@ keyword = { fg = "#7847bd", modifiers = ["italic"] } "keyword.operator" = { fg = "#9854f1" } label = { fg = "#2e7de9" } "markup.bold" = { modifiers = ["bold"] } -"markup.heading" = { fg = "#2e7de9", modifiers = ["bold"] } +"markup.heading" = "markup.heading.completion" = { bg = "#e9e9ec", fg = "#3760bf" } "markup.heading.hover" = { bg = "#b3b8d1" } "markup.italic" = { modifiers = ["italic"] } @@ -52,7 +52,7 @@ label = { fg = "#2e7de9" } "markup.raw.block" = { fg = "#118c74" } "markup.raw.inline" = { bg = "#a1a6c5", fg = "#2e7de9" } "markup.strikethrough" = { modifiers = ["crossed_out"] } -namespace = { fg = "#007197" } +namespace = operator = { fg = "#006a83" } special = { fg = "#188092" } string = { fg = "#587539" } @@ -144,5 +144,6 @@ red = "#f52a65" red1 = "#c64343" teal = "#118c74" terminal_black = "#a1a6c5" +todo = "#2e7de9" warning = "#8c6c3e" yellow = "#8c6c3e" \ No newline at end of file diff --git a/extras/helix/tokyonight_moon.toml b/extras/helix/tokyonight_moon.toml index bd3b35b0..c7164599 100644 --- a/extras/helix/tokyonight_moon.toml +++ b/extras/helix/tokyonight_moon.toml @@ -22,7 +22,7 @@ error = { fg = "#c53b53" } function = { fg = "#82aaff" } "function.builtin" = { fg = "#65bcff" } "function.macro" = { fg = "#86e1fc" } -"function.method" = { fg = "#82aaff" } +"function.method" = "function.special" = { fg = "#86e1fc" } hint = { fg = "#4fd6be" } info = { fg = "#0db9d7" } @@ -37,7 +37,7 @@ keyword = { fg = "#fca7ea", modifiers = ["italic"] } "keyword.operator" = { fg = "#c099ff" } label = { fg = "#82aaff" } "markup.bold" = { modifiers = ["bold"] } -"markup.heading" = { fg = "#82aaff", modifiers = ["bold"] } +"markup.heading" = "markup.heading.completion" = { bg = "#1e2030", fg = "#c8d3f5" } "markup.heading.hover" = { bg = "#363c58" } "markup.italic" = { modifiers = ["italic"] } @@ -52,7 +52,7 @@ label = { fg = "#82aaff" } "markup.raw.block" = { fg = "#4fd6be" } "markup.raw.inline" = { bg = "#444a73", fg = "#82aaff" } "markup.strikethrough" = { modifiers = ["crossed_out"] } -namespace = { fg = "#86e1fc" } +namespace = operator = { fg = "#89ddff" } special = { fg = "#65bcff" } string = { fg = "#c3e88d" } @@ -144,5 +144,6 @@ red = "#ff757f" red1 = "#c53b53" teal = "#4fd6be" terminal_black = "#444a73" +todo = "#82aaff" warning = "#ffc777" yellow = "#ffc777" \ No newline at end of file diff --git a/extras/helix/tokyonight_night.toml b/extras/helix/tokyonight_night.toml index 48034268..476cb4ee 100644 --- a/extras/helix/tokyonight_night.toml +++ b/extras/helix/tokyonight_night.toml @@ -22,7 +22,7 @@ error = { fg = "#db4b4b" } function = { fg = "#7aa2f7" } "function.builtin" = { fg = "#2ac3de" } "function.macro" = { fg = "#7dcfff" } -"function.method" = { fg = "#7aa2f7" } +"function.method" = "function.special" = { fg = "#7dcfff" } hint = { fg = "#1abc9c" } info = { fg = "#0db9d7" } @@ -37,7 +37,7 @@ keyword = { fg = "#9d7cd8", modifiers = ["italic"] } "keyword.operator" = { fg = "#bb9af7" } label = { fg = "#7aa2f7" } "markup.bold" = { modifiers = ["bold"] } -"markup.heading" = { fg = "#7aa2f7", modifiers = ["bold"] } +"markup.heading" = "markup.heading.completion" = { bg = "#16161e", fg = "#c0caf5" } "markup.heading.hover" = { bg = "#343a55" } "markup.italic" = { modifiers = ["italic"] } @@ -52,7 +52,7 @@ label = { fg = "#7aa2f7" } "markup.raw.block" = { fg = "#1abc9c" } "markup.raw.inline" = { bg = "#414868", fg = "#7aa2f7" } "markup.strikethrough" = { modifiers = ["crossed_out"] } -namespace = { fg = "#7dcfff" } +namespace = operator = { fg = "#89ddff" } special = { fg = "#2ac3de" } string = { fg = "#9ece6a" } @@ -144,5 +144,6 @@ red = "#f7768e" red1 = "#db4b4b" teal = "#1abc9c" terminal_black = "#414868" +todo = "#7aa2f7" warning = "#e0af68" yellow = "#e0af68" \ No newline at end of file diff --git a/extras/helix/tokyonight_storm.toml b/extras/helix/tokyonight_storm.toml index 4c2f334f..6dcbe6b3 100644 --- a/extras/helix/tokyonight_storm.toml +++ b/extras/helix/tokyonight_storm.toml @@ -22,7 +22,7 @@ error = { fg = "#db4b4b" } function = { fg = "#7aa2f7" } "function.builtin" = { fg = "#2ac3de" } "function.macro" = { fg = "#7dcfff" } -"function.method" = { fg = "#7aa2f7" } +"function.method" = "function.special" = { fg = "#7dcfff" } hint = { fg = "#1abc9c" } info = { fg = "#0db9d7" } @@ -37,7 +37,7 @@ keyword = { fg = "#9d7cd8", modifiers = ["italic"] } "keyword.operator" = { fg = "#bb9af7" } label = { fg = "#7aa2f7" } "markup.bold" = { modifiers = ["bold"] } -"markup.heading" = { fg = "#7aa2f7", modifiers = ["bold"] } +"markup.heading" = "markup.heading.completion" = { bg = "#1f2335", fg = "#c0caf5" } "markup.heading.hover" = { bg = "#363d59" } "markup.italic" = { modifiers = ["italic"] } @@ -52,7 +52,7 @@ label = { fg = "#7aa2f7" } "markup.raw.block" = { fg = "#1abc9c" } "markup.raw.inline" = { bg = "#414868", fg = "#7aa2f7" } "markup.strikethrough" = { modifiers = ["crossed_out"] } -namespace = { fg = "#7dcfff" } +namespace = operator = { fg = "#89ddff" } special = { fg = "#2ac3de" } string = { fg = "#9ece6a" } @@ -144,5 +144,6 @@ red = "#f7768e" red1 = "#db4b4b" teal = "#1abc9c" terminal_black = "#414868" +todo = "#7aa2f7" warning = "#e0af68" yellow = "#e0af68" \ No newline at end of file diff --git a/extras/lua/tokyonight_day.lua b/extras/lua/tokyonight_day.lua index fea8397c..1baa44d8 100644 --- a/extras/lua/tokyonight_day.lua +++ b/extras/lua/tokyonight_day.lua @@ -64,19 +64,89 @@ local colors = { red1 = "#c64343", teal = "#118c74", terminal_black = "#a1a6c5", + todo = "#2e7de9", warning = "#8c6c3e", yellow = "#8c6c3e" } local highlights = { + ["@annotation"] = { + link = "PreProc" + }, + ["@attribute"] = { + link = "PreProc" + }, + ["@boolean"] = { + link = "Boolean" + }, + ["@character"] = { + link = "Character" + }, + ["@character.special"] = { + link = "SpecialChar" + }, + ["@comment"] = { + link = "Comment" + }, + ["@comment.error"] = { + fg = "#c64343" + }, + ["@comment.hint"] = { + fg = "#118c74" + }, + ["@comment.info"] = { + fg = "#07879d" + }, + ["@comment.note"] = { + fg = "#118c74" + }, + ["@comment.todo"] = { + fg = "#2e7de9" + }, + ["@comment.warning"] = { + fg = "#8c6c3e" + }, + ["@constant"] = { + link = "Constant" + }, + ["@constant.builtin"] = { + link = "Special" + }, + ["@constant.macro"] = { + link = "Define" + }, ["@constructor"] = { fg = "#9854f1" }, ["@constructor.tsx"] = { fg = "#188092" }, - ["@field"] = { - fg = "#387068" + ["@diff.delta"] = { + link = "DiffChange" + }, + ["@diff.minus"] = { + link = "DiffDelete" + }, + ["@diff.plus"] = { + link = "DiffAdd" + }, + ["@function"] = { + link = "Function" + }, + ["@function.builtin"] = { + link = "Special" + }, + ["@function.call"] = { + link = "@function" + }, + ["@function.macro"] = { + link = "Macro" + }, + ["@function.method"] = { + link = "Function" + }, + ["@function.method.call"] = { + link = "@function.method" }, ["@keyword"] = { fg = "#7847bd", @@ -84,10 +154,43 @@ local highlights = { italic = true } }, + ["@keyword.conditional"] = { + link = "Conditional" + }, + ["@keyword.coroutine"] = { + link = "@keyword" + }, + ["@keyword.debug"] = { + link = "Debug" + }, + ["@keyword.directive"] = { + link = "PreProc" + }, + ["@keyword.directive.define"] = { + link = "Define" + }, + ["@keyword.exception"] = { + link = "Exception" + }, ["@keyword.function"] = { fg = "#9854f1", style = {} }, + ["@keyword.import"] = { + link = "Include" + }, + ["@keyword.operator"] = { + link = "@operator" + }, + ["@keyword.repeat"] = { + link = "Repeat" + }, + ["@keyword.return"] = { + link = "@keyword" + }, + ["@keyword.storage"] = { + link = "StorageClass" + }, ["@label"] = { fg = "#2e7de9" }, @@ -116,7 +219,7 @@ local highlights = { link = "@string.escape" }, ["@lsp.type.formatSpecifier"] = { - link = "@punctuation.special" + link = "@markup.list" }, ["@lsp.type.generic"] = { link = "@variable" @@ -128,10 +231,10 @@ local highlights = { link = "@keyword" }, ["@lsp.type.lifetime"] = { - link = "@storageclass" + link = "@keyword.storage" }, ["@lsp.type.namespace"] = { - link = "@namespace" + link = "@module" }, ["@lsp.type.number"] = { link = "@number" @@ -140,7 +243,7 @@ local highlights = { link = "@operator" }, ["@lsp.type.parameter"] = { - link = "@parameter" + link = "@variable.parameter" }, ["@lsp.type.property"] = { link = "@property" @@ -213,106 +316,159 @@ local highlights = { ["@lsp.typemod.variable.static"] = { link = "@constant" }, - ["@namespace"] = { - link = "Include" + ["@markup"] = { + link = "@none" }, - ["@namespace.builtin"] = { - fg = "#f52a65" + ["@markup.emphasis"] = { + italic = true }, - ["@operator"] = { - fg = "#006a83" + ["@markup.environment"] = { + link = "Macro" + }, + ["@markup.environment.name"] = { + link = "Type" + }, + ["@markup.heading"] = { + link = "Title" }, - ["@parameter"] = { + ["@markup.heading.1.markdown"] = { + bold = true, + fg = "#2e7de9" + }, + ["@markup.heading.2.markdown"] = { + bold = true, fg = "#8c6c3e" }, - ["@parameter.builtin"] = { - fg = "#7b6545" + ["@markup.heading.3.markdown"] = { + bold = true, + fg = "#587539" }, - ["@property"] = { - fg = "#387068" + ["@markup.heading.4.markdown"] = { + bold = true, + fg = "#118c74" }, - ["@punctuation.bracket"] = { - fg = "#6172b0" + ["@markup.heading.5.markdown"] = { + bold = true, + fg = "#9854f1" }, - ["@punctuation.delimiter"] = { - fg = "#006a83" + ["@markup.heading.6.markdown"] = { + bold = true, + fg = "#7847bd" }, - ["@punctuation.special"] = { + ["@markup.link"] = { + fg = "#118c74" + }, + ["@markup.link.label"] = { + link = "SpecialChar" + }, + ["@markup.link.label.symbol"] = { + link = "Identifier" + }, + ["@markup.link.url"] = { + link = "Underlined" + }, + ["@markup.list"] = { fg = "#006a83" }, - ["@punctuation.special.markdown"] = { + ["@markup.list.checked"] = { + fg = "#387068" + }, + ["@markup.list.markdown"] = { bold = true, fg = "#b15c00" }, - ["@string.documentation"] = { - fg = "#8c6c3e" + ["@markup.list.unchecked"] = { + fg = "#2e7de9" }, - ["@string.escape"] = { - fg = "#9854f1" + ["@markup.math"] = { + link = "Special" }, - ["@string.regex"] = { - fg = "#2e5857" + ["@markup.raw"] = { + link = "String" }, - ["@tag.delimiter.tsx"] = { - fg = "#5772ad" + ["@markup.raw.markdown_inline"] = { + bg = "#a1a6c5", + fg = "#2e7de9" }, - ["@tag.tsx"] = { + ["@markup.strikethrough"] = { + strikethrough = true + }, + ["@markup.strong"] = { + bold = true + }, + ["@markup.underline"] = { + underline = true + }, + ["@module"] = { + link = "Include" + }, + ["@module.builtin"] = { fg = "#f52a65" }, - ["@text.danger"] = { - bg = "#c64343", - fg = "#e1e2e7" + ["@namespace.builtin"] = { + link = "@variable.builtin" }, - ["@text.diff.add"] = { - link = "DiffAdd" + ["@none"] = {}, + ["@number"] = { + link = "Number" }, - ["@text.diff.delete"] = { - link = "DiffDelete" + ["@number.float"] = { + link = "Float" }, - ["@text.literal.markdown_inline"] = { - bg = "#a1a6c5", - fg = "#2e7de9" + ["@operator"] = { + fg = "#006a83" }, - ["@text.reference"] = { - fg = "#118c74" + ["@property"] = { + fg = "#387068" }, - ["@text.title.1.markdown"] = { - bold = true, - fg = "#2e7de9" + ["@punctuation.bracket"] = { + fg = "#6172b0" }, - ["@text.title.2.markdown"] = { - bold = true, - fg = "#8c6c3e" + ["@punctuation.delimiter"] = { + fg = "#006a83" }, - ["@text.title.3.markdown"] = { - bold = true, - fg = "#587539" + ["@punctuation.special"] = { + fg = "#006a83" }, - ["@text.title.4.markdown"] = { - bold = true, - fg = "#118c74" + ["@string"] = { + link = "String" }, - ["@text.title.5.markdown"] = { - bold = true, + ["@string.documentation"] = { + fg = "#8c6c3e" + }, + ["@string.escape"] = { fg = "#9854f1" }, - ["@text.title.6.markdown"] = { - bold = true, - fg = "#7847bd" + ["@string.regexp"] = { + fg = "#2e5857" }, - ["@text.todo.checked"] = { - fg = "#387068" + ["@tag"] = { + link = "Label" }, - ["@text.todo.unchecked"] = { - fg = "#2e7de9" + ["@tag.attribute"] = { + link = "@property" }, - ["@text.warning"] = { - bg = "#8c6c3e", - fg = "#e1e2e7" + ["@tag.delimiter"] = { + link = "Delimiter" + }, + ["@tag.delimiter.tsx"] = { + fg = "#5772ad" + }, + ["@tag.tsx"] = { + fg = "#f52a65" + }, + ["@type"] = { + link = "Type" }, ["@type.builtin"] = { fg = "#2496ac" }, + ["@type.definition"] = { + link = "Typedef" + }, + ["@type.qualifier"] = { + link = "@keyword" + }, ["@variable"] = { fg = "#3760bf", style = {} @@ -320,6 +476,15 @@ local highlights = { ["@variable.builtin"] = { fg = "#f52a65" }, + ["@variable.member"] = { + fg = "#387068" + }, + ["@variable.parameter"] = { + fg = "#8c6c3e" + }, + ["@variable.parameter.builtin"] = { + fg = "#7b6545" + }, ALEErrorSign = { fg = "#c64343" }, @@ -840,6 +1005,9 @@ local highlights = { DefinitionIcon = { fg = "#2e7de9" }, + Delimiter = { + link = "Special" + }, DiagnosticError = { fg = "#c64343" }, @@ -1195,7 +1363,7 @@ local highlights = { link = "Special" }, LspKindField = { - link = "@field" + link = "@variable.member" }, LspKindFile = { link = "Normal" @@ -1210,19 +1378,19 @@ local highlights = { link = "@lsp.type.interface" }, LspKindKey = { - link = "@field" + link = "@variable.member" }, LspKindKeyword = { link = "@lsp.type.keyword" }, LspKindMethod = { - link = "@method" + link = "@function.method" }, LspKindModule = { - link = "@namespace" + link = "@module" }, LspKindNamespace = { - link = "@namespace" + link = "@module" }, LspKindNull = { link = "@constant.builtin" @@ -1237,13 +1405,13 @@ local highlights = { link = "@operator" }, LspKindPackage = { - link = "@namespace" + link = "@module" }, LspKindProperty = { link = "@property" }, LspKindReference = { - link = "@text.reference" + link = "@markup.link" }, LspKindSnippet = { link = "Conceal" @@ -1255,7 +1423,7 @@ local highlights = { link = "@lsp.type.struct" }, LspKindText = { - link = "@text" + link = "@markup" }, LspKindTypeParameter = { link = "@lsp.type.typeParameter" @@ -2146,7 +2314,7 @@ local highlights = { }, TroubleNormal = { bg = "#e9e9ec", - fg = "#6172b0" + fg = "#3760bf" }, TroubleText = { fg = "#6172b0" @@ -2196,6 +2364,12 @@ local highlights = { WildMenu = { bg = "#b6bfe2" }, + WinBar = { + link = "StatusLine" + }, + WinBarNC = { + link = "StatusLineNC" + }, WinSeparator = { bold = true, fg = "#e9e9ed" diff --git a/extras/lua/tokyonight_moon.lua b/extras/lua/tokyonight_moon.lua index d80034ff..6027ef85 100644 --- a/extras/lua/tokyonight_moon.lua +++ b/extras/lua/tokyonight_moon.lua @@ -64,19 +64,89 @@ local colors = { red1 = "#c53b53", teal = "#4fd6be", terminal_black = "#444a73", + todo = "#82aaff", warning = "#ffc777", yellow = "#ffc777" } local highlights = { + ["@annotation"] = { + link = "PreProc" + }, + ["@attribute"] = { + link = "PreProc" + }, + ["@boolean"] = { + link = "Boolean" + }, + ["@character"] = { + link = "Character" + }, + ["@character.special"] = { + link = "SpecialChar" + }, + ["@comment"] = { + link = "Comment" + }, + ["@comment.error"] = { + fg = "#c53b53" + }, + ["@comment.hint"] = { + fg = "#4fd6be" + }, + ["@comment.info"] = { + fg = "#0db9d7" + }, + ["@comment.note"] = { + fg = "#4fd6be" + }, + ["@comment.todo"] = { + fg = "#82aaff" + }, + ["@comment.warning"] = { + fg = "#ffc777" + }, + ["@constant"] = { + link = "Constant" + }, + ["@constant.builtin"] = { + link = "Special" + }, + ["@constant.macro"] = { + link = "Define" + }, ["@constructor"] = { fg = "#c099ff" }, ["@constructor.tsx"] = { fg = "#65bcff" }, - ["@field"] = { - fg = "#4fd6be" + ["@diff.delta"] = { + link = "DiffChange" + }, + ["@diff.minus"] = { + link = "DiffDelete" + }, + ["@diff.plus"] = { + link = "DiffAdd" + }, + ["@function"] = { + link = "Function" + }, + ["@function.builtin"] = { + link = "Special" + }, + ["@function.call"] = { + link = "@function" + }, + ["@function.macro"] = { + link = "Macro" + }, + ["@function.method"] = { + link = "Function" + }, + ["@function.method.call"] = { + link = "@function.method" }, ["@keyword"] = { fg = "#fca7ea", @@ -84,10 +154,43 @@ local highlights = { italic = true } }, + ["@keyword.conditional"] = { + link = "Conditional" + }, + ["@keyword.coroutine"] = { + link = "@keyword" + }, + ["@keyword.debug"] = { + link = "Debug" + }, + ["@keyword.directive"] = { + link = "PreProc" + }, + ["@keyword.directive.define"] = { + link = "Define" + }, + ["@keyword.exception"] = { + link = "Exception" + }, ["@keyword.function"] = { fg = "#c099ff", style = {} }, + ["@keyword.import"] = { + link = "Include" + }, + ["@keyword.operator"] = { + link = "@operator" + }, + ["@keyword.repeat"] = { + link = "Repeat" + }, + ["@keyword.return"] = { + link = "@keyword" + }, + ["@keyword.storage"] = { + link = "StorageClass" + }, ["@label"] = { fg = "#82aaff" }, @@ -116,7 +219,7 @@ local highlights = { link = "@string.escape" }, ["@lsp.type.formatSpecifier"] = { - link = "@punctuation.special" + link = "@markup.list" }, ["@lsp.type.generic"] = { link = "@variable" @@ -128,10 +231,10 @@ local highlights = { link = "@keyword" }, ["@lsp.type.lifetime"] = { - link = "@storageclass" + link = "@keyword.storage" }, ["@lsp.type.namespace"] = { - link = "@namespace" + link = "@module" }, ["@lsp.type.number"] = { link = "@number" @@ -140,7 +243,7 @@ local highlights = { link = "@operator" }, ["@lsp.type.parameter"] = { - link = "@parameter" + link = "@variable.parameter" }, ["@lsp.type.property"] = { link = "@property" @@ -213,106 +316,159 @@ local highlights = { ["@lsp.typemod.variable.static"] = { link = "@constant" }, - ["@namespace"] = { - link = "Include" + ["@markup"] = { + link = "@none" }, - ["@namespace.builtin"] = { - fg = "#ff757f" + ["@markup.emphasis"] = { + italic = true }, - ["@operator"] = { - fg = "#89ddff" + ["@markup.environment"] = { + link = "Macro" + }, + ["@markup.environment.name"] = { + link = "Type" + }, + ["@markup.heading"] = { + link = "Title" + }, + ["@markup.heading.1.markdown"] = { + bold = true, + fg = "#82aaff" }, - ["@parameter"] = { + ["@markup.heading.2.markdown"] = { + bold = true, fg = "#ffc777" }, - ["@parameter.builtin"] = { - fg = "#ffd292" + ["@markup.heading.3.markdown"] = { + bold = true, + fg = "#c3e88d" }, - ["@property"] = { + ["@markup.heading.4.markdown"] = { + bold = true, fg = "#4fd6be" }, - ["@punctuation.bracket"] = { - fg = "#828bb8" + ["@markup.heading.5.markdown"] = { + bold = true, + fg = "#c099ff" }, - ["@punctuation.delimiter"] = { - fg = "#89ddff" + ["@markup.heading.6.markdown"] = { + bold = true, + fg = "#fca7ea" }, - ["@punctuation.special"] = { + ["@markup.link"] = { + fg = "#4fd6be" + }, + ["@markup.link.label"] = { + link = "SpecialChar" + }, + ["@markup.link.label.symbol"] = { + link = "Identifier" + }, + ["@markup.link.url"] = { + link = "Underlined" + }, + ["@markup.list"] = { fg = "#89ddff" }, - ["@punctuation.special.markdown"] = { + ["@markup.list.checked"] = { + fg = "#4fd6be" + }, + ["@markup.list.markdown"] = { bold = true, fg = "#ff966c" }, - ["@string.documentation"] = { - fg = "#ffc777" + ["@markup.list.unchecked"] = { + fg = "#82aaff" }, - ["@string.escape"] = { - fg = "#c099ff" + ["@markup.math"] = { + link = "Special" }, - ["@string.regex"] = { - fg = "#b4f9f8" + ["@markup.raw"] = { + link = "String" }, - ["@tag.delimiter.tsx"] = { - fg = "#6582c3" + ["@markup.raw.markdown_inline"] = { + bg = "#444a73", + fg = "#82aaff" }, - ["@tag.tsx"] = { + ["@markup.strikethrough"] = { + strikethrough = true + }, + ["@markup.strong"] = { + bold = true + }, + ["@markup.underline"] = { + underline = true + }, + ["@module"] = { + link = "Include" + }, + ["@module.builtin"] = { fg = "#ff757f" }, - ["@text.danger"] = { - bg = "#c53b53", - fg = "#222436" + ["@namespace.builtin"] = { + link = "@variable.builtin" }, - ["@text.diff.add"] = { - link = "DiffAdd" + ["@none"] = {}, + ["@number"] = { + link = "Number" }, - ["@text.diff.delete"] = { - link = "DiffDelete" + ["@number.float"] = { + link = "Float" }, - ["@text.literal.markdown_inline"] = { - bg = "#444a73", - fg = "#82aaff" + ["@operator"] = { + fg = "#89ddff" }, - ["@text.reference"] = { + ["@property"] = { fg = "#4fd6be" }, - ["@text.title.1.markdown"] = { - bold = true, - fg = "#82aaff" + ["@punctuation.bracket"] = { + fg = "#828bb8" }, - ["@text.title.2.markdown"] = { - bold = true, - fg = "#ffc777" + ["@punctuation.delimiter"] = { + fg = "#89ddff" }, - ["@text.title.3.markdown"] = { - bold = true, - fg = "#c3e88d" + ["@punctuation.special"] = { + fg = "#89ddff" }, - ["@text.title.4.markdown"] = { - bold = true, - fg = "#4fd6be" + ["@string"] = { + link = "String" }, - ["@text.title.5.markdown"] = { - bold = true, + ["@string.documentation"] = { + fg = "#ffc777" + }, + ["@string.escape"] = { fg = "#c099ff" }, - ["@text.title.6.markdown"] = { - bold = true, - fg = "#fca7ea" + ["@string.regexp"] = { + fg = "#b4f9f8" }, - ["@text.todo.checked"] = { - fg = "#4fd6be" + ["@tag"] = { + link = "Label" }, - ["@text.todo.unchecked"] = { - fg = "#82aaff" + ["@tag.attribute"] = { + link = "@property" }, - ["@text.warning"] = { - bg = "#ffc777", - fg = "#222436" + ["@tag.delimiter"] = { + link = "Delimiter" + }, + ["@tag.delimiter.tsx"] = { + fg = "#6582c3" + }, + ["@tag.tsx"] = { + fg = "#ff757f" + }, + ["@type"] = { + link = "Type" }, ["@type.builtin"] = { fg = "#589ed7" }, + ["@type.definition"] = { + link = "Typedef" + }, + ["@type.qualifier"] = { + link = "@keyword" + }, ["@variable"] = { fg = "#c8d3f5", style = {} @@ -320,6 +476,15 @@ local highlights = { ["@variable.builtin"] = { fg = "#ff757f" }, + ["@variable.member"] = { + fg = "#4fd6be" + }, + ["@variable.parameter"] = { + fg = "#ffc777" + }, + ["@variable.parameter.builtin"] = { + fg = "#ffd292" + }, ALEErrorSign = { fg = "#c53b53" }, @@ -840,6 +1005,9 @@ local highlights = { DefinitionIcon = { fg = "#82aaff" }, + Delimiter = { + link = "Special" + }, DiagnosticError = { fg = "#c53b53" }, @@ -1195,7 +1363,7 @@ local highlights = { link = "Special" }, LspKindField = { - link = "@field" + link = "@variable.member" }, LspKindFile = { link = "Normal" @@ -1210,19 +1378,19 @@ local highlights = { link = "@lsp.type.interface" }, LspKindKey = { - link = "@field" + link = "@variable.member" }, LspKindKeyword = { link = "@lsp.type.keyword" }, LspKindMethod = { - link = "@method" + link = "@function.method" }, LspKindModule = { - link = "@namespace" + link = "@module" }, LspKindNamespace = { - link = "@namespace" + link = "@module" }, LspKindNull = { link = "@constant.builtin" @@ -1237,13 +1405,13 @@ local highlights = { link = "@operator" }, LspKindPackage = { - link = "@namespace" + link = "@module" }, LspKindProperty = { link = "@property" }, LspKindReference = { - link = "@text.reference" + link = "@markup.link" }, LspKindSnippet = { link = "Conceal" @@ -1255,7 +1423,7 @@ local highlights = { link = "@lsp.type.struct" }, LspKindText = { - link = "@text" + link = "@markup" }, LspKindTypeParameter = { link = "@lsp.type.typeParameter" @@ -2146,7 +2314,7 @@ local highlights = { }, TroubleNormal = { bg = "#1e2030", - fg = "#828bb8" + fg = "#c8d3f5" }, TroubleText = { fg = "#828bb8" @@ -2196,6 +2364,12 @@ local highlights = { WildMenu = { bg = "#2d3f76" }, + WinBar = { + link = "StatusLine" + }, + WinBarNC = { + link = "StatusLineNC" + }, WinSeparator = { bold = true, fg = "#1b1d2b" diff --git a/extras/lua/tokyonight_night.lua b/extras/lua/tokyonight_night.lua index 48a5a3fd..7256149b 100644 --- a/extras/lua/tokyonight_night.lua +++ b/extras/lua/tokyonight_night.lua @@ -64,19 +64,89 @@ local colors = { red1 = "#db4b4b", teal = "#1abc9c", terminal_black = "#414868", + todo = "#7aa2f7", warning = "#e0af68", yellow = "#e0af68" } local highlights = { + ["@annotation"] = { + link = "PreProc" + }, + ["@attribute"] = { + link = "PreProc" + }, + ["@boolean"] = { + link = "Boolean" + }, + ["@character"] = { + link = "Character" + }, + ["@character.special"] = { + link = "SpecialChar" + }, + ["@comment"] = { + link = "Comment" + }, + ["@comment.error"] = { + fg = "#db4b4b" + }, + ["@comment.hint"] = { + fg = "#1abc9c" + }, + ["@comment.info"] = { + fg = "#0db9d7" + }, + ["@comment.note"] = { + fg = "#1abc9c" + }, + ["@comment.todo"] = { + fg = "#7aa2f7" + }, + ["@comment.warning"] = { + fg = "#e0af68" + }, + ["@constant"] = { + link = "Constant" + }, + ["@constant.builtin"] = { + link = "Special" + }, + ["@constant.macro"] = { + link = "Define" + }, ["@constructor"] = { fg = "#bb9af7" }, ["@constructor.tsx"] = { fg = "#2ac3de" }, - ["@field"] = { - fg = "#73daca" + ["@diff.delta"] = { + link = "DiffChange" + }, + ["@diff.minus"] = { + link = "DiffDelete" + }, + ["@diff.plus"] = { + link = "DiffAdd" + }, + ["@function"] = { + link = "Function" + }, + ["@function.builtin"] = { + link = "Special" + }, + ["@function.call"] = { + link = "@function" + }, + ["@function.macro"] = { + link = "Macro" + }, + ["@function.method"] = { + link = "Function" + }, + ["@function.method.call"] = { + link = "@function.method" }, ["@keyword"] = { fg = "#9d7cd8", @@ -84,10 +154,43 @@ local highlights = { italic = true } }, + ["@keyword.conditional"] = { + link = "Conditional" + }, + ["@keyword.coroutine"] = { + link = "@keyword" + }, + ["@keyword.debug"] = { + link = "Debug" + }, + ["@keyword.directive"] = { + link = "PreProc" + }, + ["@keyword.directive.define"] = { + link = "Define" + }, + ["@keyword.exception"] = { + link = "Exception" + }, ["@keyword.function"] = { fg = "#bb9af7", style = {} }, + ["@keyword.import"] = { + link = "Include" + }, + ["@keyword.operator"] = { + link = "@operator" + }, + ["@keyword.repeat"] = { + link = "Repeat" + }, + ["@keyword.return"] = { + link = "@keyword" + }, + ["@keyword.storage"] = { + link = "StorageClass" + }, ["@label"] = { fg = "#7aa2f7" }, @@ -116,7 +219,7 @@ local highlights = { link = "@string.escape" }, ["@lsp.type.formatSpecifier"] = { - link = "@punctuation.special" + link = "@markup.list" }, ["@lsp.type.generic"] = { link = "@variable" @@ -128,10 +231,10 @@ local highlights = { link = "@keyword" }, ["@lsp.type.lifetime"] = { - link = "@storageclass" + link = "@keyword.storage" }, ["@lsp.type.namespace"] = { - link = "@namespace" + link = "@module" }, ["@lsp.type.number"] = { link = "@number" @@ -140,7 +243,7 @@ local highlights = { link = "@operator" }, ["@lsp.type.parameter"] = { - link = "@parameter" + link = "@variable.parameter" }, ["@lsp.type.property"] = { link = "@property" @@ -213,106 +316,159 @@ local highlights = { ["@lsp.typemod.variable.static"] = { link = "@constant" }, - ["@namespace"] = { - link = "Include" + ["@markup"] = { + link = "@none" }, - ["@namespace.builtin"] = { - fg = "#f7768e" + ["@markup.emphasis"] = { + italic = true }, - ["@operator"] = { - fg = "#89ddff" + ["@markup.environment"] = { + link = "Macro" + }, + ["@markup.environment.name"] = { + link = "Type" + }, + ["@markup.heading"] = { + link = "Title" }, - ["@parameter"] = { + ["@markup.heading.1.markdown"] = { + bold = true, + fg = "#7aa2f7" + }, + ["@markup.heading.2.markdown"] = { + bold = true, fg = "#e0af68" }, - ["@parameter.builtin"] = { - fg = "#e6bf86" + ["@markup.heading.3.markdown"] = { + bold = true, + fg = "#9ece6a" }, - ["@property"] = { - fg = "#73daca" + ["@markup.heading.4.markdown"] = { + bold = true, + fg = "#1abc9c" }, - ["@punctuation.bracket"] = { - fg = "#a9b1d6" + ["@markup.heading.5.markdown"] = { + bold = true, + fg = "#bb9af7" }, - ["@punctuation.delimiter"] = { - fg = "#89ddff" + ["@markup.heading.6.markdown"] = { + bold = true, + fg = "#9d7cd8" }, - ["@punctuation.special"] = { + ["@markup.link"] = { + fg = "#1abc9c" + }, + ["@markup.link.label"] = { + link = "SpecialChar" + }, + ["@markup.link.label.symbol"] = { + link = "Identifier" + }, + ["@markup.link.url"] = { + link = "Underlined" + }, + ["@markup.list"] = { fg = "#89ddff" }, - ["@punctuation.special.markdown"] = { + ["@markup.list.checked"] = { + fg = "#73daca" + }, + ["@markup.list.markdown"] = { bold = true, fg = "#ff9e64" }, - ["@string.documentation"] = { - fg = "#e0af68" + ["@markup.list.unchecked"] = { + fg = "#7aa2f7" }, - ["@string.escape"] = { - fg = "#bb9af7" + ["@markup.math"] = { + link = "Special" }, - ["@string.regex"] = { - fg = "#b4f9f8" + ["@markup.raw"] = { + link = "String" }, - ["@tag.delimiter.tsx"] = { - fg = "#5d7ab8" + ["@markup.raw.markdown_inline"] = { + bg = "#414868", + fg = "#7aa2f7" }, - ["@tag.tsx"] = { + ["@markup.strikethrough"] = { + strikethrough = true + }, + ["@markup.strong"] = { + bold = true + }, + ["@markup.underline"] = { + underline = true + }, + ["@module"] = { + link = "Include" + }, + ["@module.builtin"] = { fg = "#f7768e" }, - ["@text.danger"] = { - bg = "#db4b4b", - fg = "#1a1b26" + ["@namespace.builtin"] = { + link = "@variable.builtin" }, - ["@text.diff.add"] = { - link = "DiffAdd" + ["@none"] = {}, + ["@number"] = { + link = "Number" }, - ["@text.diff.delete"] = { - link = "DiffDelete" + ["@number.float"] = { + link = "Float" }, - ["@text.literal.markdown_inline"] = { - bg = "#414868", - fg = "#7aa2f7" + ["@operator"] = { + fg = "#89ddff" }, - ["@text.reference"] = { - fg = "#1abc9c" + ["@property"] = { + fg = "#73daca" }, - ["@text.title.1.markdown"] = { - bold = true, - fg = "#7aa2f7" + ["@punctuation.bracket"] = { + fg = "#a9b1d6" }, - ["@text.title.2.markdown"] = { - bold = true, - fg = "#e0af68" + ["@punctuation.delimiter"] = { + fg = "#89ddff" }, - ["@text.title.3.markdown"] = { - bold = true, - fg = "#9ece6a" + ["@punctuation.special"] = { + fg = "#89ddff" }, - ["@text.title.4.markdown"] = { - bold = true, - fg = "#1abc9c" + ["@string"] = { + link = "String" }, - ["@text.title.5.markdown"] = { - bold = true, + ["@string.documentation"] = { + fg = "#e0af68" + }, + ["@string.escape"] = { fg = "#bb9af7" }, - ["@text.title.6.markdown"] = { - bold = true, - fg = "#9d7cd8" + ["@string.regexp"] = { + fg = "#b4f9f8" }, - ["@text.todo.checked"] = { - fg = "#73daca" + ["@tag"] = { + link = "Label" }, - ["@text.todo.unchecked"] = { - fg = "#7aa2f7" + ["@tag.attribute"] = { + link = "@property" }, - ["@text.warning"] = { - bg = "#e0af68", - fg = "#1a1b26" + ["@tag.delimiter"] = { + link = "Delimiter" + }, + ["@tag.delimiter.tsx"] = { + fg = "#5d7ab8" + }, + ["@tag.tsx"] = { + fg = "#f7768e" + }, + ["@type"] = { + link = "Type" }, ["@type.builtin"] = { fg = "#27a1b9" }, + ["@type.definition"] = { + link = "Typedef" + }, + ["@type.qualifier"] = { + link = "@keyword" + }, ["@variable"] = { fg = "#c0caf5", style = {} @@ -320,6 +476,15 @@ local highlights = { ["@variable.builtin"] = { fg = "#f7768e" }, + ["@variable.member"] = { + fg = "#73daca" + }, + ["@variable.parameter"] = { + fg = "#e0af68" + }, + ["@variable.parameter.builtin"] = { + fg = "#e6bf86" + }, ALEErrorSign = { fg = "#db4b4b" }, @@ -840,6 +1005,9 @@ local highlights = { DefinitionIcon = { fg = "#7aa2f7" }, + Delimiter = { + link = "Special" + }, DiagnosticError = { fg = "#db4b4b" }, @@ -1195,7 +1363,7 @@ local highlights = { link = "Special" }, LspKindField = { - link = "@field" + link = "@variable.member" }, LspKindFile = { link = "Normal" @@ -1210,19 +1378,19 @@ local highlights = { link = "@lsp.type.interface" }, LspKindKey = { - link = "@field" + link = "@variable.member" }, LspKindKeyword = { link = "@lsp.type.keyword" }, LspKindMethod = { - link = "@method" + link = "@function.method" }, LspKindModule = { - link = "@namespace" + link = "@module" }, LspKindNamespace = { - link = "@namespace" + link = "@module" }, LspKindNull = { link = "@constant.builtin" @@ -1237,13 +1405,13 @@ local highlights = { link = "@operator" }, LspKindPackage = { - link = "@namespace" + link = "@module" }, LspKindProperty = { link = "@property" }, LspKindReference = { - link = "@text.reference" + link = "@markup.link" }, LspKindSnippet = { link = "Conceal" @@ -1255,7 +1423,7 @@ local highlights = { link = "@lsp.type.struct" }, LspKindText = { - link = "@text" + link = "@markup" }, LspKindTypeParameter = { link = "@lsp.type.typeParameter" @@ -2146,7 +2314,7 @@ local highlights = { }, TroubleNormal = { bg = "#16161e", - fg = "#a9b1d6" + fg = "#c0caf5" }, TroubleText = { fg = "#a9b1d6" @@ -2196,6 +2364,12 @@ local highlights = { WildMenu = { bg = "#283457" }, + WinBar = { + link = "StatusLine" + }, + WinBarNC = { + link = "StatusLineNC" + }, WinSeparator = { bold = true, fg = "#15161e" diff --git a/extras/lua/tokyonight_storm.lua b/extras/lua/tokyonight_storm.lua index 0dbd9c04..1a09458a 100644 --- a/extras/lua/tokyonight_storm.lua +++ b/extras/lua/tokyonight_storm.lua @@ -64,19 +64,89 @@ local colors = { red1 = "#db4b4b", teal = "#1abc9c", terminal_black = "#414868", + todo = "#7aa2f7", warning = "#e0af68", yellow = "#e0af68" } local highlights = { + ["@annotation"] = { + link = "PreProc" + }, + ["@attribute"] = { + link = "PreProc" + }, + ["@boolean"] = { + link = "Boolean" + }, + ["@character"] = { + link = "Character" + }, + ["@character.special"] = { + link = "SpecialChar" + }, + ["@comment"] = { + link = "Comment" + }, + ["@comment.error"] = { + fg = "#db4b4b" + }, + ["@comment.hint"] = { + fg = "#1abc9c" + }, + ["@comment.info"] = { + fg = "#0db9d7" + }, + ["@comment.note"] = { + fg = "#1abc9c" + }, + ["@comment.todo"] = { + fg = "#7aa2f7" + }, + ["@comment.warning"] = { + fg = "#e0af68" + }, + ["@constant"] = { + link = "Constant" + }, + ["@constant.builtin"] = { + link = "Special" + }, + ["@constant.macro"] = { + link = "Define" + }, ["@constructor"] = { fg = "#bb9af7" }, ["@constructor.tsx"] = { fg = "#2ac3de" }, - ["@field"] = { - fg = "#73daca" + ["@diff.delta"] = { + link = "DiffChange" + }, + ["@diff.minus"] = { + link = "DiffDelete" + }, + ["@diff.plus"] = { + link = "DiffAdd" + }, + ["@function"] = { + link = "Function" + }, + ["@function.builtin"] = { + link = "Special" + }, + ["@function.call"] = { + link = "@function" + }, + ["@function.macro"] = { + link = "Macro" + }, + ["@function.method"] = { + link = "Function" + }, + ["@function.method.call"] = { + link = "@function.method" }, ["@keyword"] = { fg = "#9d7cd8", @@ -84,10 +154,43 @@ local highlights = { italic = true } }, + ["@keyword.conditional"] = { + link = "Conditional" + }, + ["@keyword.coroutine"] = { + link = "@keyword" + }, + ["@keyword.debug"] = { + link = "Debug" + }, + ["@keyword.directive"] = { + link = "PreProc" + }, + ["@keyword.directive.define"] = { + link = "Define" + }, + ["@keyword.exception"] = { + link = "Exception" + }, ["@keyword.function"] = { fg = "#bb9af7", style = {} }, + ["@keyword.import"] = { + link = "Include" + }, + ["@keyword.operator"] = { + link = "@operator" + }, + ["@keyword.repeat"] = { + link = "Repeat" + }, + ["@keyword.return"] = { + link = "@keyword" + }, + ["@keyword.storage"] = { + link = "StorageClass" + }, ["@label"] = { fg = "#7aa2f7" }, @@ -116,7 +219,7 @@ local highlights = { link = "@string.escape" }, ["@lsp.type.formatSpecifier"] = { - link = "@punctuation.special" + link = "@markup.list" }, ["@lsp.type.generic"] = { link = "@variable" @@ -128,10 +231,10 @@ local highlights = { link = "@keyword" }, ["@lsp.type.lifetime"] = { - link = "@storageclass" + link = "@keyword.storage" }, ["@lsp.type.namespace"] = { - link = "@namespace" + link = "@module" }, ["@lsp.type.number"] = { link = "@number" @@ -140,7 +243,7 @@ local highlights = { link = "@operator" }, ["@lsp.type.parameter"] = { - link = "@parameter" + link = "@variable.parameter" }, ["@lsp.type.property"] = { link = "@property" @@ -213,106 +316,159 @@ local highlights = { ["@lsp.typemod.variable.static"] = { link = "@constant" }, - ["@namespace"] = { - link = "Include" + ["@markup"] = { + link = "@none" }, - ["@namespace.builtin"] = { - fg = "#f7768e" + ["@markup.emphasis"] = { + italic = true }, - ["@operator"] = { - fg = "#89ddff" + ["@markup.environment"] = { + link = "Macro" + }, + ["@markup.environment.name"] = { + link = "Type" + }, + ["@markup.heading"] = { + link = "Title" }, - ["@parameter"] = { + ["@markup.heading.1.markdown"] = { + bold = true, + fg = "#7aa2f7" + }, + ["@markup.heading.2.markdown"] = { + bold = true, fg = "#e0af68" }, - ["@parameter.builtin"] = { - fg = "#e6bf86" + ["@markup.heading.3.markdown"] = { + bold = true, + fg = "#9ece6a" }, - ["@property"] = { - fg = "#73daca" + ["@markup.heading.4.markdown"] = { + bold = true, + fg = "#1abc9c" }, - ["@punctuation.bracket"] = { - fg = "#a9b1d6" + ["@markup.heading.5.markdown"] = { + bold = true, + fg = "#bb9af7" }, - ["@punctuation.delimiter"] = { - fg = "#89ddff" + ["@markup.heading.6.markdown"] = { + bold = true, + fg = "#9d7cd8" }, - ["@punctuation.special"] = { + ["@markup.link"] = { + fg = "#1abc9c" + }, + ["@markup.link.label"] = { + link = "SpecialChar" + }, + ["@markup.link.label.symbol"] = { + link = "Identifier" + }, + ["@markup.link.url"] = { + link = "Underlined" + }, + ["@markup.list"] = { fg = "#89ddff" }, - ["@punctuation.special.markdown"] = { + ["@markup.list.checked"] = { + fg = "#73daca" + }, + ["@markup.list.markdown"] = { bold = true, fg = "#ff9e64" }, - ["@string.documentation"] = { - fg = "#e0af68" + ["@markup.list.unchecked"] = { + fg = "#7aa2f7" }, - ["@string.escape"] = { - fg = "#bb9af7" + ["@markup.math"] = { + link = "Special" }, - ["@string.regex"] = { - fg = "#b4f9f8" + ["@markup.raw"] = { + link = "String" }, - ["@tag.delimiter.tsx"] = { - fg = "#607dbf" + ["@markup.raw.markdown_inline"] = { + bg = "#414868", + fg = "#7aa2f7" }, - ["@tag.tsx"] = { + ["@markup.strikethrough"] = { + strikethrough = true + }, + ["@markup.strong"] = { + bold = true + }, + ["@markup.underline"] = { + underline = true + }, + ["@module"] = { + link = "Include" + }, + ["@module.builtin"] = { fg = "#f7768e" }, - ["@text.danger"] = { - bg = "#db4b4b", - fg = "#24283b" + ["@namespace.builtin"] = { + link = "@variable.builtin" }, - ["@text.diff.add"] = { - link = "DiffAdd" + ["@none"] = {}, + ["@number"] = { + link = "Number" }, - ["@text.diff.delete"] = { - link = "DiffDelete" + ["@number.float"] = { + link = "Float" }, - ["@text.literal.markdown_inline"] = { - bg = "#414868", - fg = "#7aa2f7" + ["@operator"] = { + fg = "#89ddff" }, - ["@text.reference"] = { - fg = "#1abc9c" + ["@property"] = { + fg = "#73daca" }, - ["@text.title.1.markdown"] = { - bold = true, - fg = "#7aa2f7" + ["@punctuation.bracket"] = { + fg = "#a9b1d6" }, - ["@text.title.2.markdown"] = { - bold = true, - fg = "#e0af68" + ["@punctuation.delimiter"] = { + fg = "#89ddff" }, - ["@text.title.3.markdown"] = { - bold = true, - fg = "#9ece6a" + ["@punctuation.special"] = { + fg = "#89ddff" }, - ["@text.title.4.markdown"] = { - bold = true, - fg = "#1abc9c" + ["@string"] = { + link = "String" }, - ["@text.title.5.markdown"] = { - bold = true, + ["@string.documentation"] = { + fg = "#e0af68" + }, + ["@string.escape"] = { fg = "#bb9af7" }, - ["@text.title.6.markdown"] = { - bold = true, - fg = "#9d7cd8" + ["@string.regexp"] = { + fg = "#b4f9f8" }, - ["@text.todo.checked"] = { - fg = "#73daca" + ["@tag"] = { + link = "Label" }, - ["@text.todo.unchecked"] = { - fg = "#7aa2f7" + ["@tag.attribute"] = { + link = "@property" }, - ["@text.warning"] = { - bg = "#e0af68", - fg = "#24283b" + ["@tag.delimiter"] = { + link = "Delimiter" + }, + ["@tag.delimiter.tsx"] = { + fg = "#607dbf" + }, + ["@tag.tsx"] = { + fg = "#f7768e" + }, + ["@type"] = { + link = "Type" }, ["@type.builtin"] = { fg = "#29a4bd" }, + ["@type.definition"] = { + link = "Typedef" + }, + ["@type.qualifier"] = { + link = "@keyword" + }, ["@variable"] = { fg = "#c0caf5", style = {} @@ -320,6 +476,15 @@ local highlights = { ["@variable.builtin"] = { fg = "#f7768e" }, + ["@variable.member"] = { + fg = "#73daca" + }, + ["@variable.parameter"] = { + fg = "#e0af68" + }, + ["@variable.parameter.builtin"] = { + fg = "#e6bf86" + }, ALEErrorSign = { fg = "#db4b4b" }, @@ -840,6 +1005,9 @@ local highlights = { DefinitionIcon = { fg = "#7aa2f7" }, + Delimiter = { + link = "Special" + }, DiagnosticError = { fg = "#db4b4b" }, @@ -1195,7 +1363,7 @@ local highlights = { link = "Special" }, LspKindField = { - link = "@field" + link = "@variable.member" }, LspKindFile = { link = "Normal" @@ -1210,19 +1378,19 @@ local highlights = { link = "@lsp.type.interface" }, LspKindKey = { - link = "@field" + link = "@variable.member" }, LspKindKeyword = { link = "@lsp.type.keyword" }, LspKindMethod = { - link = "@method" + link = "@function.method" }, LspKindModule = { - link = "@namespace" + link = "@module" }, LspKindNamespace = { - link = "@namespace" + link = "@module" }, LspKindNull = { link = "@constant.builtin" @@ -1237,13 +1405,13 @@ local highlights = { link = "@operator" }, LspKindPackage = { - link = "@namespace" + link = "@module" }, LspKindProperty = { link = "@property" }, LspKindReference = { - link = "@text.reference" + link = "@markup.link" }, LspKindSnippet = { link = "Conceal" @@ -1255,7 +1423,7 @@ local highlights = { link = "@lsp.type.struct" }, LspKindText = { - link = "@text" + link = "@markup" }, LspKindTypeParameter = { link = "@lsp.type.typeParameter" @@ -2146,7 +2314,7 @@ local highlights = { }, TroubleNormal = { bg = "#1f2335", - fg = "#a9b1d6" + fg = "#c0caf5" }, TroubleText = { fg = "#a9b1d6" @@ -2196,6 +2364,12 @@ local highlights = { WildMenu = { bg = "#2e3c64" }, + WinBar = { + link = "StatusLine" + }, + WinBarNC = { + link = "StatusLineNC" + }, WinSeparator = { bold = true, fg = "#1d202f" diff --git a/extras/wezterm/tokyonight_day.toml b/extras/wezterm/tokyonight_day.toml index 8d922d2f..1e38674d 100644 --- a/extras/wezterm/tokyonight_day.toml +++ b/extras/wezterm/tokyonight_day.toml @@ -8,6 +8,7 @@ selection_bg = "#b6bfe2" selection_fg = "#3760bf" split = "#2e7de9" compose_cursor = "#b15c00" +scrollbar_thumb = "#c4c8da" ansi = ["#e9e9ed", "#f52a65", "#587539", "#8c6c3e", "#2e7de9", "#9854f1", "#007197", "#6172b0"] brights = ["#a1a6c5", "#f52a65", "#587539", "#8c6c3e", "#2e7de9", "#9854f1", "#007197", "#3760bf"] diff --git a/extras/wezterm/tokyonight_moon.toml b/extras/wezterm/tokyonight_moon.toml index 7ed5d54f..76ec1b4f 100644 --- a/extras/wezterm/tokyonight_moon.toml +++ b/extras/wezterm/tokyonight_moon.toml @@ -8,6 +8,7 @@ selection_bg = "#2d3f76" selection_fg = "#c8d3f5" split = "#82aaff" compose_cursor = "#ff966c" +scrollbar_thumb = "#2f334d" ansi = ["#1b1d2b", "#ff757f", "#c3e88d", "#ffc777", "#82aaff", "#c099ff", "#86e1fc", "#828bb8"] brights = ["#444a73", "#ff757f", "#c3e88d", "#ffc777", "#82aaff", "#c099ff", "#86e1fc", "#c8d3f5"] diff --git a/extras/wezterm/tokyonight_night.toml b/extras/wezterm/tokyonight_night.toml index 20bd98d5..f7fef006 100644 --- a/extras/wezterm/tokyonight_night.toml +++ b/extras/wezterm/tokyonight_night.toml @@ -8,6 +8,7 @@ selection_bg = "#283457" selection_fg = "#c0caf5" split = "#7aa2f7" compose_cursor = "#ff9e64" +scrollbar_thumb = "#292e42" ansi = ["#15161e", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", "#a9b1d6"] brights = ["#414868", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", "#c0caf5"] diff --git a/extras/wezterm/tokyonight_storm.toml b/extras/wezterm/tokyonight_storm.toml index eb89e62d..95615c36 100644 --- a/extras/wezterm/tokyonight_storm.toml +++ b/extras/wezterm/tokyonight_storm.toml @@ -8,6 +8,7 @@ selection_bg = "#2e3c64" selection_fg = "#c0caf5" split = "#7aa2f7" compose_cursor = "#ff9e64" +scrollbar_thumb = "#292e42" ansi = ["#1d202f", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", "#a9b1d6"] brights = ["#414868", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", "#c0caf5"] diff --git a/lua/tokyonight/colors.lua b/lua/tokyonight/colors.lua index 745c2b28..cabcc18b 100644 --- a/lua/tokyonight/colors.lua +++ b/lua/tokyonight/colors.lua @@ -147,6 +147,7 @@ function M.setup(opts) colors.fg_float = colors.fg colors.error = colors.red1 + colors.todo = colors.blue colors.warning = colors.yellow colors.info = colors.blue2 colors.hint = colors.teal diff --git a/lua/tokyonight/extra/alacritty.lua b/lua/tokyonight/extra/alacritty.lua index 65cdd260..24aa1a06 100644 --- a/lua/tokyonight/extra/alacritty.lua +++ b/lua/tokyonight/extra/alacritty.lua @@ -4,50 +4,51 @@ local M = {} --- @param colors ColorScheme function M.generate(colors) - local alacrittyColors = {} - for k, v in pairs(colors) do - if type(v) == "string" then - alacrittyColors[k] = v:gsub("^#", "0x") - end - end - local alacritty = util.template( - [[ + [=[ # TokyoNight Alacritty Colors -colors: - # Default colors - primary: - background: '${bg}' - foreground: '${fg}' - - # Normal colors - normal: - black: '${black}' - red: '${red}' - green: '${green}' - yellow: '${yellow}' - blue: '${blue}' - magenta: '${magenta}' - cyan: '${cyan}' - white: '${fg_dark}' - - # Bright colors - bright: - black: '${terminal_black}' - red: '${red}' - green: '${green}' - yellow: '${yellow}' - blue: '${blue}' - magenta: '${magenta}' - cyan: '${cyan}' - white: '${fg}' - - indexed_colors: - - { index: 16, color: '${orange}' } - - { index: 17, color: '${red1}' } - - ]], - alacrittyColors +# Default colors +[colors.primary] +background = '${bg}' +foreground = '${fg}' + +#[colors.cursor] +#cursor = '${fg}' +#text = '${bg}' + +# Normal colors +[colors.normal] +black = '${black}' +red = '${red}' +green = '${green}' +yellow = '${yellow}' +blue = '${blue}' +magenta = '${magenta}' +cyan = '${cyan}' +white = '${fg_dark}' + +# Bright colors +[colors.bright] +black = '${terminal_black}' +red = '${red}' +green = '${green}' +yellow = '${yellow}' +blue = '${blue}' +magenta = '${magenta}' +cyan = '${cyan}' +white = '${fg}' + +# Indexed Colors +[[colors.indexed_colors]] +index = 16 +color = '${orange}' + +[[colors.indexed_colors]] +index = 17 +color = '${red1}' + +]=], + colors ) return alacritty diff --git a/lua/tokyonight/extra/fzf.lua b/lua/tokyonight/extra/fzf.lua new file mode 100644 index 00000000..429451d1 --- /dev/null +++ b/lua/tokyonight/extra/fzf.lua @@ -0,0 +1,18 @@ +local util = require("tokyonight.util") + +local M = {} + +--- @param colors ColorScheme +function M.generate(colors) + return util.template(M.template, colors) +end + +M.template = [[ +export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \ +--color=fg:${fg},bg:${bg},hl:${orange} \ +--color=fg+:${fg},bg+:${bg_highlight},hl+:${orange} \ +--color=info:${blue},prompt:${cyan},pointer:${cyan} \ +--color=marker:${green},spinner:${green},header:${green}" +]] + +return M diff --git a/lua/tokyonight/extra/helix.lua b/lua/tokyonight/extra/helix.lua index f9f06e0a..00d58432 100644 --- a/lua/tokyonight/extra/helix.lua +++ b/lua/tokyonight/extra/helix.lua @@ -13,8 +13,8 @@ function M.generate(colors) builtin = "@type.builtin", enum = { "@lsp.type.enum", - variant = "@lsp.type.enumMember" - } + variant = "@lsp.type.enumMember", + }, }, -- rust: pattern matching `let Some(_) = ...` -- ^^^^ @@ -23,27 +23,27 @@ function M.generate(colors) "Constant", builtin = { "@constant.builtin", - boolean = "Boolean" + boolean = "Boolean", }, character = { "Character", - escape = "@string.escape" + escape = "@string.escape", }, numeric = { "Number", float = "Float", - integer = "Number" - } + integer = "Number", + }, }, string = { "String", - regexp = "@string.regex", + regexp = "@string.regexp", special = { "@string.special", path = nil, url = nil, - symbol = nil - } + symbol = nil, + }, }, comment = { "@comment", @@ -51,17 +51,17 @@ function M.generate(colors) block = { nil, -- not sure about that one - documentation = "@string.documentation" - } + documentation = "@string.documentation", + }, }, variable = { "@variable", builtin = "@variable.builtin", - parameter = "@parameter", + parameter = "@variable.parameter", other = { nil, - member = "@field" - } + member = "@variable.member", + }, }, label = "@label", keyword = { @@ -72,16 +72,16 @@ function M.generate(colors) ["repeat"] = "Repeat", import = nil, ["return"] = "@keyword.return", - exception = "Exception" + exception = "Exception", }, operator = "Statement", directive = "PreProc", ["function"] = "@keyword.function", storage = { - nil, -- rust: `let` - type = nil, -- rust: `struct` & `type` - modifier = nil -- rust: `mut` - } + nil, -- rust: `let` + type = nil, -- rust: `struct` & `type` + modifier = nil, -- rust: `mut` + }, }, operator = "Operator", ["function"] = { @@ -90,12 +90,12 @@ function M.generate(colors) method = "@method", macro = "@function.macro", -- Defined as "preprocessor in C", so using "PreProc", not sure though - special = "PreProc" + special = "PreProc", }, tag = { "@tag", -- ??? - builtin = nil + builtin = nil, }, namespace = "@namespace", special = "Special", @@ -113,41 +113,41 @@ function M.generate(colors) h6 = nil, -- UI -- completion = "Pmenu", - hover = "PmenuSel" + hover = "PmenuSel", }, list = { "markdownHeadingDelimiter", unnumbered = nil, numbered = nil, checked = nil, - unchecked = nil + unchecked = nil, }, bold = "Bold", italic = "Italic", strikethrough = { - 'helix', - modifiers = { 'crossed_out' } + "helix", + modifiers = { "crossed_out" }, }, link = { "markdownLinkText", url = "Underlined", label = "markdownCode", - text = "markdownCode" + text = "markdownCode", }, quote = nil, raw = { "markdownCode", - inline = "@text.literal.markdown_inline", + inline = "@markup.raw.markdown_inline", block = "markdownCodeBlock", -- UI -- completion = nil, - hover = nil + hover = nil, }, -- UI -- normal = { nil, completion = "CmpItemMenu", - hover = "CmpItemKindDefault" + hover = "CmpItemKindDefault", }, }, diff = { @@ -156,13 +156,13 @@ function M.generate(colors) minus = "diffRemoved", delta = { "diffChanged", - moved = "diffFile" - } + moved = "diffFile", + }, }, ui = { background = { { "helix", bg = "bg" }, - separator = nil + separator = nil, }, cursor = { "Cursor", @@ -179,15 +179,15 @@ function M.generate(colors) }, debug = { breakpoint = nil, - active = nil + active = nil, }, gutter = { nil, - selected = nil + selected = nil, }, highlight = { nil, - frameline = nil + frameline = nil, }, linenr = { "LineNr", @@ -198,17 +198,17 @@ function M.generate(colors) inactive = "StatusLineNc", -- Inspired from lualine normal = { - 'helix', + "helix", bg = "blue", - fg = "black" + fg = "black", }, insert = nil, select = nil, - separator = nil + separator = nil, }, popup = { "TelescopeBorder", - info = nil + info = nil, }, window = "WinSeparator", help = nil, @@ -228,28 +228,28 @@ function M.generate(colors) parameter = nil, type = nil, }, - wrap = nil + wrap = nil, }, menu = { "Pmenu", selected = "PmenuSel", scroll = { - 'helix', + "helix", fg = vim.api.nvim_get_hl(0, { name = "PmenuThumb" }).bg, bg = vim.api.nvim_get_hl(0, { name = "PmenuSbar" }).bg, - } + }, }, selection = { - { 'helix', bg = "bg_highlight" }, - primary = nil + { "helix", bg = "bg_highlight" }, + primary = nil, }, cursorline = { primary = nil, - secondary = nil + secondary = nil, }, cursorcolumn = { primary = nil, - secondary = nil + secondary = nil, }, }, hint = "DiagnosticHint", @@ -261,15 +261,15 @@ function M.generate(colors) hint = "DiagnosticUnderlineHint", info = "DiagnosticUnderlineInfo", warning = "DiagnosticUnderlineWarn", - error = "DiagnosticUnderlineError" - } + error = "DiagnosticUnderlineError", + }, }) local config = {} for hx_scope, group in M.pairsByKeys(mapping) do -- print(hx_scope, util.dump(group)) hx_scope = hx_scope:gsub("%.h(%d)", ".%1") - if hx_scope:match('%.') then + if hx_scope:match("%.") then hx_scope = '"' .. hx_scope .. '"' end @@ -277,8 +277,8 @@ function M.generate(colors) goto continue end - if type(group) == "table" and group[1] == 'helix' then - table.remove(group, 1); + if type(group) == "table" and group[1] == "helix" then + table.remove(group, 1) table.insert(config, string.format("%s = %s", hx_scope, M.to_toml(group))) goto continue end @@ -296,16 +296,16 @@ function M.generate(colors) ::continue:: end - table.insert(config, '\n[palette]'); + table.insert(config, "\n[palette]") for name, color in M.pairsByKeys(M.flatten(colors)) do - if name:match('%.') then + if name:match("%.") then name = '"' .. name .. '"' end - if type(color) == 'string' and not string.starts(name, '_') and name ~= 'none' then + if type(color) == "string" and not string.starts(name, "_") and name ~= "none" then table.insert(config, string.format('%s = "%s"', name, color)) end end - return table.concat(config, '\n') + return table.concat(config, "\n") end function string.starts(String, Start) @@ -315,15 +315,15 @@ end function M.flatten(t) local res = {} for k, v in pairs(t) do - if type(v) == 'table' then - if v[1] ~= 'helix' then + if type(v) == "table" then + if v[1] ~= "helix" then for k2, v2 in pairs(M.flatten(v)) do -- Special case for tables like: -- { type = { "@type", enum = "@type.enum" } } if k2 == 1 then res[k] = v2 else - res[k .. '.' .. k2] = v2 + res[k .. "." .. k2] = v2 end end else @@ -339,9 +339,11 @@ end -- https://www.lua.org/pil/19.3.html function M.pairsByKeys(t, f) local a = {} - for n in pairs(t) do table.insert(a, n) end + for n in pairs(t) do + table.insert(a, n) + end table.sort(a, f) - local i = 0 -- iterator variable + local i = 0 -- iterator variable local iter = function() -- iterator function i = i + 1 if a[i] == nil then @@ -369,13 +371,13 @@ function M.to_helix_config(highlight) end if mods.underline then style.underline = { - style = "line" + style = "line", } end if mods.undercurl and highlight.sp then style.underline = { color = M.to_rgb(mods.sp), - style = "curl" + style = "curl", } end end @@ -405,7 +407,7 @@ end function M.to_toml(style) local buffer = {} M.insert_as_toml(buffer, style) - return table.concat(buffer, '') + return table.concat(buffer, "") end function M.insert_as_toml(buffer, x) @@ -416,7 +418,7 @@ function M.insert_as_toml(buffer, x) if M.is_array(x) then table.insert(buffer, "[") for _, v in pairs(x) do - M.insert_as_toml(buffer, v); + M.insert_as_toml(buffer, v) table.insert(buffer, ", ") end table.remove(buffer) @@ -424,8 +426,8 @@ function M.insert_as_toml(buffer, x) else table.insert(buffer, "{ ") for k, v in M.pairsByKeys(x) do - table.insert(buffer, string.format("%s = ", k)); - M.insert_as_toml(buffer, v); + table.insert(buffer, string.format("%s = ", k)) + M.insert_as_toml(buffer, v) table.insert(buffer, ", ") end table.remove(buffer) @@ -442,7 +444,9 @@ function M.is_array(t) local i = 0 for _ in pairs(t) do i = i + 1 - if t[i] == nil then return false end + if t[i] == nil then + return false + end end return true end diff --git a/lua/tokyonight/extra/init.lua b/lua/tokyonight/extra/init.lua index cc86cc96..5cf8b473 100644 --- a/lua/tokyonight/extra/init.lua +++ b/lua/tokyonight/extra/init.lua @@ -7,7 +7,7 @@ M.extras = { kitty = {ext = "conf", url = "https://sw.kovidgoyal.net/kitty/conf.html", label = "Kitty"}, fish = {ext = "fish", url = "https://fishshell.com/docs/current/index.html", label = "Fish"}, fish_themes = {ext = "theme", url = "https://fishshell.com/docs/current/interactive.html#syntax-highlighting", label = "Fish Themes"}, - alacritty = {ext = "yml", url = "https://github.com/alacritty/alacritty", label = "Alacritty"}, + alacritty = {ext = "toml", url = "https://github.com/alacritty/alacritty", label = "Alacritty"}, wezterm = {ext = "toml", url = "https://wezfurlong.org/wezterm/config/files.html", label = "WezTerm"}, tmux = {ext = "tmux", url = "https://github.com/tmux/tmux/wiki", label = "Tmux"}, xresources = {ext = "Xresources", url = "https://wiki.archlinux.org/title/X_resources", label = "Xresources"}, @@ -25,6 +25,7 @@ M.extras = { dunst = {ext = "dunstrc", url = "https://dunst-project.org/", label = "Dunst"}, gitui = {ext = "ron", url = "https://github.com/extrawurst/gitui", label = "GitUI"}, helix = { ext = "toml", url = "https://helix-editor.com/", label = "Helix"}, + fzf = { ext = "zsh", url = "https://github.com/junegunn/fzf", label = "Fzf"}, } local function write(str, fileName) diff --git a/lua/tokyonight/extra/wezterm.lua b/lua/tokyonight/extra/wezterm.lua index 20ffecbb..07907b9e 100644 --- a/lua/tokyonight/extra/wezterm.lua +++ b/lua/tokyonight/extra/wezterm.lua @@ -16,6 +16,7 @@ selection_bg = "${bg_visual}" selection_fg = "${fg}" split = "${blue}" compose_cursor = "${orange}" +scrollbar_thumb = "${bg_highlight}" ansi = ["${black}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${fg_dark}"] brights = ["${terminal_black}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${fg}"] diff --git a/lua/tokyonight/theme.lua b/lua/tokyonight/theme.lua index 238b9d20..2706b1bd 100644 --- a/lua/tokyonight/theme.lua +++ b/lua/tokyonight/theme.lua @@ -91,6 +91,8 @@ function M.setup() WarningMsg = { fg = c.warning }, -- warning messages Whitespace = { fg = c.fg_gutter }, -- "nbsp", "space", "tab" and "trail" in 'listchars' WildMenu = { bg = c.bg_visual }, -- current match in 'wildmenu' completion + WinBar = { link = "StatusLine" }, -- window bar + WinBarNC = { link = "StatusLineNC" }, -- window bar in inactive windows -- These groups are not listed as default vim groups, -- but they are defacto standard group names for syntax highlighting. @@ -130,7 +132,7 @@ function M.setup() Special = { fg = c.blue1 }, -- (preferred) any special symbol -- SpecialChar = { }, -- special character in a constant -- Tag = { }, -- you can use CTRL-] on this - -- Delimiter = { }, -- character that needs attention + Delimiter = { link = "Special" }, -- character that needs attention -- SpecialComment= { }, -- special things inside a comment Debug = { fg = c.orange }, -- debugging statements @@ -206,7 +208,62 @@ function M.setup() DapStoppedLine = { bg = util.darken(c.warning, 0.1) }, -- Used for "Warning" diagnostic virtual text -- These groups are for the Neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. + ["@annotation"] = { link = "PreProc" }, + ["@attribute"] = { link = "PreProc" }, + ["@boolean"] = { link = "Boolean" }, + ["@character"] = { link = "Character" }, + ["@character.special"] = { link = "SpecialChar" }, + ["@comment"] = { link = "Comment" }, + ["@keyword.conditional"] = { link = "Conditional" }, + ["@constant"] = { link = "Constant" }, + ["@constant.builtin"] = { link = "Special" }, + ["@constant.macro"] = { link = "Define" }, + ["@keyword.debug"] = { link = "Debug" }, + ["@keyword.directive.define"] = { link = "Define" }, + ["@keyword.exception"] = { link = "Exception" }, + ["@number.float"] = { link = "Float" }, + ["@function"] = { link = "Function" }, + ["@function.builtin"] = { link = "Special" }, + ["@function.call"] = { link = "@function" }, + ["@function.macro"] = { link = "Macro" }, + ["@keyword.import"] = { link = "Include" }, + ["@keyword.coroutine"] = { link = "@keyword" }, + ["@keyword.operator"] = { link = "@operator" }, + ["@keyword.return"] = { link = "@keyword" }, + ["@function.method"] = { link = "Function" }, + ["@function.method.call"] = { link = "@function.method" }, + ["@namespace.builtin"] = { link = "@variable.builtin" }, + ["@none"] = {}, + ["@number"] = { link = "Number" }, + ["@keyword.directive"] = { link = "PreProc" }, + ["@keyword.repeat"] = { link = "Repeat" }, + ["@keyword.storage"] = { link = "StorageClass" }, + ["@string"] = { link = "String" }, + ["@markup.link.label"] = { link = "SpecialChar" }, + ["@markup.link.label.symbol"] = { link = "Identifier" }, + ["@tag"] = { link = "Label" }, + ["@tag.attribute"] = { link = "@property" }, + ["@tag.delimiter"] = { link = "Delimiter" }, + ["@markup"] = { link = "@none" }, + ["@markup.environment"] = { link = "Macro" }, + ["@markup.environment.name"] = { link = "Type" }, + ["@markup.raw"] = { link = "String" }, + ["@markup.math"] = { link = "Special" }, + ["@markup.strong"] = { bold = true }, + ["@markup.emphasis"] = { italic = true }, + ["@markup.strikethrough"] = { strikethrough = true }, + ["@markup.underline"] = { underline = true }, + ["@markup.heading"] = { link = "Title" }, + ["@comment.note"] = { fg = c.hint }, + ["@comment.error"] = { fg = c.error }, + ["@comment.hint"] = { fg = c.hint }, + ["@comment.info"] = { fg = c.info }, + ["@comment.warning"] = { fg = c.warning }, + ["@comment.todo"] = { fg = c.todo }, + ["@markup.link.url"] = { link = "Underlined" }, + ["@type"] = { link = "Type" }, + ["@type.definition"] = { link = "Typedef" }, + ["@type.qualifier"] = { link = "@keyword" }, --- Misc -- TODO: @@ -216,51 +273,49 @@ function M.setup() --- Punctuation ["@punctuation.delimiter"] = { fg = c.blue5 }, -- For delimiters ie: `.` ["@punctuation.bracket"] = { fg = c.fg_dark }, -- For brackets and parens. - ["@punctuation.special"] = { fg = c.blue5 }, -- For special punctutation that does not fall in the catagories before. - ["@punctuation.special.markdown"] = { fg = c.orange, bold = true }, + ["@punctuation.special"] = { fg = c.blue5 }, -- For special symbols (e.g. `{}` in string interpolation) + ["@markup.list"] = { fg = c.blue5 }, -- For special punctutation that does not fall in the catagories before. + ["@markup.list.markdown"] = { fg = c.orange, bold = true }, --- Literals ["@string.documentation"] = { fg = c.yellow }, - ["@string.regex"] = { fg = c.blue6 }, -- For regexes. + ["@string.regexp"] = { fg = c.blue6 }, -- For regexes. ["@string.escape"] = { fg = c.magenta }, -- For escape characters within a string. --- Functions ["@constructor"] = { fg = c.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - ["@parameter"] = { fg = c.yellow }, -- For parameters of a function. - ["@parameter.builtin"] = { fg = util.lighten(c.yellow, 0.8) }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99] + ["@variable.parameter"] = { fg = c.yellow }, -- For parameters of a function. + ["@variable.parameter.builtin"] = { fg = util.lighten(c.yellow, 0.8) }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99] --- Keywords ["@keyword"] = { fg = c.purple, style = options.styles.keywords }, -- For keywords that don't fall in previous categories. - -- TODO: - -- ["@keyword.coroutine"] = { }, -- For keywords related to coroutines. ["@keyword.function"] = { fg = c.magenta, style = options.styles.functions }, -- For keywords used to define a fuction. ["@label"] = { fg = c.blue }, -- For labels: `label:` in C and `:label:` in Lua. --- Types ["@type.builtin"] = { fg = util.darken(c.blue1, 0.8) }, - ["@field"] = { fg = c.green1 }, -- For fields. + ["@variable.member"] = { fg = c.green1 }, -- For fields. ["@property"] = { fg = c.green1 }, --- Identifiers ["@variable"] = { fg = c.fg, style = options.styles.variables }, -- Any variable name that does not have another highlight. ["@variable.builtin"] = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`. - ["@namespace.builtin"] = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`. + ["@module.builtin"] = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`. --- Text - -- ["@text.literal.markdown"] = { fg = c.blue }, - ["@text.literal.markdown_inline"] = { bg = c.terminal_black, fg = c.blue }, - ["@text.reference"] = { fg = c.teal }, + -- ["@markup.raw.markdown"] = { fg = c.blue }, + ["@markup.raw.markdown_inline"] = { bg = c.terminal_black, fg = c.blue }, + ["@markup.link"] = { fg = c.teal }, - ["@text.todo.unchecked"] = { fg = c.blue }, -- For brackets and parens. - ["@text.todo.checked"] = { fg = c.green1 }, -- For brackets and parens. - ["@text.warning"] = { fg = c.bg, bg = c.warning }, - ["@text.danger"] = { fg = c.bg, bg = c.error }, + ["@markup.list.unchecked"] = { fg = c.blue }, -- For brackets and parens. + ["@markup.list.checked"] = { fg = c.green1 }, -- For brackets and parens. - ["@text.diff.add"] = { link = "DiffAdd" }, - ["@text.diff.delete"] = { link = "DiffDelete" }, + ["@diff.plus"] = { link = "DiffAdd" }, + ["@diff.minus"] = { link = "DiffDelete" }, + ["@diff.delta"] = { link = "DiffChange" }, - ["@namespace"] = { link = "Include" }, + ["@module"] = { link = "Include" }, -- tsx ["@tag.tsx"] = { fg = c.red }, @@ -276,15 +331,15 @@ function M.setup() ["@lsp.type.enum"] = { link = "@type" }, ["@lsp.type.enumMember"] = { link = "@constant" }, ["@lsp.type.escapeSequence"] = { link = "@string.escape" }, - ["@lsp.type.formatSpecifier"] = { link = "@punctuation.special" }, + ["@lsp.type.formatSpecifier"] = { link = "@markup.list" }, ["@lsp.type.generic"] = { link = "@variable" }, ["@lsp.type.interface"] = { fg = util.lighten(c.blue1, 0.7) }, ["@lsp.type.keyword"] = { link = "@keyword" }, - ["@lsp.type.lifetime"] = { link = "@storageclass" }, - ["@lsp.type.namespace"] = { link = "@namespace" }, + ["@lsp.type.lifetime"] = { link = "@keyword.storage" }, + ["@lsp.type.namespace"] = { link = "@module" }, ["@lsp.type.number"] = { link = "@number" }, ["@lsp.type.operator"] = { link = "@operator" }, - ["@lsp.type.parameter"] = { link = "@parameter" }, + ["@lsp.type.parameter"] = { link = "@variable.parameter" }, ["@lsp.type.property"] = { link = "@property" }, ["@lsp.type.selfKeyword"] = { link = "@variable.builtin" }, ["@lsp.type.selfTypeKeyword"] = { link = "@variable.builtin" }, @@ -342,7 +397,7 @@ function M.setup() -- LspTrouble TroubleText = { fg = c.fg_dark }, TroubleCount = { fg = c.magenta, bg = c.fg_gutter }, - TroubleNormal = { fg = c.fg_sidebar, bg = c.bg_sidebar }, + TroubleNormal = { fg = c.fg, bg = c.bg_sidebar }, -- Illuminate illuminatedWord = { bg = c.fg_gutter }, @@ -736,28 +791,28 @@ function M.setup() Enum = "@lsp.type.enum", EnumMember = "@lsp.type.enumMember", Event = "Special", - Field = "@field", + Field = "@variable.member", File = "Normal", Folder = "Directory", Function = "@function", Interface = "@lsp.type.interface", - Key = "@field", + Key = "@variable.member", Keyword = "@lsp.type.keyword", - Method = "@method", - Module = "@namespace", - Namespace = "@namespace", + Method = "@function.method", + Module = "@module", + Namespace = "@module", Null = "@constant.builtin", Number = "@number", Object = "@constant", Operator = "@operator", - Package = "@namespace", + Package = "@module", Property = "@property", - Reference = "@text.reference", + Reference = "@markup.link", Snippet = "Conceal", String = "@string", Struct = "@lsp.type.struct", Unit = "@lsp.type.struct", - Text = "@text", + Text = "@markup", TypeParameter = "@lsp.type.typeParameter", Variable = "@variable", Value = "@string", @@ -775,7 +830,7 @@ function M.setup() local markdown_rainbow = { c.blue, c.yellow, c.green, c.teal, c.magenta, c.purple } for i, color in ipairs(markdown_rainbow) do - theme.highlights["@text.title." .. i .. ".markdown"] = { fg = color, bold = true } + theme.highlights["@markup.heading." .. i .. ".markdown"] = { fg = color, bold = true } theme.highlights["Headline" .. i] = { bg = util.darken(color, 0.05) } end theme.highlights["Headline"] = { link = "Headline1" } diff --git a/lua/tokyonight/treesitter.lua b/lua/tokyonight/treesitter.lua deleted file mode 100644 index e980cd5b..00000000 --- a/lua/tokyonight/treesitter.lua +++ /dev/null @@ -1,380 +0,0 @@ -local M = {} - -function M.new_style() - ---@diagnostic disable-next-line: undefined-field - return vim.treesitter.highlighter.hl_map == nil -end - -function M.get(group) - if group:sub(1, 1) ~= "@" or M.new_style() then - return group - end - - group = group:sub(2) - - local lang - while group do - if M.fallbacks[group] then - return (lang or "") .. M.fallbacks[group] - end - group, lang = group:match("(.*)%.(.*)") - end -end - --- taken from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/lua/nvim-treesitter/highlight.lua -M.fallbacks = { - ["annotation"] = "TSAnnotation", - ["attribute"] = "TSAttribute", - ["boolean"] = "TSBoolean", - ["character"] = "TSCharacter", - ["character.special"] = "TSCharacterSpecial", - ["comment"] = "TSComment", - ["conditional"] = "TSConditional", - ["constant"] = "TSConstant", - ["constant.builtin"] = "TSConstBuiltin", - ["constant.macro"] = "TSConstMacro", - ["constructor"] = "TSConstructor", - ["debug"] = "TSDebug", - ["define"] = "TSDefine", - ["error"] = "TSError", - ["exception"] = "TSException", - ["field"] = "TSField", - ["float"] = "TSFloat", - ["function"] = "TSFunction", - ["function.call"] = "TSFunctionCall", - ["function.builtin"] = "TSFuncBuiltin", - ["function.macro"] = "TSFuncMacro", - ["include"] = "TSInclude", - ["keyword"] = "TSKeyword", - ["keyword.function"] = "TSKeywordFunction", - ["keyword.operator"] = "TSKeywordOperator", - ["keyword.return"] = "TSKeywordReturn", - ["label"] = "TSLabel", - ["method"] = "TSMethod", - ["method.call"] = "TSMethodCall", - ["namespace"] = "TSNamespace", - ["none"] = "TSNone", - ["number"] = "TSNumber", - ["operator"] = "TSOperator", - ["parameter"] = "TSParameter", - ["parameter.reference"] = "TSParameterReference", - ["preproc"] = "TSPreProc", - ["property"] = "TSProperty", - ["punctuation.delimiter"] = "TSPunctDelimiter", - ["punctuation.bracket"] = "TSPunctBracket", - ["punctuation.special"] = "TSPunctSpecial", - ["repeat"] = "TSRepeat", - ["storageclass"] = "TSStorageClass", - ["string"] = "TSString", - ["string.regex"] = "TSStringRegex", - ["string.escape"] = "TSStringEscape", - ["string.special"] = "TSStringSpecial", - ["symbol"] = "TSSymbol", - ["tag"] = "TSTag", - ["tag.attribute"] = "TSTagAttribute", - ["tag.delimiter"] = "TSTagDelimiter", - ["text"] = "TSText", - ["text.strong"] = "TSStrong", - ["text.emphasis"] = "TSEmphasis", - ["text.underline"] = "TSUnderline", - ["text.strike"] = "TSStrike", - ["text.title"] = "TSTitle", - ["text.literal"] = "TSLiteral", - ["text.uri"] = "TSURI", - ["text.math"] = "TSMath", - ["text.reference"] = "TSTextReference", - ["text.environment"] = "TSEnvironment", - ["text.environment.name"] = "TSEnvironmentName", - ["text.note"] = "TSNote", - ["text.warning"] = "TSWarning", - ["text.danger"] = "TSDanger", - ["text.todo"] = "TSTodo", - ["type"] = "TSType", - ["type.builtin"] = "TSTypeBuiltin", - ["type.qualifier"] = "TSTypeQualifier", - ["type.definition"] = "TSTypeDefinition", - ["variable"] = "TSVariable", - ["variable.builtin"] = "TSVariableBuiltin", -} - -M.defaults = { - ["@annotation"] = { - default = true, - link = "PreProc", - }, - ["@attribute"] = { - default = true, - link = "PreProc", - }, - ["@boolean"] = { - default = true, - link = "Boolean", - }, - ["@character"] = { - default = true, - link = "Character", - }, - ["@character.special"] = { - default = true, - link = "SpecialChar", - }, - ["@comment"] = { - default = true, - link = "Comment", - }, - ["@conditional"] = { - default = true, - link = "Conditional", - }, - ["@constant"] = { - default = true, - link = "Constant", - }, - ["@constant.builtin"] = { - default = true, - link = "Special", - }, - ["@constant.macro"] = { - default = true, - link = "Define", - }, - ["@constructor"] = { - default = true, - link = "Special", - }, - ["@debug"] = { - default = true, - link = "Debug", - }, - ["@define"] = { - default = true, - link = "Define", - }, - ["@exception"] = { - default = true, - link = "Exception", - }, - ["@field"] = { - default = true, - link = "Identifier", - }, - ["@float"] = { - default = true, - link = "Float", - }, - ["@function"] = { - default = true, - link = "Function", - }, - ["@function.builtin"] = { - default = true, - link = "Special", - }, - ["@function.call"] = { - default = true, - link = "@function", - }, - ["@function.macro"] = { - default = true, - link = "Macro", - }, - ["@include"] = { - default = true, - link = "Include", - }, - ["@keyword"] = { - default = true, - link = "Keyword", - }, - ["@keyword.coroutine"] = { - default = true, - link = "@keyword", - }, - ["@keyword.function"] = { - default = true, - link = "Keyword", - }, - ["@keyword.operator"] = { - default = true, - link = "@operator", - }, - ["@keyword.return"] = { - default = true, - link = "@keyword", - }, - ["@label"] = { - default = true, - link = "Label", - }, - ["@method"] = { - default = true, - link = "Function", - }, - ["@method.call"] = { - default = true, - link = "@method", - }, - ["@namespace"] = { - default = true, - link = "Include", - }, - ["@none"] = { - default = true, - }, - ["@number"] = { - default = true, - link = "Number", - }, - ["@operator"] = { - default = true, - link = "Operator", - }, - ["@parameter"] = { - default = true, - link = "Identifier", - }, - ["@preproc"] = { - default = true, - link = "PreProc", - }, - ["@property"] = { - default = true, - link = "Identifier", - }, - ["@punctuation.bracket"] = { - default = true, - link = "Delimiter", - }, - ["@punctuation.delimiter"] = { - default = true, - link = "Delimiter", - }, - ["@punctuation.special"] = { - default = true, - link = "Delimiter", - }, - ["@repeat"] = { - default = true, - link = "Repeat", - }, - ["@storageclass"] = { - default = true, - link = "StorageClass", - }, - ["@string"] = { - default = true, - link = "String", - }, - ["@string.escape"] = { - default = true, - link = "SpecialChar", - }, - ["@string.regex"] = { - default = true, - link = "String", - }, - ["@string.special"] = { - default = true, - link = "SpecialChar", - }, - ["@symbol"] = { - default = true, - link = "Identifier", - }, - ["@tag"] = { - default = true, - link = "Label", - }, - ["@tag.attribute"] = { - default = true, - link = "@property", - }, - ["@tag.delimiter"] = { - default = true, - link = "Delimiter", - }, - ["@text"] = { - default = true, - link = "@none", - }, - ["@text.danger"] = { - default = true, - link = "WarningMsg", - }, - ["@text.emphasis"] = { - default = true, - italic = true, - }, - ["@text.environment"] = { - default = true, - link = "Macro", - }, - ["@text.environment.name"] = { - default = true, - link = "Type", - }, - ["@text.literal"] = { - default = true, - link = "String", - }, - ["@text.math"] = { - default = true, - link = "Special", - }, - ["@text.note"] = { - default = true, - link = "SpecialComment", - }, - ["@text.reference"] = { - default = true, - link = "Constant", - }, - ["@text.strike"] = { - strikethrough = true, - }, - ["@text.strong"] = { - bold = true, - default = true, - }, - ["@text.title"] = { - default = true, - link = "Title", - }, - ["@text.underline"] = { - underline = true, - }, - ["@text.uri"] = { - default = true, - link = "Underlined", - }, - ["@text.warning"] = { - default = true, - link = "Todo", - }, - ["@text.todo"] = { - default = true, - link = "Todo", - }, - ["@type"] = { - default = true, - link = "Type", - }, - ["@type.builtin"] = { - default = true, - link = "Type", - }, - ["@type.definition"] = { - default = true, - link = "Typedef", - }, - ["@type.qualifier"] = { - default = true, - link = "@keyword", - }, - ["@variable.builtin"] = { - default = true, - link = "Special", - }, -} - -return M diff --git a/lua/tokyonight/util.lua b/lua/tokyonight/util.lua index b03ae923..2bfe92f1 100644 --- a/lua/tokyonight/util.lua +++ b/lua/tokyonight/util.lua @@ -1,5 +1,3 @@ -local ts = require("tokyonight.treesitter") - local M = {} M.bg = "#000000" @@ -51,10 +49,6 @@ end ---@param group string function M.highlight(group, hl) - group = ts.get(group) - if not group then - return - end if hl.style then if type(hl.style) == "table" then hl = vim.tbl_extend("force", hl, hl.style) @@ -189,14 +183,6 @@ function M.load(theme) vim.o.termguicolors = true vim.g.colors_name = "tokyonight" - if ts.new_style() then - for group, colors in pairs(ts.defaults) do - if not theme.highlights[group] then - M.highlight(group, colors) - end - end - end - M.syntax(theme.highlights) -- vim.api.nvim_set_hl_ns(M.ns)