diff --git a/lua/plugins/barbecue.lua b/lua/plugins/barbecue.lua new file mode 100644 index 0000000..4e1c8df --- /dev/null +++ b/lua/plugins/barbecue.lua @@ -0,0 +1,19 @@ +return { + { + "utilyre/barbecue.nvim", + name = "barbecue", + version = "*", + dependencies = { + "SmiteshP/nvim-navic", + "nvim-tree/nvim-web-devicons", -- optional dependency + }, + opts = { + exclude_filetypes = { + "netrw", + "toggleterm", + "neo-tree", + "outline" + }, + }, + } +} diff --git a/lua/plugins/dashboard.lua b/lua/plugins/dashboard.lua index 6a7ea20..bc3dc68 100644 --- a/lua/plugins/dashboard.lua +++ b/lua/plugins/dashboard.lua @@ -24,6 +24,8 @@ return { -- this is taken care of by lualine -- enabling this messes up the actual laststatus setting after loading a file statusline = false, + tabline = true, + winbar = true }, config = { header = vim.split(logo, "\n"), diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 47e7c0e..9d57942 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -114,27 +114,6 @@ return { lualine_y = { 'progress' }, lualine_z = { 'location' }, }, - winbar = { - lualine_c = { - { - "navic", - color_correction = nil, - navic_opts = { - click = true, - depth_limit = 4, - depth_limit_indicator = "…", - separator = "  ", - icons = require("lazyvim.config").icons.kinds, - lazy_update_context = true, - } - } - } - }, - inactive_winbar = { - lualine_c = { - 'filename', - }, - }, }, dependencies = { 'nvim-tree/nvim-web-devicons', diff --git a/lua/plugins/nvim-scrollview.lua b/lua/plugins/nvim-scrollview.lua index 9622421..79ac62d 100644 --- a/lua/plugins/nvim-scrollview.lua +++ b/lua/plugins/nvim-scrollview.lua @@ -7,11 +7,9 @@ return { }, signs_on_startup = { 'conflicts', - 'diagnostics', 'search', 'cursor' }, } } } - diff --git a/lua/plugins/statuscol.lua b/lua/plugins/statuscol.lua new file mode 100644 index 0000000..3d1f82d --- /dev/null +++ b/lua/plugins/statuscol.lua @@ -0,0 +1,43 @@ +return { + { + "luukvbaal/statuscol.nvim", + config = function() + local builtin = require("statuscol.builtin") + require("statuscol").setup({ + ft_ignore = { + "neo-tree", + "toggleterm", + "dashboard", + "outline" + }, + segments = { + -- folds + { + text = { builtin.foldfunc }, + click = "v:lua.ScFa" + }, + -- diagnostic signs + { + sign = { + name = { "Diagnostic" }, + colwidth = 2, + maxwidth = 1, + condition = { true } + }, + click = "v:lua.ScSa" + }, + -- line numbers + { + text = { builtin.lnumfunc, " " }, + click = "v:lua.ScLa", + }, + -- git signs + { + sign = { namespace = { "gitsigns" } }, + click = "v:lua.ScSa" + } + } + }) + end, + } +} diff --git a/lua/plugins/ufo.lua b/lua/plugins/ufo.lua new file mode 100644 index 0000000..469c7ce --- /dev/null +++ b/lua/plugins/ufo.lua @@ -0,0 +1,25 @@ +return { + { + "kevinhwang91/nvim-ufo", + event = { + "InsertEnter" + }, + dependencies = { + "kevinhwang91/promise-async" + }, + opts = { + preview = { + mappings = { + scrollB = "", + scrollF = "", + scrollU = "", + scrollD = "", + }, + }, + -- register treesitter as source for scopes + provider_selector = function(_, _, _) + return { 'treesitter', 'indent' } + end + } + } +}