Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Common tree highlight groups #158

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Common tree highlight groups #158

Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
59c900a
changed some colors for neotree
bini-x Sep 26, 2024
2c1399d
changed some neotree colors
bini-x Sep 26, 2024
3027f29
changed some neotree colors
bini-x Sep 26, 2024
b680b04
fixed the formatting
bini-x Sep 26, 2024
9e49ff1
improved some colors
bini-x Sep 26, 2024
aa71885
fixed orange
bini-x Sep 27, 2024
78c8cef
added G.Tree... styles
bini-x Sep 28, 2024
1a78afc
just removed some white spaces
bini-x Sep 28, 2024
b8731e7
fixed. maybe...:)
bini-x Sep 28, 2024
4826461
changed TreeCursorLine bg
bini-x Sep 29, 2024
b43606d
fixed formatting
bini-x Sep 29, 2024
5eb0697
final... maybe
bini-x Sep 29, 2024
b57ca97
final... maybe (v2)
bini-x Sep 29, 2024
c8ec4b1
made rootName bold
bini-x Oct 3, 2024
fd075e8
new changes made
bini-x Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 74 additions & 30 deletions lua/nordic/groups/integrations.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,39 +97,83 @@ function M.get_groups()
G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg }
G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' }

-- Tree Groups
G.TreeNormal = { fg = C.fg, bg = C.bg }
G.TreeNormalNC = { fg = C.fg, bg = C.bg }
G.TreeRootFolder = { fg = C.gray4 }
G.TreeRootName = { fg = C.white2 }
5-pebbles marked this conversation as resolved.
Show resolved Hide resolved
G.TreeFileIcon = { fg = C.blue2 }
G.TreeFileNameOpened = { fg = C.fg }
G.TreeSpecialFile = { fg = C.magenta.bright }
G.TreeGitConflict = { fg = C.magenta.bright }
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict rather red?

G.TreeGitModified = { fg = C.git.change }
G.TreeGitDirty = { fg = C.gray4 }
G.TreeGitAdded = { fg = C.git.add }
G.TreeGitNew = { fg = C.gray4 }
G.TreeGitDeleted = { fg = C.gray4 }
G.TreeGitStaged = { fg = C.gray4 }
G.TreeGitUntracked = { fg = C.orange.base }
Comment on lines +108 to +114
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO these "identifiers" should either:

  1. All be subtle and grey (I prefer this)
  2. Or have their respective colors.

@5-pebbles Opinion?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would personally prefer colors as the default.

My repos are usually an unstaged mess, and the colors help prevent the spread of chaos, but that's more of a "me problem".

I think either way works; the people who don't like whatever we pick will just change it in their own configs. Though, it would be worth adding the unchosen variation to the list of common configurations that I plan on writing someday.

TLDR: I don't know which is better...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which gray do you think should they be?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think most people expect colors. So go with that.

G.TreeTitleBar = { fg = C.gray2, bg = C.white3 }
G.TreeFloatBorder = { fg = C.white3, bg = C.gray0 }
AlexvZyl marked this conversation as resolved.
Show resolved Hide resolved
G.TreeCursorLine = { bg = C.gray1 }
5-pebbles marked this conversation as resolved.
Show resolved Hide resolved
G.TreeCursor = { bg = C.none, fg = C.none }
G.TreeFolderIcon = { fg = C.yellow.dim }
G.TreeIndentMarker = { fg = C.gray4 }
G.TreeSymlink = { fg = C.blue2 }
G.TreeFolderName = { fg = C.blue1 }
G.TreeWinSeparator = { fg = C.bg_dark, bg = C.bg }
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should link to the existing win sep.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your reply, Alex!
Couldn't reply earlier because I had some other things to do.
I'll see what I can do and I'll try to finish it as soon as I can.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i can't find the existing window separator

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just use: link = "WinSeparator"
see definition:

nordic.nvim/lua/nordic/groups/native.lua

Line 135 in 1ee4044

G.WinSeparator = { fg = C.border_fg, bg = C.border_bg } -- the column separating vertically split windows

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, should just have told you what the hl is 😂

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Np, I'm thinking now how could I not find the window separator, it was there the whole time...😅


-- Nvim tree.
G.NvimTreeNormal = { fg = C.fg, bg = C.bg }
G.NvimTreeNormalNC = { fg = C.fg, bg = C.bg }
G.NvimTreeFolderName = { fg = C.blue1 }
G.NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' }
G.NvimTreeEmptyFolderName = { link = 'NvimTreeFolderName' }
G.NvimTreeFolderIcon = { fg = C.yellow.dim }
G.NvimTreeSpecialFile = { fg = C.magenta.bright }
G.NvimTreeRootFolder = { fg = C.gray4 }
G.NvimTreeGitDirty = { fg = C.gray4 }
G.NvimTreeGitNew = { fg = C.gray4 }
G.NvimTreeGitDeleted = { fg = C.gray4 }
G.NvimTreeGitStaged = { fg = C.gray4 }
G.NvimTreeIndentMarker = { fg = C.gray4 }
G.NvimTreeWinSeparator = { fg = C.bg_dark, bg = C.bg }
G.NvimTreeCursorLine = { bg = C.gray1 }
G.NvimTreeCursor = { bg = C.none, fg = C.none }
G.NvimTreeSymlink = { fg = C.blue2 }
G.NvimTreeNormal = { link = 'TreeNormal' }
G.NvimTreeNormalNC = { link = 'TreeNormalNC' }
G.NvimTreeFolderName = { link = 'TreeFolderName'}
G.NvimTreeOpenedFolderName = { link = 'TreeFolderName' }
G.NvimTreeEmptyFolderName = { link = 'TreeFolderName' }
G.NvimTreeFolderIcon = { link = 'TreeFolderIcon' }
G.NvimTreeFileIcon = { link = 'TreeFileIcon' }
G.NvimTreeFileNameOpened = { link = 'TreeFileNameOpened' }
G.NvimTreeSpecialFile = { link = 'TreeSpecialFile' }
G.NvimTreeRootFolder = { link = 'TreeRootFolder' }
G.NvimTreeGitDirty = { link = 'TreeGitDirty' }
G.NvimTreeGitAdded = { link = 'TreeGitAdded' }
G.NvimTreeGitNew = { link = 'TreeGitNew' }
G.NvimTreeGitDeleted = { link = 'TreeGitDeleted' }
G.NvimTreeGitStaged = { link = 'TreeGitStaged' }
G.NvimTreeGitConflict = { link = 'TreeGitConflict' }
G.NvimTreeGitModified = { link = 'TreeGitModified' }
G.NvimTreeIndentMarker = { link = 'TreeIndentMarker' }
G.NvimTreeWinSeparator = { link = 'TreeWinSeparator' }
G.NvimTreeCursorLine = { link = 'TreeCursorLine' }
G.NvimTreeCursor = { link = 'TreeCursor' }
G.NvimTreeSymlink = { link = 'TreeSymlink' }

-- Neo tree.
G.NeoTreeCursorLine = { link = 'NvimTreeCursorLine' }
G.NeoTreeDirectoryIcon = { link = 'NvimTreeFolderIcon' }
G.NeoTreeRootName = { link = 'NvimTreeRootFolder' }
G.NeoTreeFileIcon = { fg = C.blue2 }
G.NeoTreeFileNameOpened = { fg = C.fg }
G.NeoTreeIndentMarker = { link = 'NvimTreeIndentMarker' }
G.NeoTreeGitAdded = { fg = C.git.add }
G.NeoTreeGitConflict = { fg = C.magenta.bright }
G.NeoTreeGitModified = { fg = C.git.change }
G.NeoTreeGitUntracked = { fg = C.fg_sidebar }
G.NeoTreeNormal = { link = 'NvimTreeNormal' }
G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' }
G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' }
G.NeoTreeCursorLine = { link = 'TreeCursorLine' }
G.NeoTreeDirectoryIcon = { link = 'TreeFolderIcon' }
G.NeoTreeRootName = { link = 'TreeRootName' }
G.NeoTreeRootFolder = { link = 'TreeRootFolder' }
G.NeoTreeFileIcon = { link = 'TreeFileIcon' }
G.NeoTreeFileNameOpened = { link = 'TreeFileNameOpened'}
G.NeoTreeFolderName = { link = 'TreeFolderName' }
G.NeoTreeOpenedFolderName = { link = 'TreeFolderName' }
G.NeoTreeEmptyFolderName = { link = 'TreeFolderName' }
G.NeoTreeSpecialFile = { link = 'TreeSpecialFile' }
G.NeoTreeIndentMarker = { link = 'TreeIndentMarker' }
G.NeoTreeGitAdded = { link = 'TreeGitAdded' }
G.NeoTreeGitNew = { link = 'TreeGitNew' }
G.NeoTreeGitDirty = { link = 'TreeGitDirty' }
G.NeoTreeGitDeleted = { link = 'TreeGitDeleted' }
G.NeoTreeGitStaged = { link = 'TreeGitStaged' }
G.NeoTreeGitConflict = { link = 'TreeGitConflict'}
G.NeoTreeGitModified = { link = 'TreeGitModified' }
G.NeoTreeGitUntracked = { link = 'TreeGitUntracked' }
G.NeoTreeWinSeparator = { link = 'TreeWinSeparator' }
G.NeoTreeCursor = { link = 'TreeCursor' }
G.NeoTreeNormal = { link = 'TreeNormal' }
G.NeoTreeNormalNC = { link = 'TreeNormalNC' }
G.NeoTreeSymbolicLinkTarget = { link = 'TreeSymlink' }
G.NeoTreeTitleBar = { link = 'TreeTitleBar' }
G.NeoTreeFloatBorder = { link = 'TreeFloatBorder' }

-- Noice Flat.
G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true }
Expand Down
Loading