From 7947e0a0d2678e351b1ed2b3209d65d8ef0ee319 Mon Sep 17 00:00:00 2001 From: Jika Date: Thu, 14 Nov 2024 10:23:54 +0100 Subject: [PATCH] Add json LSP / nvimtree open and close when appropiriate --- nvim/lazy-lock.json | 46 ++++++++++++++++---------------- nvim/lua/chadrc.lua | 6 ++--- nvim/lua/configs/default-lsp.lua | 1 + nvim/lua/configs/lspconfig.lua | 3 ++- nvim/lua/configs/nvim-tree.lua | 24 +++++++++++++++++ 5 files changed, 53 insertions(+), 27 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 4c8d41e..2933f48 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,43 +1,43 @@ { - "LuaSnip": { "branch": "master", "commit": "ac7cbc0e85710db7cba6510b1d8e6a1a551444f7" }, - "NvChad": { "branch": "v2.5", "commit": "09dd13e9c6df98fe5609829a7a0fbccea2f515ae" }, + "LuaSnip": { "branch": "master", "commit": "659c4479529a05cc9b05ef762639a09d366cc690" }, + "NvChad": { "branch": "v2.5", "commit": "bbc3d43db088c141b142a40cd5f717635833a54e" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, - "base46": { "branch": "v2.5", "commit": "fec9fa583025e69e0c4f902bd61990e8d13d1975" }, + "base46": { "branch": "v2.5", "commit": "16ee0e93dfc52e35ee7c9cf45e5ebf116958edb7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "5fbea7d7043bae2499d643c97b407f6da44abff4" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "023f795dbcf32d4351b6a9ed2e613d471b5bb812" }, "crates.nvim": { "branch": "main", "commit": "1c924d5a9ea3496c4e1a02d0d51388ba809f8468" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" }, - "image.nvim": { "branch": "master", "commit": "88e9693e188b8464b1c426aebb4389fd9db2fcbf" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, + "gitsigns.nvim": { "branch": "main", "commit": "9521fe8be39255b9abc6ec54e352bf04c410f5cf" }, + "image.nvim": { "branch": "master", "commit": "7f61c1940a8b072ca47a28928d2375dc1e11f464" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "menu": { "branch": "main", "commit": "ee85b2e394fde354bd24e35ff7a688d10c9212fa" }, - "minty": { "branch": "main", "commit": "157e91c04cce2f01643519338d6b854275a77547" }, - "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, + "menu": { "branch": "main", "commit": "657bfc91382c0928453d9a4d0a10ec92db5de2bb" }, + "minty": { "branch": "main", "commit": "1b604ed0d741294cfb56c0ce3aa6161e9ae7dd8b" }, + "noice.nvim": { "branch": "main", "commit": "ca2e3fea9fb080dcb79d9129d73dac631294fe79" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, + "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, "nvim-lsp-endhints": { "branch": "main", "commit": "391ef40521b631a8a2fb7aef78db6967ead6b39d" }, - "nvim-lspconfig": { "branch": "master", "commit": "edd9591199d1c78c0cb20514231f7f936f9412a2" }, + "nvim-lspconfig": { "branch": "master", "commit": "d2d153a179ed59aa7134d7ebdf4d7dcb156efa22" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-tree.lua": { "branch": "master", "commit": "2a268f631da85e83b7a95291be589bcddfc785d8" }, - "nvim-treesitter": { "branch": "master", "commit": "9210b9a4fa106247333495e19c843710f4d62102" }, - "nvim-ufo": { "branch": "main", "commit": "c96bb3bb853ff6253fe74f057df03e61fafd2403" }, + "nvim-tree.lua": { "branch": "master", "commit": "28eac2801b201f301449e976d7a9e8cfde053ba3" }, + "nvim-treesitter": { "branch": "master", "commit": "6389ceb1758b8f62a15194e3b790e33268304cb8" }, + "nvim-ufo": { "branch": "main", "commit": "c070ee849bfedb2ed778f60419a1eae8c8544be8" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" }, - "rustaceanvim": { "branch": "master", "commit": "6eb1c41463a0ad02a4fe799321cc7f651b87e576" }, - "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, - "ui": { "branch": "v3.0", "commit": "f2a1b1852e8715fbafcd667855fe8014e024ef03" }, - "volt": { "branch": "main", "commit": "229b4f1bc865c866227dd0e2ecda11ab6ec2c8cc" }, - "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } + "rainbow-delimiters.nvim": { "branch": "master", "commit": "f22496dfdd46da4d571f5254c72eff65ff5a1c27" }, + "rustaceanvim": { "branch": "master", "commit": "8ece53be36515cb9e76f3d03511643636469502d" }, + "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, + "ui": { "branch": "v3.0", "commit": "c59c5fc078cc22a28604e154552c41705359145b" }, + "volt": { "branch": "main", "commit": "1df6698f7e5d19db578063412d12322e53376f5e" }, + "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" } } diff --git a/nvim/lua/chadrc.lua b/nvim/lua/chadrc.lua index ba09e85..af4628a 100644 --- a/nvim/lua/chadrc.lua +++ b/nvim/lua/chadrc.lua @@ -109,7 +109,7 @@ M.nvdash = { { txt = " 󰈚 Recent Files", keys = "Spc f o", cmd = "Telescope oldfiles" }, { txt = " 󰈭 Find Word", keys = "Spc f w", cmd = "Telescope live_grep" }, { txt = "  Bookmarks", keys = "Spc m a", cmd = "Telescope marks" }, - { txt = "─", hl = "NvDashLazy", no_gap = true, rep = true }, + { txt = "─", hl = "NvDashFooter", no_gap = true, rep = true }, { txt = function() @@ -117,11 +117,11 @@ M.nvdash = { local ms = math.floor(stats.startuptime) .. " ms" return " Loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms end, - hl = "NvDashLazy", + hl = "NvDashFooter", no_gap = true, }, - { txt = "─", hl = "NvDashLazy", no_gap = true, rep = true }, + { txt = "─", hl = "NvDashFooter", no_gap = true, rep = true }, }, } diff --git a/nvim/lua/configs/default-lsp.lua b/nvim/lua/configs/default-lsp.lua index 18a6a80..4836e81 100644 --- a/nvim/lua/configs/default-lsp.lua +++ b/nvim/lua/configs/default-lsp.lua @@ -15,6 +15,7 @@ return { "jdtls", "clangd", + "json-lsp", "pyright", "ruff", diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua index 0bf91da..428ef55 100644 --- a/nvim/lua/configs/lspconfig.lua +++ b/nvim/lua/configs/lspconfig.lua @@ -16,7 +16,8 @@ local servers = { "pyright", "ruff", "dockerls", - "ansiblels" + "ansiblels", + "jsonls" } for _, lsp in ipairs(servers) do diff --git a/nvim/lua/configs/nvim-tree.lua b/nvim/lua/configs/nvim-tree.lua index bd233e1..9bd083e 100644 --- a/nvim/lua/configs/nvim-tree.lua +++ b/nvim/lua/configs/nvim-tree.lua @@ -1,3 +1,24 @@ +local function open_nvim_tree(data) + -- buffer is a directory + local directory = vim.fn.isdirectory(data.file) == 1 + + if not directory then + return + end + + -- change to the directory + vim.cmd.cd(data.file) + + -- open the tree + require("nvim-tree.api").tree.open() +end + +vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree }) + +vim.api.nvim_create_autocmd({ "QuitPre" }, { + callback = function() vim.cmd("NvimTreeClose") end, +}) + return { renderer = { icons = { @@ -6,4 +27,7 @@ return { }, }, }, + filters = { + git_ignored = false, + } }