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.

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

fix(neogit): improve Neogit colors #235

Merged
merged 5 commits into from Aug 7, 2022
Merged

fix(neogit): improve Neogit colors #235

merged 5 commits into from Aug 7, 2022

Conversation

mizlan
Copy link
Contributor

@mizlan mizlan commented Aug 7, 2022

before

Screen Shot 2022-08-06 at 5 52 43 PM

after

Screen Shot 2022-08-06 at 5 40 42 PM

@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

As an active Neogit user, I find the existing colors intolerable so I created this new set of highlights that takes advantage of ucolors.darken a lot!

@nullchilly
Copy link
Member

Thank! I am still using vim-fugitive
I guess its time to try neogit out :)

@nullchilly
Copy link
Member

nullchilly commented Aug 7, 2022

@mizlan Don't you think it's still a bit hard to see the first line in NeogitCommitView?
image

@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

Also see this: NeogitOrg/neogit#330

Will work on this, will also probably PR Neogit to get customization on the other hunks (I want to dim unfocused hunk's context lines)

@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

Screen Shot 2022-08-06 at 6 38 00 PM

Foreground also turns weird blue color in Commit view mode, will try to fix as well

@mizlan mizlan changed the title fix(neogit): improve Neogit{Hunk,Diff} colors fix(neogit): improve Neogit colors Aug 7, 2022
@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

This is the best I can do for now, since I dont know why it's blue. Fixed formatting, and added some more hlgroups. Take a look:
Screen Shot 2022-08-06 at 8 48 05 PM
Screen Shot 2022-08-06 at 8 48 29 PM

@nullchilly
Copy link
Member

@mizlan It's too dim for me though?
image

@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

Yeah, thats a bit of a problem. However, the goal is to fix that in Neogit itself so the hunk under cursor uses the other set of highlights. These, then, would be the "inactive" hunks. I think for now this is an alright approach.

@nullchilly
Copy link
Member

@mizlan So we are missing the ActiveHunk

Why not just decrease the dim in the meantime and open another pr later when InactiveHunk is fixed?

@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

Good question. Maybe my workflow is different than others but I spend 99% of my time in the status buffer, where the dimmed text matters and is significantly helpful. I rarely view existing commits or browse diffs in other forms in Neogit. I cannot say the same for others' workflows but I'll be happy to change it if you prefer. I could leave those commented out with a note to re-enable them after Neogit is updated.

@nullchilly
Copy link
Member

nullchilly commented Aug 7, 2022

Yeah that sounds good

Remember we try not to be opinionated as much as possible

Personal reference is done via custom_highlight :)

I don't have a source to back up my claim but I think it is what the majority want

@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

Oh. I've got an idea. I'll use a more vibrant bg for "active" hunks right now. Will be easily visibly distinguishable while allowing both active and inactive to be readable.

@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

Screen Shot 2022-08-06 at 9 26 39 PM

Quite fond of this setup: both are legible but one is grabs my attention more.

@nullchilly
Copy link
Member

@mizlan Seems good!

We can merge this now if you want?

@mizlan
Copy link
Contributor Author

mizlan commented Aug 7, 2022

Sure, go ahead! Can't find anything else for now.

@nullchilly nullchilly merged commit a1bb95d into catppuccin:main Aug 7, 2022
@mizlan mizlan deleted the better-neogit branch August 7, 2022 04:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants