Skip to content

Commit a4db3b5

Browse files
authored
Merge pull request #1 from nvim-lua/master
Pull in latest changes from master
2 parents 2f8c4fd + 19afab1 commit a4db3b5

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ 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)
@@ -38,6 +35,11 @@ External Requirements:
3835
> See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes
3936
> and quick install snippets
4037
38+
### Install Kickstart
39+
40+
> **NOTE**
41+
> [Backup](#FAQ) your previous configuration (if any exists)
42+
4143
Neovim's configurations are located under the following paths, depending on your OS:
4244

4345
| OS | PATH |
@@ -46,16 +48,12 @@ Neovim's configurations are located under the following paths, depending on your
4648
| Windows (cmd)| `%userprofile%\AppData\Local\nvim\` |
4749
| Windows (powershell)| `$env:USERPROFILE\AppData\Local\nvim\` |
4850

49-
### Install Kickstart
50-
5151
#### Recommended Step
5252

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

57-
58-
5957
> **NOTE**
6058
> Your fork's url will be something like this:
6159
> `https://github.com/<your_github_username>/kickstart.nvim.git`

init.lua

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,17 @@ require('lazy').setup({
600600

601601
{ -- Autoformat
602602
'stevearc/conform.nvim',
603+
lazy = false,
604+
keys = {
605+
{
606+
'<leader>f',
607+
function()
608+
require('conform').format { async = true, lsp_fallback = true }
609+
end,
610+
mode = '',
611+
desc = '[F]ormat buffer',
612+
},
613+
},
603614
opts = {
604615
notify_on_error = false,
605616
format_on_save = function(bufnr)

0 commit comments

Comments
 (0)