From cb902a5196e2ccd7b00d5f7cdc91186b001bade5 Mon Sep 17 00:00:00 2001 From: MasterGordon Date: Sun, 14 Apr 2024 18:35:54 +0200 Subject: [PATCH] added jsonfly + added php lsp --- lazy-lock.json | 1 + lua/keys.lua | 1 + lua/plugins.lua | 8 +++++++- lua/plugins/formatter.lua | 2 +- setup.sh | 3 ++- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index d1d237c..0b8bfc4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -15,6 +15,7 @@ "formatter.nvim": { "branch": "master", "commit": "ad246d34ce7a32f752071ed81b09b94e6b127fad" }, "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" }, "heirline.nvim": { "branch": "master", "commit": "03cff30d7e7d3ba6fdc00925f015822f79cef908" }, + "jsonfly.nvim": { "branch": "main", "commit": "5b18e0bc04484db9c1c9a9ddb212e098e42463fe" }, "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" }, "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" }, diff --git a/lua/keys.lua b/lua/keys.lua index 29f0a2c..022180e 100644 --- a/lua/keys.lua +++ b/lua/keys.lua @@ -10,6 +10,7 @@ vim.api.nvim_set_keymap("n", "fg", "lua require('telescope.builtin' vim.api.nvim_set_keymap("n", "fh", "lua require('telescope.builtin').help_tags()", {silent = true}) vim.api.nvim_set_keymap("n", "fb", "lua require('telescope.builtin').git_branches()", {silent = true}) vim.api.nvim_set_keymap("n", "ft", "TodoTelescope", {silent = true}) +vim.api.nvim_set_keymap("n", "fj", "Telescope jsonfly", {silent = true}) vim.api.nvim_set_keymap("n", "gr", "lua require('telescope.builtin').lsp_references()", {silent = true}) vim.api.nvim_set_keymap("n", "gd", "lua require('telescope.builtin').lsp_definitions()", {silent = true}) local opts = {noremap = true, silent = true} diff --git a/lua/plugins.lua b/lua/plugins.lua index 0a52874..a9de6e5 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -101,8 +101,14 @@ require("lazy").setup( } } require("telescope").load_extension("ui-select") + require("telescope").load_extension("jsonfly") end, - dependencies = {"nvim-lua/popup.nvim", "nvim-lua/plenary.nvim", "nvim-telescope/telescope-ui-select.nvim"} + dependencies = { + "nvim-lua/popup.nvim", + "nvim-lua/plenary.nvim", + "nvim-telescope/telescope-ui-select.nvim", + "Myzel394/jsonfly.nvim" + } }, { "norcalli/nvim-colorizer.lua", diff --git a/lua/plugins/formatter.lua b/lua/plugins/formatter.lua index 6d28624..cbe4370 100644 --- a/lua/plugins/formatter.lua +++ b/lua/plugins/formatter.lua @@ -82,7 +82,7 @@ local formatGrp = vim.api.nvim_create_augroup("Format", {clear = true}) vim.api.nvim_create_autocmd( "BufWritePre", { - pattern = "*.cs", + pattern = "*.cs,*.php", command = "lua vim.lsp.buf.format { async = false }", group = formatGrp } diff --git a/setup.sh b/setup.sh index e34f7b9..26b1c0d 100755 --- a/setup.sh +++ b/setup.sh @@ -14,7 +14,8 @@ bash-language-server@latest \ @prisma/language-server@latest \ cspell@latest \ @cspell/dict-de-de@latest \ -tsx@latest +tsx@latest \ +intelephense cspell link add @cspell/dict-de-de dotnet tool install --global csharp-ls