Skip to content

Commit 049ad2b

Browse files
Merge branch 'master' into main
2 parents d8c775b + de44f49 commit 049ad2b

File tree

9 files changed

+411
-163
lines changed

9 files changed

+411
-163
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: 41 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -22,45 +22,48 @@ If you are experiencing issues, please make sure you have the latest versions.
2222

2323
### Install External Dependencies
2424

25-
> **NOTE**
26-
> [Backup](#FAQ) your previous configuration (if any exists)
27-
2825
External Requirements:
2926
- Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`)
3027
- [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
28+
- Clipboard tool (xclip/xsel/win32yank or other depending on platform)
3129
- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
3230
- if you have it set `vim.g.have_nerd_font` in `init.lua` to true
3331
- Language Setup:
34-
- If want to write Typescript, you need `npm`
35-
- 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`
3634
- etc.
3735

3836
> **NOTE**
3937
> See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes
4038
> and quick install snippets
4139
40+
### Install Kickstart
41+
42+
> **NOTE**
43+
> [Backup](#FAQ) your previous configuration (if any exists)
44+
4245
Neovim's configurations are located under the following paths, depending on your OS:
4346

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

5253
#### Recommended Step
5354

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

58-
59-
6059
> **NOTE**
6160
> Your fork's url will be something like this:
6261
> `https://github.com/<your_github_username>/kickstart.nvim.git`
6362
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+
[recommmended to track it in version control](https://lazy.folke.io/usage/lockfile).
66+
6467
#### Clone kickstart.nvim
6568
> **NOTE**
6669
> If following the recommended step above (i.e., forking the repo), replace
@@ -79,13 +82,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO
7982
If you're using `cmd.exe`:
8083

8184
```
82-
git clone https://github.com/nvim-lua/kickstart.nvim.git %userprofile%\AppData\Local\nvim\
85+
git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
8386
```
8487

8588
If you're using `powershell.exe`
8689

8790
```
88-
git clone https://github.com/nvim-lua/kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
91+
git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
8992
```
9093

9194
</details>
@@ -99,73 +102,12 @@ nvim
99102
```
100103

101104
That's it! Lazy will install all the plugins you have. Use `:Lazy` to view
102-
current plugin status.
105+
current plugin status. Hit `q` to close the window.
103106

104107
Read through the `init.lua` file in your configuration folder for more
105-
information about extending and exploring Neovim.
106-
107-
108-
#### Examples of adding popularly requested plugins
109-
110-
NOTE: You'll need to uncomment the line in the init.lua that turns on loading custom plugins.
111-
112-
<details>
113-
<summary>Adding autopairs</summary>
114-
115-
This will automatically install [windwp/nvim-autopairs](https://github.com/windwp/nvim-autopairs)
116-
and enable it on startup. For more information, see documentation for
117-
[lazy.nvim](https://github.com/folke/lazy.nvim).
118-
119-
In the file: `lua/custom/plugins/autopairs.lua`, add:
108+
information about extending and exploring Neovim. That also includes
109+
examples of adding popularly requested plugins.
120110

121-
```lua
122-
-- File: lua/custom/plugins/autopairs.lua
123-
124-
return {
125-
"windwp/nvim-autopairs",
126-
-- Optional dependency
127-
dependencies = { 'hrsh7th/nvim-cmp' },
128-
config = function()
129-
require("nvim-autopairs").setup {}
130-
-- If you want to automatically add `(` after selecting a function or method
131-
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
132-
local cmp = require('cmp')
133-
cmp.event:on(
134-
'confirm_done',
135-
cmp_autopairs.on_confirm_done()
136-
)
137-
end,
138-
}
139-
```
140-
141-
</details>
142-
<details>
143-
<summary>Adding a file tree plugin</summary>
144-
145-
This will install the tree plugin and add the command `:Neotree` for you.
146-
For more information, see the documentation at
147-
[neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim).
148-
149-
In the file: `lua/custom/plugins/filetree.lua`, add:
150-
151-
```lua
152-
-- File: lua/custom/plugins/filetree.lua
153-
154-
return {
155-
"nvim-neo-tree/neo-tree.nvim",
156-
version = "*",
157-
dependencies = {
158-
"nvim-lua/plenary.nvim",
159-
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
160-
"MunifTanjim/nui.nvim",
161-
},
162-
config = function ()
163-
require('neo-tree').setup {}
164-
end,
165-
}
166-
```
167-
168-
</details>
169111

170112
### Getting Started
171113

@@ -189,7 +131,7 @@ return {
189131
`~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
190132
distribution that you would like to try out.
191133
* What if I want to "uninstall" this configuration:
192-
* See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information
134+
* See [lazy.nvim uninstall](https://lazy.folke.io/usage#-uninstalling) information
193135
* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
194136
* The main purpose of kickstart is to serve as a teaching tool and a reference
195137
configuration that someone can easily use to `git clone` as a basis for their own.
@@ -246,7 +188,7 @@ wsl --install
246188
wsl
247189
sudo add-apt-repository ppa:neovim-ppa/unstable -y
248190
sudo apt update
249-
sudo apt install make gcc ripgrep unzip neovim
191+
sudo apt install make gcc ripgrep unzip git xclip neovim
250192
```
251193
</details>
252194

@@ -256,23 +198,37 @@ sudo apt install make gcc ripgrep unzip neovim
256198
```
257199
sudo add-apt-repository ppa:neovim-ppa/unstable -y
258200
sudo apt update
259-
sudo apt install make gcc ripgrep unzip neovim
201+
sudo apt install make gcc ripgrep unzip git xclip neovim
260202
```
261203
</details>
262204
<details><summary>Debian Install Steps</summary>
263205

264206
```
265207
sudo apt update
266-
sudo apt install make gcc ripgrep unzip git
267-
echo "deb https://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list
268-
sudo apt update
269-
sudo apt install -t unstable neovim
208+
sudo apt install make gcc ripgrep unzip git xclip curl
209+
210+
# Now we install nvim
211+
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz
212+
sudo rm -rf /opt/nvim-linux64
213+
sudo mkdir -p /opt/nvim-linux64
214+
sudo chmod a+rX /opt/nvim-linux64
215+
sudo tar -C /opt -xzf nvim-linux64.tar.gz
216+
217+
# make it available in /usr/local/bin, distro installs to /usr/bin
218+
sudo ln -sf /opt/nvim-linux64/bin/nvim /usr/local/bin/
270219
```
271220
</details>
272221
<details><summary>Fedora Install Steps</summary>
273222

274223
```
275-
sudo dnf install -y gcc make git ripgrep fd-find neovim
224+
sudo dnf install -y gcc make git ripgrep fd-find unzip neovim
225+
```
226+
</details>
227+
228+
<details><summary>Arch Install Steps</summary>
229+
230+
```
231+
sudo pacman -S --noconfirm --needed gcc make git ripgrep fd unzip neovim
276232
```
277233
</details>
278234

0 commit comments

Comments
 (0)