diff --git a/lua/lazyvim/plugins/extras/editor/aerial.lua b/lua/lazyvim/plugins/extras/editor/aerial.lua index afa2a602..ad527aae 100644 --- a/lua/lazyvim/plugins/extras/editor/aerial.lua +++ b/lua/lazyvim/plugins/extras/editor/aerial.lua @@ -104,27 +104,29 @@ return { "nvim-lualine/lualine.nvim", optional = true, opts = function(_, opts) - table.insert(opts.sections.lualine_c, { - "aerial", - sep = " ", -- separator between symbols - sep_icon = "", -- separator between icon and symbol + if not vim.g.trouble_lualine then + table.insert(opts.sections.lualine_c, { + "aerial", + sep = " ", -- separator between symbols + sep_icon = "", -- separator between icon and symbol - -- The number of symbols to render top-down. In order to render only 'N' last - -- symbols, negative numbers may be supplied. For instance, 'depth = -1' can - -- be used in order to render only current symbol. - depth = 5, + -- The number of symbols to render top-down. In order to render only 'N' last + -- symbols, negative numbers may be supplied. For instance, 'depth = -1' can + -- be used in order to render only current symbol. + depth = 5, - -- When 'dense' mode is on, icons are not rendered near their symbols. Only - -- a single icon that represents the kind of current symbol is rendered at - -- the beginning of status line. - dense = false, + -- When 'dense' mode is on, icons are not rendered near their symbols. Only + -- a single icon that represents the kind of current symbol is rendered at + -- the beginning of status line. + dense = false, - -- The separator to be used to separate symbols in dense mode. - dense_sep = ".", + -- The separator to be used to separate symbols in dense mode. + dense_sep = ".", - -- Color the symbol icons. - colored = true, - }) + -- Color the symbol icons. + colored = true, + }) + end end, }, } diff --git a/lua/lazyvim/plugins/extras/editor/navic.lua b/lua/lazyvim/plugins/extras/editor/navic.lua index ad31d575..e89bc11f 100644 --- a/lua/lazyvim/plugins/extras/editor/navic.lua +++ b/lua/lazyvim/plugins/extras/editor/navic.lua @@ -29,14 +29,16 @@ return { "nvim-lualine/lualine.nvim", optional = true, opts = function(_, opts) - table.insert(opts.sections.lualine_c, { - function() - return require("nvim-navic").get_location() - end, - cond = function() - return package.loaded["nvim-navic"] and require("nvim-navic").is_available() - end, - }) + if not vim.g.trouble_lualine then + table.insert(opts.sections.lualine_c, { + function() + return require("nvim-navic").get_location() + end, + cond = function() + return package.loaded["nvim-navic"] and require("nvim-navic").is_available() + end, + }) + end end, }, }