Alternate Lazygit Styling

[pkazmier]

I tuned 'lazygit' styling a bit:

1. Changed activeBorderColor from palette.ui.lineNumber to secondary as I felt line number orange (in lagoon at least) was much too saturated and that the secondary fits better with the overall aesthetic.
2. Changed selectedLineBgColor from palette.ui.cursorLine to surface as I launch lazygit quite often within neovim, which opens it in a float. Unfortunately, the float bg color is the same as the cursor line, so when in neovim in lazygit, I was unable to see the lazygit cursor line.

  # Oasis Lagoon Dark theme
  authorColors:
    "*": "#F8B471"
  theme:
    activeBorderColor:
      - "#f8b471"
      - bold
    inactiveBorderColor:
      - "#58B8FD"
    optionsTextColor:
      - "#f0e68c"
    selectedLineBgColor:
      - "#22385C"
    cherryPickedCommitFgColor:
      - "#58B8FD"
    cherryPickedCommitBgColor:
      - "#22385C"
    unstagedChangesColor:
      - "#ff7979"
    defaultFgColor:
      - "#d9e6fa"

[pkazmier]

I also started to tune my 'delta' config in .gitconfig using the "mellow-barbet" as a starting place. You can see how these settings look in the right-hand side of my lazygit screenshot above (that's the 'delta' part for those not familiar):

[delta "oasis"]
  dark = true
  syntax-theme = oasis-lagoon-dark
  line-numbers = true
  side-by-side = true
  file-style = brightwhite
  file-decoration-style = none
  file-added-label = [+]
  file-copied-label = [==]
  file-modified-label = [*]
  file-removed-label = [-]
  file-renamed-label = [->]
  hunk-header-decoration-style = "#3AACFD" box ul
  plus-style = syntax "#22385C"
  plus-emph-style = brightblack brightyellow bold
  minus-style = syntax "#22385C"
  minus-emph-style = brightblack brightyellow bold
  line-numbers-minus-style = brightblack brightred bold
  line-numbers-plus-style = brightblack brightgreen bold
  line-numbers-left-style = "#3b6a87"
  line-numbers-right-style = "#3b6a87"
  line-numbers-zero-style = "#3b6a87"
  ; haven't tuned anything below this point
  zero-style = syntax
  whitespace-error-style = black bold
  blame-code-style = syntax
  blame-palette = "#161617" "#1b1b1d" "#2a2a2d" "#3e3e43"
  merge-conflict-begin-symbol = ~
  merge-conflict-end-symbol = ~
  merge-conflict-ours-diff-header-style = yellow bold
  merge-conflict-ours-diff-header-decoration-style = "#3e3e43" box
  merge-conflict-theirs-diff-header-style = yellow bold
  merge-conflict-theirs-diff-header-decoration-style = "#3e3e43" box

[uhs-robert]

This is excellent, thank you! Those two changes you made are actually bugs that I missed, this does need to be updated in extras/lazygit.

I am using LazyGit from Snacks which uses ui.match.bg for activeBorderColor rather than secondary.

• Oftentimes it uses secondary.
• Other times it darkens or lightens slightly.
• Or it uses the accent color instead (like with Desert).

I'm at the doctor's office today for a five hour visit then putting down some floors so I can't get screenshots today (but I can another day). Could you take a look and let me know what you think about using match.bg?

I am also curious which LazyGit integration you use and will be checking out the delta later 🙏

[pkazmier]

Ah, yes, I prefer ui.match.bg and have updated my configuration. Thanks!

I simply use ToggleTerm and the following function, which I bind to <leader>gg.

Good luck today at the doctors!

[uhs-robert]

Awesome! I'll push out this update later today. Sounds like an easy way to handle it, looks like I did for SSH.

And thanks! My wife is 29 weeks pregnant so we're doing a long test today.

[pkazmier]

Congratulations!