From 85fe093efb8353552171575809c02a5e9124fa68 Mon Sep 17 00:00:00 2001 From: chaeing Date: Fri, 20 Aug 2021 02:16:29 -0700 Subject: [Feature] switch galaxyline to lualine (#1329) --- lua/core/lualine/styles.lua | 170 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 lua/core/lualine/styles.lua (limited to 'lua/core/lualine/styles.lua') diff --git a/lua/core/lualine/styles.lua b/lua/core/lualine/styles.lua new file mode 100644 index 00000000..e35f66fe --- /dev/null +++ b/lua/core/lualine/styles.lua @@ -0,0 +1,170 @@ +local M = {} +local components = require "core.lualine.components" + +local styles = { + lvim = nil, + default = nil, + none = nil, +} + +styles.none = { + style = "none", + options = { + icons_enabled = true, + component_separators = "", + section_separators = "", + disabled_filetypes = {}, + }, + sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = {}, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = {}, +} + +styles.default = { + style = "default", + options = { + icons_enabled = true, + component_separators = { "", "" }, + section_separators = { "", "" }, + disabled_filetypes = {}, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch" }, + lualine_c = { "filename" }, + lualine_x = { "encoding", "fileformat", "filetype" }, + lualine_y = { "progress" }, + lualine_z = { "location" }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = {}, +} + +styles.lvim = { + style = "lvim", + options = { + icons_enabled = true, + component_separators = "", + section_separators = "", + disabled_filetypes = { "dashboard", "" }, + }, + sections = { + lualine_a = { + components.vi_mode, + }, + lualine_b = { + components.branch, + }, + lualine_c = { + components.diff, + components.python_env, + }, + lualine_x = { + components.diagnostics, + components.treesitter, + components.lsp, + -- components.location, + -- components.progress, + -- components.spaces, + -- components.encoding, + components.filetype, + }, + lualine_y = { + -- components.filetype, + }, + lualine_z = { + components.scrollbar, + }, + }, + inactive_sections = { + lualine_a = { + "filename", + }, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = { "nvim-tree" }, +} + +function M.get_style(style) + local style_keys = vim.tbl_keys(styles) + if not vim.tbl_contains(style_keys, style) then + local Log = require "core.log" + local logger = Log:get_default() + logger.error( + "Invalid lualine style", + string.format('"%s"', style), + "options are: ", + string.format('"%s"', table.concat(style_keys, '", "')) + ) + logger.info '"lvim" style is applied.' + style = "lvim" + end + + return vim.deepcopy(styles[style]) +end + +function M.update() + local config = lvim.builtin.lualine + local style = M.get_style(config.style) + + lvim.builtin.lualine = { + active = true, + style = style.style, + options = { + icons_enabled = config.options.icons_enabled or style.options.icons_enabled, + component_separators = config.options.component_separators or style.options.component_separators, + section_separators = config.options.section_separators or style.options.section_separators, + theme = config.options.theme or lvim.colorscheme or "auto", + disabled_filetypes = config.options.disabled_filetypes or style.options.disabled_filetypes, + }, + sections = { + lualine_a = config.sections.lualine_a or style.sections.lualine_a, + lualine_b = config.sections.lualine_b or style.sections.lualine_b, + lualine_c = config.sections.lualine_c or style.sections.lualine_c, + lualine_x = config.sections.lualine_x or style.sections.lualine_x, + lualine_y = config.sections.lualine_y or style.sections.lualine_y, + lualine_z = config.sections.lualine_z or style.sections.lualine_z, + }, + inactive_sections = { + lualine_a = config.inactive_sections.lualine_a or style.inactive_sections.lualine_a, + lualine_b = config.inactive_sections.lualine_b or style.inactive_sections.lualine_b, + lualine_c = config.inactive_sections.lualine_c or style.inactive_sections.lualine_c, + lualine_x = config.inactive_sections.lualine_x or style.inactive_sections.lualine_x, + lualine_y = config.inactive_sections.lualine_y or style.inactive_sections.lualine_y, + lualine_z = config.inactive_sections.lualine_z or style.inactive_sections.lualine_z, + }, + tabline = config.tabline or style.tabline, + extensions = config.extensions or style.extensions, + on_config_done = config.on_config_done, + } +end + +return M -- cgit v1.2.3 From 378c1c3eb5f32da7057371fedda405250ccb67c8 Mon Sep 17 00:00:00 2001 From: chaeing Date: Mon, 23 Aug 2021 23:49:18 -0700 Subject: [Feature] enhance lualine config (#1372) --- lua/core/lualine/styles.lua | 50 ++++++++------------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) (limited to 'lua/core/lualine/styles.lua') diff --git a/lua/core/lualine/styles.lua b/lua/core/lualine/styles.lua index e35f66fe..876d7fa3 100644 --- a/lua/core/lualine/styles.lua +++ b/lua/core/lualine/styles.lua @@ -69,14 +69,15 @@ styles.lvim = { icons_enabled = true, component_separators = "", section_separators = "", - disabled_filetypes = { "dashboard", "" }, + disabled_filetypes = { "dashboard" }, }, sections = { lualine_a = { - components.vi_mode, + components.mode, }, lualine_b = { components.branch, + components.filename, }, lualine_c = { components.diff, @@ -86,15 +87,9 @@ styles.lvim = { components.diagnostics, components.treesitter, components.lsp, - -- components.location, - -- components.progress, - -- components.spaces, - -- components.encoding, components.filetype, }, - lualine_y = { - -- components.filetype, - }, + lualine_y = {}, lualine_z = { components.scrollbar, }, @@ -132,39 +127,12 @@ function M.get_style(style) end function M.update() - local config = lvim.builtin.lualine - local style = M.get_style(config.style) + local style = M.get_style(lvim.builtin.lualine.style) + if lvim.builtin.lualine.options.theme == nil then + lvim.builtin.lualine.options.theme = lvim.colorscheme + end - lvim.builtin.lualine = { - active = true, - style = style.style, - options = { - icons_enabled = config.options.icons_enabled or style.options.icons_enabled, - component_separators = config.options.component_separators or style.options.component_separators, - section_separators = config.options.section_separators or style.options.section_separators, - theme = config.options.theme or lvim.colorscheme or "auto", - disabled_filetypes = config.options.disabled_filetypes or style.options.disabled_filetypes, - }, - sections = { - lualine_a = config.sections.lualine_a or style.sections.lualine_a, - lualine_b = config.sections.lualine_b or style.sections.lualine_b, - lualine_c = config.sections.lualine_c or style.sections.lualine_c, - lualine_x = config.sections.lualine_x or style.sections.lualine_x, - lualine_y = config.sections.lualine_y or style.sections.lualine_y, - lualine_z = config.sections.lualine_z or style.sections.lualine_z, - }, - inactive_sections = { - lualine_a = config.inactive_sections.lualine_a or style.inactive_sections.lualine_a, - lualine_b = config.inactive_sections.lualine_b or style.inactive_sections.lualine_b, - lualine_c = config.inactive_sections.lualine_c or style.inactive_sections.lualine_c, - lualine_x = config.inactive_sections.lualine_x or style.inactive_sections.lualine_x, - lualine_y = config.inactive_sections.lualine_y or style.inactive_sections.lualine_y, - lualine_z = config.inactive_sections.lualine_z or style.inactive_sections.lualine_z, - }, - tabline = config.tabline or style.tabline, - extensions = config.extensions or style.extensions, - on_config_done = config.on_config_done, - } + lvim.builtin.lualine = vim.tbl_deep_extend("keep", lvim.builtin.lualine, style) end return M -- cgit v1.2.3 From 5b94e3cee2c4405e98c9c0e8769670723a1f4bae Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Thu, 26 Aug 2021 12:49:29 +0200 Subject: fix logging when plenary is not available (#1390) --- lua/core/lualine/styles.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lua/core/lualine/styles.lua') diff --git a/lua/core/lualine/styles.lua b/lua/core/lualine/styles.lua index 876d7fa3..53b0691e 100644 --- a/lua/core/lualine/styles.lua +++ b/lua/core/lualine/styles.lua @@ -112,14 +112,13 @@ function M.get_style(style) local style_keys = vim.tbl_keys(styles) if not vim.tbl_contains(style_keys, style) then local Log = require "core.log" - local logger = Log:get_default() - logger.error( + Log:error( "Invalid lualine style", string.format('"%s"', style), "options are: ", string.format('"%s"', table.concat(style_keys, '", "')) ) - logger.info '"lvim" style is applied.' + Log:info '"lvim" style is applied.' style = "lvim" end -- cgit v1.2.3 From 27679f988fe187f9831ba7895c9c3a7ce2dd14f4 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Thu, 26 Aug 2021 20:32:16 +0200 Subject: [Refactor]: only allow a single logger (#1405) --- lua/core/lualine/styles.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/core/lualine/styles.lua') diff --git a/lua/core/lualine/styles.lua b/lua/core/lualine/styles.lua index 53b0691e..84e8123d 100644 --- a/lua/core/lualine/styles.lua +++ b/lua/core/lualine/styles.lua @@ -118,7 +118,7 @@ function M.get_style(style) "options are: ", string.format('"%s"', table.concat(style_keys, '", "')) ) - Log:info '"lvim" style is applied.' + Log:debug '"lvim" style is applied.' style = "lvim" end -- cgit v1.2.3 From a0fd11ea0875e663b396dcdbce446072bcc1005e Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Thu, 26 Aug 2021 22:54:15 -0400 Subject: use styles.lua rather instead of editing options directly --- lua/core/lualine/styles.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/core/lualine/styles.lua') diff --git a/lua/core/lualine/styles.lua b/lua/core/lualine/styles.lua index 84e8123d..3595e5e3 100644 --- a/lua/core/lualine/styles.lua +++ b/lua/core/lualine/styles.lua @@ -69,7 +69,7 @@ styles.lvim = { icons_enabled = true, component_separators = "", section_separators = "", - disabled_filetypes = { "dashboard" }, + disabled_filetypes = { "dashboard", "NvimTree", "Outline" }, }, sections = { lualine_a = { -- cgit v1.2.3