aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/lua/vimrc/plugins.lua22
-rw-r--r--INSTALL.md3
2 files changed, 24 insertions, 1 deletions
diff --git a/.config/nvim/lua/vimrc/plugins.lua b/.config/nvim/lua/vimrc/plugins.lua
index c85911c..ba5e94c 100644
--- a/.config/nvim/lua/vimrc/plugins.lua
+++ b/.config/nvim/lua/vimrc/plugins.lua
@@ -653,7 +653,20 @@ return {
lspconfig.phpactor.setup({})
end
if vim.fn.executable('efm-langserver') == 1 then
- lspconfig.efm.setup({})
+ lspconfig.efm.setup({
+ init_options = { documentFormatting = true },
+ settings = {
+ rootMarkers = {".git/"},
+ languages = {
+ json = {
+ {
+ formatCommand = "reparojson -q",
+ formatStdin = true,
+ },
+ },
+ },
+ }
+ })
end
vim.api.nvim_create_autocmd('LspAttach', {
@@ -665,6 +678,13 @@ return {
vim.keymap.set('n', '<space>f', function()
vim.lsp.buf.format({ async = true })
end, opts)
+
+ vim.api.nvim_create_autocmd('BufWritePre', {
+ buffer = e.buf,
+ callback = function()
+ vim.lsp.buf.format({ async = false })
+ end
+ })
end,
})
end,
diff --git a/INSTALL.md b/INSTALL.md
index 64f31b2..b712035 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -11,6 +11,9 @@ $ ./bootstrap hotaru
$ sudo adduser $(whoami) docker
$ cargo install alacritty
+
+$ cd ~/src/reparojson
+$ cargo install --path .
```
## PC 168