Skip to content

Chore/update upstream#89

Closed
oriori1703 wants to merge 46 commits into
dam9000:masterfrom
oriori1703:chore/update-upstream
Closed

Chore/update upstream#89
oriori1703 wants to merge 46 commits into
dam9000:masterfrom
oriori1703:chore/update-upstream

Conversation

@oriori1703
Copy link
Copy Markdown

@oriori1703 oriori1703 commented Mar 10, 2026

Update to the latest changes in upstream kickstart

BTW, I have recently became a maintainer on the main kickstart.nvim :)
I'm still not sure if kickstart needs to go in the modular direction, but I really like your project so I thought I will help a bit

advinsuryavanshi and others added 30 commits January 27, 2026 09:17
* move telescope related lsp functions inside the telscope plugin declaration block

* explicitly enable telescope plugin, add some comments explainging why

* update comments with suggestions from @oriori1703

Co-authored-by: Ori Perry <48057913+oriori1703@users.noreply.github.com>

* fix formatting in accordance to stylua so that pipeline passes

---------

Co-authored-by: Philipp Szechenyi <philipp.szechenyi@cgm.com>
Co-authored-by: Philipp Szechenyi <45265588+szechp@users.noreply.github.com>
Co-authored-by: Ori Perry <48057913+oriori1703@users.noreply.github.com>
Co-authored-by: philipp <philipp@philipps-MacBook-Pro.local>
The current comment in .gitignore for lazy-lock.json suggests to
uncomment it yourself, but you actually need to comment it instead.

This change modifies the comment to clarify the recommended approach for
kickstart users.
This could help beginners to get autocompletion, catch mistakes earlier,
and allow them to skip the docs for simple configs.

This is not perfect because a lot of the plugins type all of their keys
as required, even though they have defaults, but this is good enough.
Add type hints to plugin options where possible
Adds 'gr' to which-keys documentation, so users can see that LSP actions are grouped after 'gr' key binds.

Co-authored-by: thiago-negri <evohunz@gmail.com>
…mment

Clarify comment in .gitignore for lazy-lock.json
@oriori1703 oriori1703 force-pushed the chore/update-upstream branch from d3995bf to 6f7801d Compare March 10, 2026 20:11
@dam9000
Copy link
Copy Markdown
Owner

dam9000 commented Mar 11, 2026

Update to the latest changes in upstream kickstart

BTW, I have recently became a maintainer on the main kickstart.nvim :) I'm still not sure if kickstart needs to go in the modular direction, but I really like your project so I thought I will help a bit

Ah, awesome, it finally happened? Congrats! :D
I'll look at this PR soon, sorry I stepped away a while since the upstream seemed abandoned.

@dam9000
Copy link
Copy Markdown
Owner

dam9000 commented Mar 15, 2026

Hmm, github says:

This branch cannot be rebased due to conflicts

I think I'll need to sync manually as usual...

@dam9000
Copy link
Copy Markdown
Owner

dam9000 commented Mar 15, 2026

I merged the upstream changes, there's a few styling differences compared to this PR but I think functionally should be the same.

@oriori1703
Copy link
Copy Markdown
Author

Sorry for the rebase issue. I will try to better match the existing code next time 😊

@oriori1703 oriori1703 closed this Mar 20, 2026
@oriori1703 oriori1703 deleted the chore/update-upstream branch March 30, 2026 11:26
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.