Skip to content

Commit 428dcf9

Browse files
authored
Merge branch 'master' into develop
2 parents 10df384 + 1b28b15 commit 428dcf9

File tree

10 files changed

+582
-313
lines changed

10 files changed

+582
-313
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. -->

.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: 55 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -21,47 +21,52 @@ 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)
27+
- Clipboard tool (xclip/xsel/win32yank or other depending on the platform)
3028
- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
3129
- if you have it set `vim.g.have_nerd_font` in `init.lua` to true
30+
- Emoji fonts (Ubuntu only, and only if you want emoji!) `sudo apt install fonts-noto-color-emoji`
3231
- Language Setup:
33-
- If want to write Typescript, you need `npm`
34-
- If want to write Golang, you will need `go`
32+
- If you want to write Typescript, you need `npm`
33+
- If you want to write Golang, you will need `go`
3534
- etc.
3635

37-
> **NOTE**
36+
> [!NOTE]
3837
> See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes
3938
> and quick install snippets
4039
40+
### Install Kickstart
41+
42+
> [!NOTE]
43+
> [Backup](#FAQ) your previous configuration (if any exists)
44+
4145
Neovim's configurations are located under the following paths, depending on your OS:
4246

4347
| OS | PATH |
4448
| :- | :--- |
4549
| Linux, MacOS | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` |
46-
| Windows (cmd)| `%userprofile%\AppData\Local\nvim\` |
47-
| Windows (powershell)| `$env:USERPROFILE\AppData\Local\nvim\` |
48-
49-
### Install Kickstart
50+
| Windows (cmd)| `%localappdata%\nvim\` |
51+
| Windows (powershell)| `$env:LOCALAPPDATA\nvim\` |
5052

5153
#### Recommended Step
5254

5355
[Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo
5456
so that you have your own copy that you can modify, then install by cloning the
5557
fork to your machine using one of the commands below, depending on your OS.
5658

57-
58-
59-
> **NOTE**
60-
> Your fork's url will be something like this:
59+
> [!NOTE]
60+
> Your fork's URL will be something like this:
6161
> `https://github.com/<your_github_username>/kickstart.nvim.git`
6262
63+
You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file
64+
too - it's ignored in the kickstart repo to make maintenance easier, but it's
65+
[recommended to track it in version control](https://lazy.folke.io/usage/lockfile).
66+
6367
#### Clone kickstart.nvim
64-
> **NOTE**
68+
69+
> [!NOTE]
6570
> If following the recommended step above (i.e., forking the repo), replace
6671
> `nvim-lua` with `<your_github_username>` in the commands below
6772
@@ -78,13 +83,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO
7883
If you're using `cmd.exe`:
7984

8085
```
81-
git clone https://github.com/nvim-lua/kickstart.nvim.git %userprofile%\AppData\Local\nvim\
86+
git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
8287
```
8388

8489
If you're using `powershell.exe`
8590

8691
```
87-
git clone https://github.com/nvim-lua/kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
92+
git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
8893
```
8994

9095
</details>
@@ -98,83 +103,27 @@ nvim
98103
```
99104

100105
That's it! Lazy will install all the plugins you have. Use `:Lazy` to view
101-
current plugin status.
102-
103-
Read through the `init.lua` file in your configuration folder for more
104-
information about extending and exploring Neovim.
105-
106-
107-
#### Examples of adding popularly requested plugins
108-
109-
NOTE: You'll need to uncomment the line in the init.lua that turns on loading custom plugins.
110-
111-
<details>
112-
<summary>Adding autopairs</summary>
113-
114-
This will automatically install [windwp/nvim-autopairs](https://github.com/windwp/nvim-autopairs)
115-
and enable it on startup. For more information, see documentation for
116-
[lazy.nvim](https://github.com/folke/lazy.nvim).
106+
the current plugin status. Hit `q` to close the window.
117107

118-
In the file: `lua/custom/plugins/autopairs.lua`, add:
108+
#### Read The Friendly Documentation
119109

120-
```lua
121-
-- File: lua/custom/plugins/autopairs.lua
122-
123-
return {
124-
"windwp/nvim-autopairs",
125-
-- Optional dependency
126-
dependencies = { 'hrsh7th/nvim-cmp' },
127-
config = function()
128-
require("nvim-autopairs").setup {}
129-
-- If you want to automatically add `(` after selecting a function or method
130-
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
131-
local cmp = require('cmp')
132-
cmp.event:on(
133-
'confirm_done',
134-
cmp_autopairs.on_confirm_done()
135-
)
136-
end,
137-
}
138-
```
139-
140-
</details>
141-
<details>
142-
<summary>Adding a file tree plugin</summary>
143-
144-
This will install the tree plugin and add the command `:Neotree` for you.
145-
For more information, see the documentation at
146-
[neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim).
147-
148-
In the file: `lua/custom/plugins/filetree.lua`, add:
110+
Read through the `init.lua` file in your configuration folder for more
111+
information about extending and exploring Neovim. That also includes
112+
examples of adding popularly requested plugins.
149113

150-
```lua
151-
-- File: lua/custom/plugins/filetree.lua
152-
153-
return {
154-
"nvim-neo-tree/neo-tree.nvim",
155-
version = "*",
156-
dependencies = {
157-
"nvim-lua/plenary.nvim",
158-
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
159-
"MunifTanjim/nui.nvim",
160-
},
161-
config = function ()
162-
require('neo-tree').setup {}
163-
end,
164-
}
165-
```
114+
> [!NOTE]
115+
> For more information about a particular plugin check its repository's documentation.
166116
167-
</details>
168117

169118
### Getting Started
170119

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

173122
### FAQ
174123

175-
* 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?
176125
* You should back it up and then delete all associated files.
177-
* 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`
178127
which can be deleted with `rm -rf ~/.local/share/nvim/`
179128
* Can I keep my existing configuration in parallel to kickstart?
180129
* Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME`
@@ -188,12 +137,12 @@ return {
188137
`~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
189138
distribution that you would like to try out.
190139
* What if I want to "uninstall" this configuration:
191-
* See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information
140+
* See [lazy.nvim uninstall](https://lazy.folke.io/usage#-uninstalling) information
192141
* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
193142
* The main purpose of kickstart is to serve as a teaching tool and a reference
194143
configuration that someone can easily use to `git clone` as a basis for their own.
195144
As you progress in learning Neovim and Lua, you might consider splitting `init.lua`
196-
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
197146
same functionality is available here:
198147
* [kickstart-modular.nvim](https://github.com/dam9000/kickstart-modular.nvim)
199148
* Discussions on this topic can be found here:
@@ -232,7 +181,7 @@ run in cmd as **admin**:
232181
winget install --accept-source-agreements chocolatey.chocolatey
233182
```
234183

235-
2. install all requirements using choco, exit previous cmd and
184+
2. install all requirements using choco, exit the previous cmd and
236185
open a new one so that choco path is set, and run in cmd as **admin**:
237186
```
238187
choco install -y neovim git ripgrep wget fd unzip gzip mingw make
@@ -245,7 +194,7 @@ wsl --install
245194
wsl
246195
sudo add-apt-repository ppa:neovim-ppa/unstable -y
247196
sudo apt update
248-
sudo apt install make gcc ripgrep unzip neovim
197+
sudo apt install make gcc ripgrep unzip git xclip neovim
249198
```
250199
</details>
251200

@@ -255,23 +204,37 @@ sudo apt install make gcc ripgrep unzip neovim
255204
```
256205
sudo add-apt-repository ppa:neovim-ppa/unstable -y
257206
sudo apt update
258-
sudo apt install make gcc ripgrep unzip neovim
207+
sudo apt install make gcc ripgrep unzip git xclip neovim
259208
```
260209
</details>
261210
<details><summary>Debian Install Steps</summary>
262211

263212
```
264213
sudo apt update
265-
sudo apt install make gcc ripgrep unzip git
266-
echo "deb https://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list
267-
sudo apt update
268-
sudo apt install -t unstable neovim
214+
sudo apt install make gcc ripgrep unzip git xclip curl
215+
216+
# Now we install nvim
217+
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x86_64.tar.gz
218+
sudo rm -rf /opt/nvim-linux-x86_64
219+
sudo mkdir -p /opt/nvim-linux-x86_64
220+
sudo chmod a+rX /opt/nvim-linux-x86_64
221+
sudo tar -C /opt -xzf nvim-linux-x86_64.tar.gz
222+
223+
# make it available in /usr/local/bin, distro installs to /usr/bin
224+
sudo ln -sf /opt/nvim-linux-x86_64/bin/nvim /usr/local/bin/
269225
```
270226
</details>
271227
<details><summary>Fedora Install Steps</summary>
272228

273229
```
274-
sudo dnf install -y gcc make git ripgrep fd-find neovim
230+
sudo dnf install -y gcc make git ripgrep fd-find unzip neovim
231+
```
232+
</details>
233+
234+
<details><summary>Arch Install Steps</summary>
235+
236+
```
237+
sudo pacman -S --noconfirm --needed gcc make git ripgrep fd unzip neovim
275238
```
276239
</details>
277240

0 commit comments

Comments
 (0)