Skip to content

Commit f15b5cd

Browse files
committed
Merge branch 'master' into codemedic-customisations
* master: fix: prevent mason setup from being run twice (nvim-lua#1298) Fix which-key delay settings (nvim-lua#1276) chore: add pre-issue requirements (nvim-lua#1288) Fix README.md grammar and typos (nvim-lua#1291)
2 parents aee3541 + db4867a commit f15b5cd

File tree

3 files changed

+36
-17
lines changed

3 files changed

+36
-17
lines changed

.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
@@ -24,7 +24,7 @@ If you are experiencing issues, please make sure you have the latest versions.
2424
External Requirements:
2525
- Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`)
2626
- [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
27-
- Clipboard tool (xclip/xsel/win32yank or other depending on platform)
27+
- Clipboard tool (xclip/xsel/win32yank or other depending on the platform)
2828
- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
2929
- if you have it set `vim.g.have_nerd_font` in `init.lua` to true
3030
- Language Setup:
@@ -56,12 +56,12 @@ so that you have your own copy that you can modify, then install by cloning the
5656
fork to your machine using one of the commands below, depending on your OS.
5757

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

6666
#### Clone kickstart.nvim
6767
> **NOTE**
@@ -101,22 +101,27 @@ nvim
101101
```
102102

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

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

112+
> [!NOTE]
113+
> For more information about a particular plugin check its repository's documentation.
114+
110115

111116
### Getting Started
112117

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

115120
### FAQ
116121

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

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

init.lua

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ vim.opt.signcolumn = 'yes'
136136
vim.opt.updatetime = 250
137137

138138
-- Decrease mapped sequence wait time
139-
-- Displays which-key popup sooner
140139
vim.opt.timeoutlen = 300
141140

142141
-- Configure how new splits should be opened
@@ -285,6 +284,9 @@ require('lazy').setup({
285284
'folke/which-key.nvim',
286285
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
287286
opts = {
287+
-- delay between pressing a key and opening which-key (milliseconds)
288+
-- this setting is independent of vim.opt.timeoutlen
289+
delay = 0,
288290
icons = {
289291
-- set icon mappings to true if you have a Nerd Font
290292
mappings = vim.g.have_nerd_font,
@@ -471,7 +473,9 @@ require('lazy').setup({
471473
'neovim/nvim-lspconfig',
472474
dependencies = {
473475
-- Automatically install LSPs and related tools to stdpath for Neovim
474-
{ 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
476+
-- Mason must be loaded before its dependents so we need to set it up here.
477+
-- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
478+
{ 'williamboman/mason.nvim', opts = {} },
475479
'williamboman/mason-lspconfig.nvim',
476480
'WhoIsSethDaniel/mason-tool-installer.nvim',
477481

@@ -674,13 +678,16 @@ require('lazy').setup({
674678
}
675679

676680
-- Ensure the servers and tools above are installed
677-
-- To check the current status of installed tools and/or manually install
678-
-- other tools, you can run
681+
--
682+
-- To check the current status of installed tools and/or manually install
683+
-- other tools, you can run
679684
-- :Mason
680685
--
681-
-- You can press `g?` for help in this menu.
682-
require('mason').setup()
683-
686+
-- You can press `g?` for help in this menu.
687+
--
688+
-- `mason` had to be setup earlier: to configure its options see the
689+
-- `dependencies` table for `nvim-lspconfig` above.
690+
--
684691
-- You can add other tools here that you want Mason to install
685692
-- for you, so that they are available from within Neovim.
686693
local ensure_installed = vim.tbl_keys(servers or {})

0 commit comments

Comments
 (0)