Skip to content

Commit d36fd4c

Browse files
authored
Merge branch 'master' into win11
2 parents 7bcaab3 + 94f551b commit d36fd4c

File tree

7 files changed

+257
-102
lines changed

7 files changed

+257
-102
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 appropriate 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: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ 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:
31-
- If want to write Typescript, you need `npm`
32-
- If want to write Golang, you will need `go`
31+
- If you want to write Typescript, you need `npm`
32+
- If you want to write Golang, you will need `go`
3333
- etc.
3434

3535
> **NOTE**
@@ -56,9 +56,13 @@ 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
62+
You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file
63+
too - it's ignored in the kickstart repo to make maintenance easier, but it's
64+
[recommended to track it in version control](https://lazy.folke.io/usage/lockfile).
65+
6266
#### Clone kickstart.nvim
6367
> **NOTE**
6468
> If following the recommended step above (i.e., forking the repo), replace
@@ -77,13 +81,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO
7781
If you're using `cmd.exe`:
7882

7983
```
80-
git clone https://github.com/nvim-lua/kickstart.nvim.git %localappdata%\nvim\
84+
git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
8185
```
8286

8387
If you're using `powershell.exe`
8488

8589
```
86-
git clone https://github.com/nvim-lua/kickstart.nvim.git $env:LOCALAPPDATA\nvim\
90+
git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
8791
```
8892

8993
</details>
@@ -97,22 +101,27 @@ nvim
97101
```
98102

99103
That's it! Lazy will install all the plugins you have. Use `:Lazy` to view
100-
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
101107

102108
Read through the `init.lua` file in your configuration folder for more
103109
information about extending and exploring Neovim. That also includes
104110
examples of adding popularly requested plugins.
105111

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

107116
### Getting Started
108117

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

111120
### FAQ
112121

113-
* 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?
114123
* You should back it up and then delete all associated files.
115-
* 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`
116125
which can be deleted with `rm -rf ~/.local/share/nvim/`
117126
* Can I keep my existing configuration in parallel to kickstart?
118127
* Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME`
@@ -126,12 +135,12 @@ examples of adding popularly requested plugins.
126135
`~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
127136
distribution that you would like to try out.
128137
* What if I want to "uninstall" this configuration:
129-
* See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information
138+
* See [lazy.nvim uninstall](https://lazy.folke.io/usage#-uninstalling) information
130139
* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
131140
* The main purpose of kickstart is to serve as a teaching tool and a reference
132141
configuration that someone can easily use to `git clone` as a basis for their own.
133142
As you progress in learning Neovim and Lua, you might consider splitting `init.lua`
134-
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
135144
same functionality is available here:
136145
* [kickstart-modular.nvim](https://github.com/dam9000/kickstart-modular.nvim)
137146
* Discussions on this topic can be found here:
@@ -170,7 +179,7 @@ run in cmd as **admin**:
170179
winget install --accept-source-agreements chocolatey.chocolatey
171180
```
172181

173-
2. install all requirements using choco, exit previous cmd and
182+
2. install all requirements using choco, exit the previous cmd and
174183
open a new one so that choco path is set, and run in cmd as **admin**:
175184
```
176185
choco install -y neovim git ripgrep wget fd unzip gzip mingw make
@@ -203,14 +212,14 @@ sudo apt update
203212
sudo apt install make gcc ripgrep unzip git xclip curl
204213
205214
# Now we install nvim
206-
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz
207-
sudo rm -rf /opt/nvim-linux64
208-
sudo mkdir -p /opt/nvim-linux64
209-
sudo chmod a+rX /opt/nvim-linux64
210-
sudo tar -C /opt -xzf nvim-linux64.tar.gz
215+
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x86_64.tar.gz
216+
sudo rm -rf /opt/nvim-linux-x86_64
217+
sudo mkdir -p /opt/nvim-linux-x86_64
218+
sudo chmod a+rX /opt/nvim-linux-x86_64
219+
sudo tar -C /opt -xzf nvim-linux-x86_64.tar.gz
211220
212221
# make it available in /usr/local/bin, distro installs to /usr/bin
213-
sudo ln -sf /opt/nvim-linux64/bin/nvim /usr/local/bin/
222+
sudo ln -sf /opt/nvim-linux-x86_64/bin/nvim /usr/local/bin/
214223
```
215224
</details>
216225
<details><summary>Fedora Install Steps</summary>

0 commit comments

Comments
 (0)