From 9a6998ff2af04ee86cf87e710fd9daa279726bdc Mon Sep 17 00:00:00 2001 From: Olivier Roques Date: Fri, 3 Sep 2021 09:44:44 +0000 Subject: [PATCH] Change default hiding columns and allow nil user options --- README.md | 16 ++++++++-------- lua/hardline.lua | 10 ++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ca1f9a2..18d8157 100644 --- a/README.md +++ b/README.md @@ -38,24 +38,24 @@ with their default settings: ```lua require('hardline').setup { bufferline = false, -- enable bufferline + bufferline_settings = { + exclude_terminal = false, -- don't show terminal buffers in bufferline + show_index = false, -- show buffer indexes (not the actual buffer numbers) in bufferline + }, theme = 'default', -- change theme sections = { -- define sections {class = 'mode', item = require('hardline.parts.mode').get_item}, - {class = 'high', item = require('hardline.parts.git').get_item, hide = 80}, - '%<', + {class = 'high', item = require('hardline.parts.git').get_item, hide = 100}, {class = 'med', item = require('hardline.parts.filename').get_item}, - {class = 'med', item ='%='}, - {class = 'low', item = require('hardline.parts.wordcount').get_item, hide = 80}, + '%<', + {class = 'med', item = '%='}, + {class = 'low', item = require('hardline.parts.wordcount').get_item, hide = 100}, {class = 'error', item = require('hardline.parts.lsp').get_error}, {class = 'warning', item = require('hardline.parts.lsp').get_warning}, {class = 'warning', item = require('hardline.parts.whitespace').get_item}, {class = 'high', item = require('hardline.parts.filetype').get_item, hide = 80}, {class = 'mode', item = require('hardline.parts.line').get_item}, }, - bufferline_settings = { - exclude_terminal = false, -- don't show terminal buffers in bufferline - show_index = false, -- show buffer indexes (not the actual buffer numbers) in bufferline - }, } ``` diff --git a/lua/hardline.lua b/lua/hardline.lua index 95785be..a64cc76 100644 --- a/lua/hardline.lua +++ b/lua/hardline.lua @@ -35,11 +35,11 @@ M.options = { }, sections = { {class = 'mode', item = require('hardline.parts.mode').get_item}, - {class = 'high', item = require('hardline.parts.git').get_item, hide = 80}, - '%<', + {class = 'high', item = require('hardline.parts.git').get_item, hide = 100}, {class = 'med', item = require('hardline.parts.filename').get_item}, + '%<', {class = 'med', item = '%='}, - {class = 'low', item = require('hardline.parts.wordcount').get_item, hide = 80}, + {class = 'low', item = require('hardline.parts.wordcount').get_item, hide = 100}, {class = 'error', item = require('hardline.parts.lsp').get_error}, {class = 'warning', item = require('hardline.parts.lsp').get_warning}, {class = 'warning', item = require('hardline.parts.whitespace').get_item}, @@ -230,7 +230,9 @@ local function set_bufferline() end function M.setup(user_options) - M.options = vim.tbl_extend('force', M.options, user_options) + if user_options then + M.options = vim.tbl_extend('force', M.options, user_options) + end set_theme() set_hlgroups() set_statusline()