Skip to content

Commit 6977dcc

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents cba0959 + 8e24ca3 commit 6977dcc

File tree

3 files changed

+108
-7
lines changed

3 files changed

+108
-7
lines changed

README.md

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ External Requirements:
3535
- etc.
3636

3737
> **NOTE**
38-
> See [Windows Installation](#Windows-Installation) to double check any additional Windows notes
38+
> See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes
39+
> and quick install snippets
3940
4041
Neovim's configurations are located under the following paths, depending on your OS:
4142

@@ -182,8 +183,15 @@ return {
182183
* [Restructure the configuration](https://github.com/nvim-lua/kickstart.nvim/issues/218)
183184
* [Reorganize init.lua into a multi-file setup](https://github.com/nvim-lua/kickstart.nvim/pull/473)
184185
185-
### Windows Installation
186+
### Install Recipes
186187
188+
Below you can find OS specific install instructions for Neovim and dependencies.
189+
190+
After installing all the dependencies continue with the [Install Kickstart](#Install-Kickstart) step.
191+
192+
#### Windows Installation
193+
194+
<details><summary>Windows with Microsoft C++ Build Tools and CMake</summary>
187195
Installation may require installing build tools and updating the run command for `telescope-fzf-native`
188196
189197
See `telescope-fzf-native` documentation for [more details](https://github.com/nvim-telescope/telescope-fzf-native.nvim#installation)
@@ -195,7 +203,8 @@ This requires:
195203
```lua
196204
{'nvim-telescope/telescope-fzf-native.nvim', build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
197205
```
198-
206+
</details>
207+
<details><summary>Windows with gcc/make using chocolatey</summary>
199208
Alternatively, one can install gcc and make which don't require changing the config,
200209
the easiest way is to use choco:
201210

@@ -211,5 +220,41 @@ open a new one so that choco path is set, and run in cmd as **admin**:
211220
```
212221
choco install -y neovim git ripgrep wget fd unzip gzip mingw make
213222
```
223+
</details>
224+
<details><summary>WSL (Windows Subsystem for Linux)</summary>
225+
226+
```
227+
wsl --install
228+
wsl
229+
sudo add-apt-repository ppa:neovim-ppa/unstable -y
230+
sudo apt update
231+
sudo apt install make gcc ripgrep unzip neovim
232+
```
233+
</details>
234+
235+
#### Linux Install
236+
<details><summary>Ubuntu Install Steps</summary>
237+
238+
```
239+
sudo add-apt-repository ppa:neovim-ppa/unstable -y
240+
sudo apt update
241+
sudo apt install make gcc ripgrep unzip neovim
242+
```
243+
</details>
244+
<details><summary>Debian Install Steps</summary>
245+
246+
```
247+
sudo apt update
248+
sudo apt install make gcc ripgrep unzip git
249+
echo "deb https://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list
250+
sudo apt update
251+
sudo apt install -t unstable neovim
252+
```
253+
</details>
254+
<details><summary>Fedora Install Steps</summary>
255+
256+
```
257+
sudo dnf install -y gcc make git ripgrep fd-find neovim
258+
```
259+
</details>
214260

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

init.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ require('lazy').setup({
554554

555555
lua_ls = {
556556
-- cmd = {...},
557-
-- filetypes { ...},
557+
-- filetypes = { ...},
558558
-- capabilities = {},
559559
settings = {
560560
Lua = {
@@ -829,8 +829,9 @@ require('lazy').setup({
829829
-- Here are some example plugins that I've included in the kickstart repository.
830830
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
831831
--
832-
require 'kickstart.plugins.debug',
833-
require 'kickstart.plugins.indent_line',
832+
-- require 'kickstart.plugins.debug',
833+
-- require 'kickstart.plugins.indent_line',
834+
-- require 'kickstart.plugins.lint',
834835

835836
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
836837
-- This is the easiest way to modularize your config.

lua/kickstart/plugins/lint.lua

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
return {
2+
3+
{ -- Linting
4+
'mfussenegger/nvim-lint',
5+
event = { 'BufReadPre', 'BufNewFile' },
6+
config = function()
7+
local lint = require 'lint'
8+
lint.linters_by_ft = {
9+
markdown = { 'markdownlint' },
10+
}
11+
12+
-- To allow other plugins to add linters to require('lint').linters_by_ft,
13+
-- instead set linters_by_ft like this:
14+
-- lint.linters_by_ft = lint.linters_by_ft or {}
15+
-- lint.linters_by_ft['markdown'] = { 'markdownlint' }
16+
--
17+
-- However, note that this will enable a set of default linters,
18+
-- which will cause errors unless these tools are available:
19+
-- {
20+
-- clojure = { "clj-kondo" },
21+
-- dockerfile = { "hadolint" },
22+
-- inko = { "inko" },
23+
-- janet = { "janet" },
24+
-- json = { "jsonlint" },
25+
-- markdown = { "vale" },
26+
-- rst = { "vale" },
27+
-- ruby = { "ruby" },
28+
-- terraform = { "tflint" },
29+
-- text = { "vale" }
30+
-- }
31+
--
32+
-- You can disable the default linters by setting their filetypes to nil:
33+
-- lint.linters_by_ft['clojure'] = nil
34+
-- lint.linters_by_ft['dockerfile'] = nil
35+
-- lint.linters_by_ft['inko'] = nil
36+
-- lint.linters_by_ft['janet'] = nil
37+
-- lint.linters_by_ft['json'] = nil
38+
-- lint.linters_by_ft['markdown'] = nil
39+
-- lint.linters_by_ft['rst'] = nil
40+
-- lint.linters_by_ft['ruby'] = nil
41+
-- lint.linters_by_ft['terraform'] = nil
42+
-- lint.linters_by_ft['text'] = nil
43+
44+
-- Create autocommand which carries out the actual linting
45+
-- on the specified events.
46+
local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
47+
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
48+
group = lint_augroup,
49+
callback = function()
50+
require('lint').try_lint()
51+
end,
52+
})
53+
end,
54+
},
55+
}

0 commit comments

Comments
 (0)