Skip to content

Commit 7d83a27

Browse files
committed
Merge 'upstream' conform, readme, neo-tree silent
fix: remove deprecated opt for conform.nvim Fix: updated the windows installation commands Enable silent option for default neo-tree plugin keybinding
2 parents 0692979 + c76c323 commit 7d83a27

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ git clone https://github.com/dam9000/kickstart-modular.nvim.git "${XDG_CONFIG_HO
8383
If you're using `cmd.exe`:
8484

8585
```
86-
git clone https://github.com/dam9000/kickstart.nvim.git %localappdata%\nvim\
86+
git clone https://github.com/dam9000/kickstart.nvim.git "%localappdata%\nvim"
8787
```
8888

8989
If you're using `powershell.exe`
9090

9191
```
92-
git clone https://github.com/dam9000/kickstart.nvim.git $env:LOCALAPPDATA\nvim\
92+
git clone https://github.com/dam9000/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
9393
```
9494

9595
</details>

lua/kickstart/plugins/conform.lua

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ return {
77
{
88
'<leader>f',
99
function()
10-
require('conform').format { async = true, lsp_fallback = true }
10+
require('conform').format { async = true, lsp_format = 'fallback' }
1111
end,
1212
mode = '',
1313
desc = '[F]ormat buffer',
@@ -20,9 +20,15 @@ return {
2020
-- have a well standardized coding style. You can add additional
2121
-- languages here or re-enable it for the disabled ones.
2222
local disable_filetypes = { c = true, cpp = true }
23+
local lsp_format_opt
24+
if disable_filetypes[vim.bo[bufnr].filetype] then
25+
lsp_format_opt = 'never'
26+
else
27+
lsp_format_opt = 'fallback'
28+
end
2329
return {
2430
timeout_ms = 500,
25-
lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
31+
lsp_format = lsp_format_opt,
2632
}
2733
end,
2834
formatters_by_ft = {

lua/kickstart/plugins/neo-tree.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ return {
1111
},
1212
cmd = 'Neotree',
1313
keys = {
14-
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal' },
14+
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
1515
},
1616
opts = {
1717
filesystem = {

0 commit comments

Comments
 (0)