diff --git a/lua/plugins/aerial-nvim.lua b/lua/plugins/aerial-nvim.lua index 5041864b..6007eb8f 100644 --- a/lua/plugins/aerial-nvim.lua +++ b/lua/plugins/aerial-nvim.lua @@ -11,7 +11,7 @@ return { "stevearc/aerial.nvim", -- {{{ cmd = "AerialToggle", opts = { - backends = { "lsp", "markdown" }, + backends = { "lsp", "markdown", "man" }, layout = { default_direction = "prefer_right", placement = "edge", @@ -19,6 +19,12 @@ return { attach_mode = "window", -- 'window' | 'global' nerd_font = "auto", show_guides = true, + guides = { + mid_item = "├╴", + last_item = "└╴", + nested_top = "│ ", + whitespace = " ", + }, keymaps = { [""] = false, ["o"] = "actions.jump", diff --git a/lua/plugins/lsp/init.lua b/lua/plugins/lsp/init.lua index b4977974..f0564f4b 100644 --- a/lua/plugins/lsp/init.lua +++ b/lua/plugins/lsp/init.lua @@ -50,7 +50,14 @@ return { config = function() local have_mason, mlsp = pcall(require, "mason-lspconfig") if have_mason then - mlsp.setup({ ensure_installed = { "clangd", "gopls", "lua_ls", "rust_analyzer" } }) + mlsp.setup({ + ensure_installed = { + "clangd", + "gopls", + "lua_ls", + "rust_analyzer", + }, + }) end -- It's important that you set up the plugins in the following order: -- 1. mason.nvim @@ -75,15 +82,6 @@ return { b.formatting.cmake_format, b.formatting.asmfmt, b.formatting.buildifier, - b.formatting.fixjson, - b.formatting.latexindent.with({ - args = { - "-g", - "/dev/null", - "-y", - [[defaultIndent: " "]], - }, - }), b.formatting.prettier.with({ filetypes = { "css", @@ -99,20 +97,11 @@ return { "handlebars", }, }), - b.formatting.eslint_d.with({ - filetypes = { - "javascript", - "javascriptreact", - "typescript", - "typescriptreact", - "vue", - }, - }), b.formatting.shfmt, - b.diagnostics.shellcheck, + b.code_actions.gomodifytags, + b.code_actions.impl, b.diagnostics.buildifier, b.diagnostics.actionlint, - b.diagnostics.eslint_d, }, }) end, diff --git a/lua/plugins/snips/init.lua b/lua/plugins/snips/init.lua index 18188234..c1713e60 100644 --- a/lua/plugins/snips/init.lua +++ b/lua/plugins/snips/init.lua @@ -13,7 +13,14 @@ return { build = (not jit.os:find("Windows")) and "echo 'NOTE: jsregexp is optional, so not a big deal if it fails to build'; make install_jsregexp" or nil, - dependencies = { "rafamadriz/friendly-snippets" }, + dependencies = { + { + "rafamadriz/friendly-snippets", + config = function() + require("luasnip.loaders.from_vscode").lazy_load() + end, + }, + }, opts = { history = true, delete_check_events = "TextChanged",