Skip to content

Commit

Permalink
(mini.hues) Move 'TimUntersberger/neogit' to 'NeogitOrg/neogit' and a…
Browse files Browse the repository at this point in the history
…dd some highlight groups.

Details:
- 'mini.hues' still doesn't properly work with 'neogit' due to how its
  palette computation relies on certain highlight groups having certain
  attributes. Revisit after NeogitOrg/neogit#617 or alternative gets
  merged.
  • Loading branch information
echasnovski committed Jul 17, 2023
1 parent 1aab73c commit 3239b78
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Supported highlight groups:
- [lewis6991/gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim)
- [lukas-reineke/indent-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim)
- [neoclide/coc.nvim](https://github.com/neoclide/coc.nvim)
- [NeogitOrg/neogit](https://github.com/NeogitOrg/neogit)
- [nvim-lualine/lualine.nvim](https://github.com/nvim-lualine/lualine.nvim)
- [nvim-neo-tree/neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim)
- [nvim-telescope/telescope.nvim](https://github.com/nvim-telescope/telescope.nvim)
Expand All @@ -118,7 +119,6 @@ Supported highlight groups:
- [romgrk/barbar.nvim](https://github.com/romgrk/barbar.nvim)
- [simrat39/symbols-outline.nvim](https://github.com/simrat39/symbols-outline.nvim)
- [stevearc/aerial.nvim](https://github.com/stevearc/aerial.nvim)
- [TimUntersberger/neogit](https://github.com/TimUntersberger/neogit)
- [williamboman/mason.nvim](https://github.com/williamboman/mason.nvim)

## Installation
Expand Down
2 changes: 1 addition & 1 deletion doc/mini-hues.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Supported highlight groups:
- 'lewis6991/gitsigns.nvim'
- 'lukas-reineke/indent-blankline.nvim'
- 'neoclide/coc.nvim'
- 'NeogitOrg/neogit'
- 'nvim-lualine/lualine.nvim'
- 'nvim-neo-tree/neo-tree.nvim'
- 'nvim-telescope/telescope.nvim'
Expand All @@ -64,7 +65,6 @@ Supported highlight groups:
- 'romgrk/barbar.nvim'
- 'simrat39/symbols-outline.nvim'
- 'stevearc/aerial.nvim'
- 'TimUntersberger/neogit'
- 'williamboman/mason.nvim'

# Setup~
Expand Down
20 changes: 16 additions & 4 deletions lua/mini/hues.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
--- - 'lewis6991/gitsigns.nvim'
--- - 'lukas-reineke/indent-blankline.nvim'
--- - 'neoclide/coc.nvim'
--- - 'NeogitOrg/neogit'
--- - 'nvim-lualine/lualine.nvim'
--- - 'nvim-neo-tree/neo-tree.nvim'
--- - 'nvim-telescope/telescope.nvim'
Expand All @@ -64,7 +65,6 @@
--- - 'romgrk/barbar.nvim'
--- - 'simrat39/symbols-outline.nvim'
--- - 'stevearc/aerial.nvim'
--- - 'TimUntersberger/neogit'
--- - 'williamboman/mason.nvim'
---
--- # Setup~
Expand Down Expand Up @@ -1239,6 +1239,21 @@ H.apply_colorscheme = function(config)
hi('CocSelectedText', { fg=p.yellow, bg=nil })
end

-- NeogitOrg/neogit
if has_integration('NeogitOrg/neogit') then
hi('NeogitCommitViewHeader', { link='Special' })
hi('NeogitDiffAddHighlight', { link='DiffAdd' })
hi('NeogitDiffAdd', { link='DiffAdd' })
hi('NeogitDiffDeleteHighlight', { link='DiffDelete' })
hi('NeogitDiffDelete', { link='DiffDelete' })
hi('NeogitFold', { link='FoldColumn' })
hi('NeogitHunkHeader', { fg=p.accent, bg=nil})
hi('NeogitHunkHeaderHighlight', { fg=p.accent, bg=nil, bold = true})
hi('NeogitNotificationError', { link='DiagnosticError' })
hi('NeogitNotificationInfo', { link='DiagnosticInfo' })
hi('NeogitNotificationWarning', { link='DiagnosticWarn' })
end

-- nvim-lualine/lualine.nvim
-- Everything works correctly out of the box

Expand Down Expand Up @@ -1371,9 +1386,6 @@ H.apply_colorscheme = function(config)
-- stevearc/aerial.nvim
-- Everything works correctly out of the box

-- TimUntersberger/neogit
-- Everything works correctly out of the box

if has_integration('williamboman/mason.nvim') then
hi('MasonError', { fg=p.red, bg=nil })
hi('MasonHeader', { fg=p.bg, bg=p.azure, bold=true })
Expand Down

0 comments on commit 3239b78

Please sign in to comment.