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

Jump to bottom

fix(defaults): Enable mini integration by default #718

Merged
merged 1 commit into from
Jun 24, 2024
Merged

fix(defaults): Enable mini integration by default #718

merged 1 commit into from
Jun 24, 2024

Conversation

tjkuson
Copy link
Contributor

@tjkuson tjkuson commented Jun 10, 2024 •
edited by sgoudham
Loading

The documentation says that mini is enabled by default, but it is not. This patch changes the defaults to match what is documented.

nvim/README.md

Lines 880 to 885 in cc8e290

```lua
mini = {
enabled = true,
indentscope_color = "", -- catppuccin color (eg. `lavender`) Default: text
},
```

Closes #715

BEGIN_COMMIT_OVERRIDE
fix(defaults): Enable mini integration by default
END_COMMIT_OVERRIDE

@tjkuson tjkuson mentioned this pull request Jun 10, 2024
Closed
@vollowx
Copy link
Collaborator

vollowx commented Jun 18, 2024 •
edited
Loading

Maybe also set a indentscope color like surface2 ?

@tjkuson
fix(defaults)!: Enable mini integration by default
af5d769 
The documentation says that mini is enabled by default, but it is not.
This patch changes the defaults to match what is documented.
@tjkuson tjkuson force-pushed the fix/enable-mini-by-default branch from cd37ed5 to af5d769 Compare June 23, 2024 21:51
@tjkuson
Copy link
Contributor Author

tjkuson commented Jun 23, 2024 •
edited
Loading

Maybe also set a indentscope color like surface2 ?

Good point, I forgot to actually set one. I have just set the indentscope colour to text as that's what the current document suggests. Do you think it would be better if I set it to surface2 and update the documentation as well?

@sgoudham
Copy link
Contributor

sgoudham commented Jun 24, 2024 •
edited
Loading

Hey 👋
Thanks for catching this.

I don't think you need to set indentscope_color since we seem to default to text:

nvim/lua/catppuccin/groups/integrations/mini.lua

Line 16 in 67565cd

MiniIndentscopeSymbol = { fg = C[indentscope_color] or C.text },

(But I do like the explicitness anyways!)

I'm happy with the colour being specified as text.

@sgoudham sgoudham changed the title fix(defaults)!: Enable mini integration by default fix(defaults): Enable mini integration by default Jun 24, 2024
@vollowx vollowx merged commit 894efb5 into catppuccin:main Jun 24, 2024
9 checks passed
@github-actions github-actions bot mentioned this pull request Jun 20, 2024
Merged
@tjkuson tjkuson deleted the fix/enable-mini-by-default branch June 24, 2024 09:43
Jint-lzxy added a commit to Jint-lzxy/nvim that referenced this pull request Jul 14, 2024
@Jint-lzxy
Merge branch 'main' into refactor/syntax-highlighting
87ef331 
---

Squashed commit of the following:

commit 7946d1a
Author: Vollow <vollowx@proton.me>
Date:   Thu Jul 11 17:45:39 2024 +0800

    feat(feline): allow to hide lazy.nvim updates (catppuccin#731)

    * feat(feline): allow to hide lazy.nvim updates

    * fix(feline): check if lazy.nvim exisis

    * feat(feline): disable lazy.nvim updates module by default
    docs(feline): document settings for lazy.nvim updates module

    * docs: auto generate vimdoc

    ---------

    Co-authored-by: vollowx <vollowx@users.noreply.github.com>

commit 47bd419
Author: Ilias Dougias <39212564+ilias777@users.noreply.github.com>
Date:   Wed Jul 10 15:29:28 2024 +0200

    feat(feline): add lazy.nvim updates module, replace deprecated API (catppuccin#725)

    * Add lazy.nvim plugin updates in feline
    * Use pcall for checking if lazy.nvim is installed
    * fix(feline): fix provider option for lazy updates
    * refactor(feline): update deprecated api functions

commit 2d3419c
Author: Daryl <23520617+PlatyPew@users.noreply.github.com>
Date:   Mon Jul 8 17:40:11 2024 +0800

    fix!(leap): highlight group for `LeapLabel` (catppuccin#728)

    `LeapLabel` replaces `LeapLabelPrimary` and `LeapLabelSecondary`

    Signed-off-by: Platy <daryl.limkz@gmail.com>

commit 4ea0173
Author: Igor Lacerda <igorlfs@ufmg.br>
Date:   Mon Jul 8 06:30:44 2024 -0300

    fix(dapui): border match bg color (catppuccin#727)

commit 1d76b57
Author: vollowx <vollowx@proton.me>
Date:   Sun Jul 7 19:54:00 2024 +0800

    Revert "fix: color float window border background (catppuccin#722)"

    This reverts commit 31fcfb0, as it
    breaks some of the UI.

commit 31fcfb0
Author: Vollow <vollowx@proton.me>
Date:   Fri Jun 28 01:41:51 2024 +0800

    fix: color float window border background (catppuccin#722)

commit 6827a67
Author: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date:   Thu Jun 27 20:38:09 2024 +0300

    feat(mini): add new highlight groups (catppuccin#721)

commit 894efb5
Author: Tom Kuson <mail@tjkuson.me>
Date:   Mon Jun 24 10:39:13 2024 +0100

    fix(defaults)!: Enable mini integration by default (catppuccin#718)

    The documentation says that mini is enabled by default, but it is not.
    This patch changes the defaults to match what is documented.

commit 67565cd
Author: Igor Lacerda <igorlfs@ufmg.br>
Date:   Thu Jun 20 09:05:14 2024 -0300

    feat(csv): built-in rainbow highlighting (catppuccin#720)

commit c0bea77
Author: Mateus Alves <98139059+redyf@users.noreply.github.com>
Date:   Fri Jun 14 00:07:19 2024 -0300

    fix: small typo in feline.lua file (catppuccin#719)

commit cc8e290
Author: Thaumy <thaumy@outlook.com>
Date:   Mon Jun 10 23:25:09 2024 +0800

    feat(bufferline): add `indicator_visible` and `modified_visible` (catppuccin#716)

commit afccb3d
Author: Igor Lacerda <igorlfs@ufmg.br>
Date:   Mon Jun 10 12:24:29 2024 -0300

    fix(neogit): link WinSeparator (catppuccin#713)

commit 5215ea5
Author: MithicSpirit <rpc01234@gmail.com>
Date:   Sun May 26 02:29:20 2024 -0400

    Support new "Ok" diagnostics (catppuccin#708)

    * feat(native_lsp): support new "Ok" diagnostics

    Defaults to using the green color.

    This was not added to the "LspDiagnostic*" highlights since I could not
    find any documentation on whether the "Ok" diagnostic is implemented for
    those. Indeed, I could not find any documentation whatsoever on the
    LspDiagnostic* highlights (grepping the Neovim source turned up no
    mentions of them either).

    * doc(native_lsp): new "Ok" diagnostic

    Add documentation and type information for the new "Ok" diagnostic.

commit 4edca6b
Author: Myles Mo <54089360+emxxjnm@users.noreply.github.com>
Date:   Sun May 26 14:22:31 2024 +0800

    feat(treesitter-content): highlight line number (catppuccin#709)

    * fix:(treesitter-content): respect transparency

    * chore: format

    ---------

    Co-authored-by: Myles Mo <mylesmo.ash@gmail.com>
    Co-authored-by: mrtnvgr <root@unixis.fun>

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgoudham sgoudham sgoudham approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add support for mini.statusline
3 participants
@tjkuson @vollowx @sgoudham