Skip to content

Commit cca4273

Browse files
committed
Merge 'upstream/master' into master
* upstream/master: (46 commits) Automatically set detached state as needed. (nvim-lua#925) fix: debug.lua (nvim-lua#918) Add diff to treesitter's ensure_installed languages (nvim-lua#908) Move LspDetach handler near kickstart-lsp-highlight group (nvim-lua#900) README: add clipboard tool dependency (nvim-lua#886) Update README.md (nvim-lua#875) fix: highlight group clear on each attach (nvim-lua#874) Fix highlight errors when lsp crash or stop (nvim-lua#864) Fix deprecation notice of inlay hints (nvim-lua#873) Add a commented out example of the classic complete keymaps. Fixes nvim-lua#866 (nvim-lua#868) Minor improvements of debian install instructions. Fixes nvim-lua#859 (nvim-lua#869) Update README.md (nvim-lua#860) fix: restore Mason config timing for DAP startup (again) (nvim-lua#865) Add gitsigns recommended keymaps as an optional plugin (nvim-lua#858) Move plugin examples from README to optional plugin files (nvim-lua#831) Enable inlay hints for the supporting servers (nvim-lua#843) Fix: nvim-lua#847 - add prefer_git to treesitter config (nvim-lua#856) Comment about nerd font selection. Fixes nvim-lua#853 (nvim-lua#854) Arch, btw (nvim-lua#852) Update README (nvim-lua#832) Add a pull request template (nvim-lua#825) README: move backup and paths from external deps to install section (nvim-lua#819) Don't lazy load conform plugin (nvim-lua#818) Add a keymap space-f to format buffer using conform (nvim-lua#817) Add instructions to quit :lazy. Fixes nvim-lua#761 fix nvim-lua#799 (nvim-lua#800) README: wrap long lines (nvim-lua#784) Update README.md (nvim-lua#781) Add nvim-nio as dependency for nvim-dap-ui (nvim-lua#774) Some suggestions and capitalised a few words (nvim-lua#771) ... > **NOTE**
2 parents cde40af + 5aeddfd commit cca4273

File tree

8 files changed

+423
-168
lines changed

8 files changed

+423
-168
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: 95 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ 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 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
3230
- Language Setup:
@@ -35,7 +33,13 @@ External Requirements:
3533
- etc.
3634

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

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

48-
### Install Kickstart
52+
#### Recommended Step
4953

50-
Clone kickstart.nvim:
54+
[Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo
55+
so that you have your own copy that you can modify, then install by cloning the
56+
fork to your machine using one of the commands below, depending on your OS.
57+
58+
> **NOTE**
59+
> Your fork's url will be something like this:
60+
> `https://github.com/<your_github_username>/kickstart.nvim.git`
61+
62+
#### Clone kickstart.nvim
63+
> **NOTE**
64+
> If following the recommended step above (i.e., forking the repo), replace
65+
> `nvim-lua` with `<your_github_username>` in the commands below
5166
5267
<details><summary> Linux and Mac </summary>
5368

@@ -82,94 +97,34 @@ nvim
8297
```
8398

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

87102
Read through the `init.lua` file in your configuration folder for more
88-
information about extending and exploring Neovim.
103+
information about extending and exploring Neovim. That also includes
104+
examples of adding popularly requested plugins.
105+
89106

90107
### Getting Started
91108

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

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`
102-
103-
#### Examples of adding popularly requested plugins
104-
105-
NOTE: You'll need to uncomment the line in the init.lua that turns on loading custom plugins.
106-
107-
<details>
108-
<summary>Adding autopairs</summary>
109-
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).
111-
112-
In the file: `lua/custom/plugins/autopairs.lua`, add:
113-
114-
```lua
115-
-- File: lua/custom/plugins/autopairs.lua
116-
117-
return {
118-
"windwp/nvim-autopairs",
119-
-- Optional dependency
120-
dependencies = { 'hrsh7th/nvim-cmp' },
121-
config = function()
122-
require("nvim-autopairs").setup {}
123-
-- If you want to automatically add `(` after selecting a function or method
124-
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
125-
local cmp = require('cmp')
126-
cmp.event:on(
127-
'confirm_done',
128-
cmp_autopairs.on_confirm_done()
129-
)
130-
end,
131-
}
132-
```
133-
134-
</details>
135-
<details>
136-
<summary>Adding a file tree plugin</summary>
137-
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).
139-
140-
In the file: `lua/custom/plugins/filetree.lua`, add:
141-
142-
```lua
143-
-- Unless you are still migrating, remove the deprecated commands from v1.x
144-
vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
145-
146-
return {
147-
"nvim-neo-tree/neo-tree.nvim",
148-
version = "*",
149-
dependencies = {
150-
"nvim-lua/plenary.nvim",
151-
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
152-
"MunifTanjim/nui.nvim",
153-
},
154-
config = function ()
155-
require('neo-tree').setup {}
156-
end,
157-
}
158-
```
159-
160-
</details>
161-
162111
### FAQ
163112

164113
* What should I do if I already have a pre-existing neovim configuration?
165114
* You should back it up and then delete all associated files.
166-
* This includes your existing init.lua and the neovim files in `~/.local` which can be deleted with `rm -rf ~/.local/share/nvim/`
115+
* This includes your existing init.lua and the neovim files in `~/.local`
116+
which can be deleted with `rm -rf ~/.local/share/nvim/`
167117
* Can I keep my existing configuration in parallel to kickstart?
168-
* 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:
118+
* Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME`
119+
to maintain multiple configurations. For example, you can install the kickstart
120+
configuration in `~/.config/nvim-kickstart` and create an alias:
169121
```
170122
alias nvim-kickstart='NVIM_APPNAME="nvim-kickstart" nvim'
171123
```
172-
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.
124+
When you run Neovim using `nvim-kickstart` alias it will use the alternative
125+
config directory and the matching local directory
126+
`~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
127+
distribution that you would like to try out.
173128
* What if I want to "uninstall" this configuration:
174129
* See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information
175130
* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
@@ -183,8 +138,15 @@ return {
183138
* [Restructure the configuration](https://github.com/nvim-lua/kickstart.nvim/issues/218)
184139
* [Reorganize init.lua into a multi-file setup](https://github.com/nvim-lua/kickstart.nvim/pull/473)
185140
186-
### Windows Installation
141+
### Install Recipes
187142
143+
Below you can find OS specific install instructions for Neovim and dependencies.
144+
145+
After installing all the dependencies continue with the [Install Kickstart](#Install-Kickstart) step.
146+
147+
#### Windows Installation
148+
149+
<details><summary>Windows with Microsoft C++ Build Tools and CMake</summary>
188150
Installation may require installing build tools and updating the run command for `telescope-fzf-native`
189151
190152
See `telescope-fzf-native` documentation for [more details](https://github.com/nvim-telescope/telescope-fzf-native.nvim#installation)
@@ -196,7 +158,8 @@ This requires:
196158
```lua
197159
{'nvim-telescope/telescope-fzf-native.nvim', build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
198160
```
199-
161+
</details>
162+
<details><summary>Windows with gcc/make using chocolatey</summary>
200163
Alternatively, one can install gcc and make which don't require changing the config,
201164
the easiest way is to use choco:
202165

@@ -212,5 +175,55 @@ open a new one so that choco path is set, and run in cmd as **admin**:
212175
```
213176
choco install -y neovim git ripgrep wget fd unzip gzip mingw make
214177
```
178+
</details>
179+
<details><summary>WSL (Windows Subsystem for Linux)</summary>
180+
181+
```
182+
wsl --install
183+
wsl
184+
sudo add-apt-repository ppa:neovim-ppa/unstable -y
185+
sudo apt update
186+
sudo apt install make gcc ripgrep unzip git xclip neovim
187+
```
188+
</details>
189+
190+
#### Linux Install
191+
<details><summary>Ubuntu Install Steps</summary>
192+
193+
```
194+
sudo add-apt-repository ppa:neovim-ppa/unstable -y
195+
sudo apt update
196+
sudo apt install make gcc ripgrep unzip git xclip neovim
197+
```
198+
</details>
199+
<details><summary>Debian Install Steps</summary>
200+
201+
```
202+
sudo apt update
203+
sudo apt install make gcc ripgrep unzip git xclip curl
204+
205+
# 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
211+
212+
# make it available in /usr/local/bin, distro installs to /usr/bin
213+
sudo ln -sf /opt/nvim-linux64/bin/nvim /usr/local/bin/
214+
```
215+
</details>
216+
<details><summary>Fedora Install Steps</summary>
217+
218+
```
219+
sudo dnf install -y gcc make git ripgrep fd-find unzip neovim
220+
```
221+
</details>
222+
223+
<details><summary>Arch Install Steps</summary>
224+
225+
```
226+
sudo pacman -S --noconfirm --needed gcc make git ripgrep fd unzip neovim
227+
```
228+
</details>
215229

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

0 commit comments

Comments
 (0)