Skip to content

Commit b1d2242

Browse files
authored
Merge branch 'nvim-lua:master' into master
2 parents ee4a5ba + 2377390 commit b1d2242

File tree

5 files changed

+220
-84
lines changed

5 files changed

+220
-84
lines changed

.github/pull_request_template.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
***************************************************************************
2+
**NOTE**
3+
Please verify that the `base repository` above has the intended destination!
4+
Github by default opens Pull Requests against the parent of a forked repository.
5+
If this is your personal fork and you didn't intend to open a PR for contribution
6+
to the original project then adjust the `base repository` accordingly.
7+
**************************************************************************
8+

README.md

Lines changed: 87 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ If you are experiencing issues, please make sure you have the latest versions.
2121

2222
### Install External Dependencies
2323

24-
> **NOTE**
25-
> [Backup](#FAQ) your previous configuration (if any exists)
26-
2724
External Requirements:
2825
- Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`)
2926
- [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
@@ -35,7 +32,13 @@ External Requirements:
3532
- etc.
3633

3734
> **NOTE**
38-
> See [Windows Installation](#Windows-Installation) to double check any additional Windows notes
35+
> See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes
36+
> and quick install snippets
37+
38+
### Install Kickstart
39+
40+
> **NOTE**
41+
> [Backup](#FAQ) your previous configuration (if any exists)
3942
4043
Neovim's configurations are located under the following paths, depending on your OS:
4144

@@ -45,9 +48,20 @@ Neovim's configurations are located under the following paths, depending on your
4548
| Windows (cmd)| `%userprofile%\AppData\Local\nvim\` |
4649
| Windows (powershell)| `$env:USERPROFILE\AppData\Local\nvim\` |
4750

48-
### Install Kickstart
51+
#### Recommended Step
52+
53+
[Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo
54+
so that you have your own copy that you can modify, then install by cloning the
55+
fork to your machine using one of the commands below, depending on your OS.
4956

50-
Clone kickstart.nvim:
57+
> **NOTE**
58+
> Your fork's url will be something like this:
59+
> `https://github.com/<your_github_username>/kickstart.nvim.git`
60+
61+
#### Clone kickstart.nvim
62+
> **NOTE**
63+
> If following the recommended step above (i.e., forking the repo), replace
64+
> `nvim-lua` with `<your_github_username>` in the commands below
5165
5266
<details><summary> Linux and Mac </summary>
5367

@@ -82,23 +96,11 @@ nvim
8296
```
8397

8498
That's it! Lazy will install all the plugins you have. Use `:Lazy` to view
85-
current plugin status.
99+
current plugin status. Hit `q` to close the window.
86100

87101
Read through the `init.lua` file in your configuration folder for more
88102
information about extending and exploring Neovim.
89103

90-
### Getting Started
91-
92-
[The Only Video You Need to Get Started with Neovim](https://youtu.be/m8C0Cq9Uv9o)
93-
94-
### Recommended Steps
95-
96-
[Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo
97-
(so that you have your own copy that you can modify) and then install. You
98-
can install it on your machine using the methods above.
99-
100-
> **NOTE**
101-
> Your fork's url will be something like this: `https://github.com/<your_github_username>/kickstart.nvim.git`
102104

103105
#### Examples of adding popularly requested plugins
104106

@@ -107,7 +109,9 @@ NOTE: You'll need to uncomment the line in the init.lua that turns on loading cu
107109
<details>
108110
<summary>Adding autopairs</summary>
109111

110-
This will automatically install [windwp/nvim-autopairs](https://github.com/windwp/nvim-autopairs) and enable it on startup. For more information, see documentation for [lazy.nvim](https://github.com/folke/lazy.nvim).
112+
This will automatically install [windwp/nvim-autopairs](https://github.com/windwp/nvim-autopairs)
113+
and enable it on startup. For more information, see documentation for
114+
[lazy.nvim](https://github.com/folke/lazy.nvim).
111115

112116
In the file: `lua/custom/plugins/autopairs.lua`, add:
113117

@@ -135,7 +139,9 @@ return {
135139
<details>
136140
<summary>Adding a file tree plugin</summary>
137141

138-
This will install the tree plugin and add the command `:Neotree` for you. For more information, see the documentation at [neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim).
142+
This will install the tree plugin and add the command `:Neotree` for you.
143+
For more information, see the documentation at
144+
[neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim).
139145

140146
In the file: `lua/custom/plugins/filetree.lua`, add:
141147

@@ -158,17 +164,27 @@ return {
158164

159165
</details>
160166

167+
### Getting Started
168+
169+
[The Only Video You Need to Get Started with Neovim](https://youtu.be/m8C0Cq9Uv9o)
170+
161171
### FAQ
162172

163173
* What should I do if I already have a pre-existing neovim configuration?
164174
* You should back it up and then delete all associated files.
165-
* This includes your existing init.lua and the neovim files in `~/.local` which can be deleted with `rm -rf ~/.local/share/nvim/`
175+
* This includes your existing init.lua and the neovim files in `~/.local`
176+
which can be deleted with `rm -rf ~/.local/share/nvim/`
166177
* Can I keep my existing configuration in parallel to kickstart?
167-
* Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME` to maintain multiple configurations. For example, you can install the kickstart configuration in `~/.config/nvim-kickstart` and create an alias:
178+
* Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME`
179+
to maintain multiple configurations. For example, you can install the kickstart
180+
configuration in `~/.config/nvim-kickstart` and create an alias:
168181
```
169182
alias nvim-kickstart='NVIM_APPNAME="nvim-kickstart" nvim'
170183
```
171-
When you run Neovim using `nvim-kickstart` alias it will use the alternative config directory and the matching local directory `~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim distribution that you would like to try out.
184+
When you run Neovim using `nvim-kickstart` alias it will use the alternative
185+
config directory and the matching local directory
186+
`~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
187+
distribution that you would like to try out.
172188
* What if I want to "uninstall" this configuration:
173189
* See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information
174190
* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
@@ -182,8 +198,15 @@ return {
182198
* [Restructure the configuration](https://github.com/nvim-lua/kickstart.nvim/issues/218)
183199
* [Reorganize init.lua into a multi-file setup](https://github.com/nvim-lua/kickstart.nvim/pull/473)
184200
185-
### Windows Installation
201+
### Install Recipes
202+
203+
Below you can find OS specific install instructions for Neovim and dependencies.
204+
205+
After installing all the dependencies continue with the [Install Kickstart](#Install-Kickstart) step.
186206
207+
#### Windows Installation
208+
209+
<details><summary>Windows with Microsoft C++ Build Tools and CMake</summary>
187210
Installation may require installing build tools and updating the run command for `telescope-fzf-native`
188211
189212
See `telescope-fzf-native` documentation for [more details](https://github.com/nvim-telescope/telescope-fzf-native.nvim#installation)
@@ -195,7 +218,8 @@ This requires:
195218
```lua
196219
{'nvim-telescope/telescope-fzf-native.nvim', build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
197220
```
198-
221+
</details>
222+
<details><summary>Windows with gcc/make using chocolatey</summary>
199223
Alternatively, one can install gcc and make which don't require changing the config,
200224
the easiest way is to use choco:
201225

@@ -211,5 +235,41 @@ open a new one so that choco path is set, and run in cmd as **admin**:
211235
```
212236
choco install -y neovim git ripgrep wget fd unzip gzip mingw make
213237
```
238+
</details>
239+
<details><summary>WSL (Windows Subsystem for Linux)</summary>
240+
241+
```
242+
wsl --install
243+
wsl
244+
sudo add-apt-repository ppa:neovim-ppa/unstable -y
245+
sudo apt update
246+
sudo apt install make gcc ripgrep unzip neovim
247+
```
248+
</details>
249+
250+
#### Linux Install
251+
<details><summary>Ubuntu Install Steps</summary>
252+
253+
```
254+
sudo add-apt-repository ppa:neovim-ppa/unstable -y
255+
sudo apt update
256+
sudo apt install make gcc ripgrep unzip git neovim
257+
```
258+
</details>
259+
<details><summary>Debian Install Steps</summary>
260+
261+
```
262+
sudo apt update
263+
sudo apt install make gcc ripgrep unzip git
264+
echo "deb https://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list
265+
sudo apt update
266+
sudo apt install -t unstable neovim
267+
```
268+
</details>
269+
<details><summary>Fedora Install Steps</summary>
270+
271+
```
272+
sudo dnf install -y gcc make git ripgrep fd-find neovim
273+
```
274+
</details>
214275

215-
Then, continue with the [Install Kickstart](#Install-Kickstart) step.

0 commit comments

Comments
 (0)