Skip to content

Commit 69cd861

Browse files
committed
Merge upstream/master
* upstream/master: (39 commits) fix: which-key comment typo (nvim-lua#1227) Fix nvim-dap not lazy loading (nvim-lua#1216) feat: Change to prepare for upcoming deprecation of configuring diagnostic-signs using sign_define() (nvim-lua#1232) Remove two because there are more than two. (nvim-lua#1213) Set breakpoint icons and their highlight colors (nvim-lua#1194) Change diagnostic symbols if vim.g.have_nerd_font is true (nvim-lua#1195) samarth-nagar fix: lazy help tag on line 931 (nvim-lua#1167) Disable linting autocmd for readonly buffers (nvim-lua#1202) fix: update lazy uninstall information link (nvim-lua#1148) feat: update references of tsserver to ts_ls (nvim-lua#1131) Fix the which-key spec issue caused by recent cleanup (nvim-lua#1113) cleanup: refactor which-key configuration for cleaner setup (nvim-lua#1102) fix: remove deprecated opt for conform.nvim (nvim-lua#1070) Fix: updated the windows installation commands (nvim-lua#1101) Enable silent option for default neo-tree plugin keybinding (nvim-lua#1108) Include visual mode in LSP code action keymap (nvim-lua#1060) (nvim-lua#1064) refactor: update treesitter and which-key config (nvim-lua#1068) Check for loop or uv for lazypath (nvim-lua#1095) Add note in README about lazy-lock.json (nvim-lua#1090) Update README.md (nvim-lua#1091) Add explicit dependency of nvim-lspconfig on cmp-nvim-lsp (nvim-lua#1042) Remove treesitter prefer_git option (nvim-lua#1061) performance: defer clipboard because xsel and pbcopy can be slow (nvim-lua#1049) refactor: remove lazydev and luvit-meta as lsp dependencies (nvim-lua#1047) Modify conform comments to prevent deprecation warning when used (nvim-lua#1057) Remove redundant hlsearch option (nvim-lua#1058) Update comment about the toggle inlay hints keymap (nvim-lua#1041) lint: fix lsp warning in `vim.lsp.inlay_hint.is_enabled` (nvim-lua#947) Update lazydev config to fix "Undefined field `fs_stat`" LSP error (nvim-lua#1040) Neovim 0.10 updates (nvim-lua#936) ...
2 parents 0b62548 + 8d1ef97 commit 69cd861

File tree

6 files changed

+216
-96
lines changed

6 files changed

+216
-96
lines changed

README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ External Requirements:
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**
@@ -46,8 +46,8 @@ Neovim's configurations are located under the following paths, depending on your
4646
| OS | PATH |
4747
| :- | :--- |
4848
| Linux, MacOS | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` |
49-
| Windows (cmd)| `%userprofile%\AppData\Local\nvim\` |
50-
| Windows (powershell)| `$env:USERPROFILE\AppData\Local\nvim\` |
49+
| Windows (cmd)| `%localappdata%\nvim\` |
50+
| Windows (powershell)| `$env:LOCALAPPDATA\nvim\` |
5151

5252
#### Recommended Step
5353

@@ -59,6 +59,10 @@ fork to your machine using one of the commands below, depending on your OS.
5959
> 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+
[recommmended 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 %userprofile%\AppData\Local\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:USERPROFILE\AppData\Local\nvim\
90+
git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
8791
```
8892

8993
</details>
@@ -126,7 +130,7 @@ examples of adding popularly requested plugins.
126130
`~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
127131
distribution that you would like to try out.
128132
* What if I want to "uninstall" this configuration:
129-
* See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information
133+
* See [lazy.nvim uninstall](https://lazy.folke.io/usage#-uninstalling) information
130134
* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
131135
* The main purpose of kickstart is to serve as a teaching tool and a reference
132136
configuration that someone can easily use to `git clone` as a basis for their own.

0 commit comments

Comments
 (0)