Skip to content

Commit

Permalink
Merge upstream/master
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
gcaufield committed Dec 3, 2024
2 parents 0b62548 + 8d1ef97 commit 69cd861
Show file tree
Hide file tree
Showing 6 changed files with 216 additions and 96 deletions.
18 changes: 11 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ External Requirements:
- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
- if you have it set `vim.g.have_nerd_font` in `init.lua` to true
- Language Setup:
- If want to write Typescript, you need `npm`
- If want to write Golang, you will need `go`
- If you want to write Typescript, you need `npm`
- If you want to write Golang, you will need `go`
- etc.

> **NOTE**
Expand All @@ -46,8 +46,8 @@ Neovim's configurations are located under the following paths, depending on your
| OS | PATH |
| :- | :--- |
| Linux, MacOS | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` |
| Windows (cmd)| `%userprofile%\AppData\Local\nvim\` |
| Windows (powershell)| `$env:USERPROFILE\AppData\Local\nvim\` |
| Windows (cmd)| `%localappdata%\nvim\` |
| Windows (powershell)| `$env:LOCALAPPDATA\nvim\` |

#### Recommended Step

Expand All @@ -59,6 +59,10 @@ fork to your machine using one of the commands below, depending on your OS.
> Your fork's url will be something like this:
> `https://github.com/<your_github_username>/kickstart.nvim.git`
You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file
too - it's ignored in the kickstart repo to make maintenance easier, but it's
[recommmended to track it in version control](https://lazy.folke.io/usage/lockfile).

#### Clone kickstart.nvim
> **NOTE**
> If following the recommended step above (i.e., forking the repo), replace
Expand All @@ -77,13 +81,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO
If you're using `cmd.exe`:

```
git clone https://github.com/nvim-lua/kickstart.nvim.git %userprofile%\AppData\Local\nvim\
git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
```

If you're using `powershell.exe`

```
git clone https://github.com/nvim-lua/kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
```

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

0 comments on commit 69cd861

Please sign in to comment.