Skip to content

Commit 5f3310d

Browse files
committed
Merge 'upstream': 3 misc commits
- Fix which-key delay settings - chore: add pre-issue requirements - Fix README.md grammar and typos
2 parents 5d699a0 + a8f5395 commit 5f3310d

4 files changed

Lines changed: 25 additions & 11 deletions

File tree

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ assignees: ''
99

1010
<!-- Any bug report not following this template will be immediately closed. Thanks -->
1111

12+
## Before Reporting an Issue
13+
- I have read the kickstart.nvim README.md.
14+
- I have read the appropiate plugin's documentation.
15+
- I have searched that this issue has not been reported before.
16+
17+
- [ ] **By checking this, I confirm that the above steps are completed. I understand leaving this unchecked will result in this report being closed immediately.**
18+
1219
## Describe the bug
1320
<!-- A clear and concise description of what the bug is. -->
1421

@@ -18,8 +25,8 @@ assignees: ''
1825

1926
## Desktop
2027
<!-- please complete the following information. -->
21-
- OS:
22-
- Terminal:
28+
- OS:
29+
- Terminal:
2330

2431
## Neovim Version
2532
<!-- Output of running `:version` from inside of neovim. -->

README.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ If you are experiencing issues, please make sure you have the latest versions.
2626
External Requirements:
2727
- Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`)
2828
- [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
29-
- Clipboard tool (xclip/xsel/win32yank or other depending on platform)
29+
- Clipboard tool (xclip/xsel/win32yank or other depending on the platform)
3030
- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
3131
- if you have it set `vim.g.have_nerd_font` in `init.lua` to true
3232
- Language Setup:
@@ -58,12 +58,12 @@ so that you have your own copy that you can modify, then install by cloning the
5858
fork to your machine using one of the commands below, depending on your OS.
5959

6060
> **NOTE**
61-
> Your fork's url will be something like this:
61+
> Your fork's URL will be something like this:
6262
> `https://github.com/<your_github_username>/kickstart-modular.nvim.git`
6363
6464
You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file
6565
too - it's ignored in the kickstart repo to make maintenance easier, but it's
66-
[recommmended to track it in version control](https://lazy.folke.io/usage/lockfile).
66+
[recommended to track it in version control](https://lazy.folke.io/usage/lockfile).
6767

6868
#### Clone kickstart.nvim
6969
> **NOTE**
@@ -103,22 +103,27 @@ nvim
103103
```
104104

105105
That's it! Lazy will install all the plugins you have. Use `:Lazy` to view
106-
current plugin status. Hit `q` to close the window.
106+
the current plugin status. Hit `q` to close the window.
107+
108+
#### Read The Friendly Documentation
107109

108110
Read through the `init.lua` file in your configuration folder for more
109111
information about extending and exploring Neovim. That also includes
110112
examples of adding popularly requested plugins.
111113

114+
> [!NOTE]
115+
> For more information about a particular plugin check its repository's documentation.
116+
112117

113118
### Getting Started
114119

115120
[The Only Video You Need to Get Started with Neovim](https://youtu.be/m8C0Cq9Uv9o)
116121

117122
### FAQ
118123

119-
* What should I do if I already have a pre-existing neovim configuration?
124+
* What should I do if I already have a pre-existing Neovim configuration?
120125
* You should back it up and then delete all associated files.
121-
* This includes your existing init.lua and the neovim files in `~/.local`
126+
* This includes your existing init.lua and the Neovim files in `~/.local`
122127
which can be deleted with `rm -rf ~/.local/share/nvim/`
123128
* Can I keep my existing configuration in parallel to kickstart?
124129
* Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME`
@@ -137,7 +142,7 @@ examples of adding popularly requested plugins.
137142
* The main purpose of kickstart is to serve as a teaching tool and a reference
138143
configuration that someone can easily use to `git clone` as a basis for their own.
139144
As you progress in learning Neovim and Lua, you might consider splitting `init.lua`
140-
into smaller parts. A fork of kickstart that does this while maintaining the
145+
into smaller parts. A fork of kickstart that does this while maintaining the
141146
same functionality is available here:
142147
* [kickstart-modular.nvim](https://github.com/dam9000/kickstart-modular.nvim)
143148
* *NOTE: This is the fork that splits the configuration into smaller parts.*
@@ -179,7 +184,7 @@ run in cmd as **admin**:
179184
winget install --accept-source-agreements chocolatey.chocolatey
180185
```
181186

182-
2. install all requirements using choco, exit previous cmd and
187+
2. install all requirements using choco, exit the previous cmd and
183188
open a new one so that choco path is set, and run in cmd as **admin**:
184189
```
185190
choco install -y neovim git ripgrep wget fd unzip gzip mingw make

lua/kickstart/plugins/which-key.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ return {
1717
'folke/which-key.nvim',
1818
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
1919
opts = {
20+
-- delay between pressing a key and opening which-key (milliseconds)
21+
-- this setting is independent of vim.opt.timeoutlen
22+
delay = 0,
2023
icons = {
2124
-- set icon mappings to true if you have a Nerd Font
2225
mappings = vim.g.have_nerd_font,

lua/options.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ vim.opt.signcolumn = 'yes'
4040
vim.opt.updatetime = 250
4141

4242
-- Decrease mapped sequence wait time
43-
-- Displays which-key popup sooner
4443
vim.opt.timeoutlen = 300
4544

4645
-- Configure how new splits should be opened

0 commit comments

Comments
 (0)