refactor: utilize utility function for color fetching
This commit is contained in:
@@ -10,6 +10,8 @@
|
|||||||
local wakatime_stats = require('utils.wakatime_stats')
|
local wakatime_stats = require('utils.wakatime_stats')
|
||||||
local music_stats = require('utils.music_stats')
|
local music_stats = require('utils.music_stats')
|
||||||
|
|
||||||
|
local get_fg = require('snacks').util.color
|
||||||
|
|
||||||
-- Setup NeoMiniMap extension
|
-- Setup NeoMiniMap extension
|
||||||
-- local minimap_extension = require("neominimap.statusline").lualine_default
|
-- local minimap_extension = require("neominimap.statusline").lualine_default
|
||||||
local neominimap = require('neominimap.statusline')
|
local neominimap = require('neominimap.statusline')
|
||||||
@@ -111,6 +113,7 @@ vim.api.nvim_create_autocmd('User', {
|
|||||||
|
|
||||||
return { -- Lualine
|
return { -- Lualine
|
||||||
'nvim-lualine/lualine.nvim',
|
'nvim-lualine/lualine.nvim',
|
||||||
|
lazy = false,
|
||||||
cond = require('data.func').check_global_var(
|
cond = require('data.func').check_global_var(
|
||||||
'statusline',
|
'statusline',
|
||||||
'lualine',
|
'lualine',
|
||||||
@@ -168,7 +171,7 @@ return { -- Lualine
|
|||||||
function()
|
function()
|
||||||
return require('data.types').mode.current.lualine()
|
return require('data.types').mode.current.lualine()
|
||||||
end,
|
end,
|
||||||
padding = { left = 1, right = 0 },
|
padding = { left = 0, right = 0 },
|
||||||
separator = { left = '', right = '' },
|
separator = { left = '', right = '' },
|
||||||
},
|
},
|
||||||
{ -- MultiCursors
|
{ -- MultiCursors
|
||||||
@@ -268,19 +271,19 @@ return { -- Lualine
|
|||||||
function() return require("noice").api.status.command.get() end,
|
function() return require("noice").api.status.command.get() end,
|
||||||
---@diagnostic disable-next-line: undefined-field
|
---@diagnostic disable-next-line: undefined-field
|
||||||
cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end,
|
cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end,
|
||||||
color = function() return LazyVim.ui.fg("Statement") end,
|
color = function() return { fg = get_fg("Statement") } end,
|
||||||
},
|
},
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
{ -- DAP Status
|
{ -- DAP Status
|
||||||
function() return " " .. require("dap").status() end,
|
function() return " " .. require("dap").status() end,
|
||||||
cond = function() return package.loaded["dap"] and require("dap").status() ~= "" end,
|
cond = function() return package.loaded["dap"] and require("dap").status() ~= "" end,
|
||||||
color = function() return LazyVim.ui.fg("Debug") end,
|
color = function() return { fg = get_fg("Debug") } end,
|
||||||
},
|
},
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
{ -- Lazy Status
|
{ -- Lazy Status
|
||||||
require("lazy.status").updates,
|
require("lazy.status").updates,
|
||||||
cond = require("lazy.status").has_updates,
|
cond = require("lazy.status").has_updates,
|
||||||
color = function() return LazyVim.ui.fg("Special") end,
|
color = function() return { fg = get_fg("Special") } end,
|
||||||
},
|
},
|
||||||
{ -- Diff
|
{ -- Diff
|
||||||
'diff',
|
'diff',
|
||||||
@@ -402,9 +405,9 @@ return { -- Lualine
|
|||||||
cond = function()
|
cond = function()
|
||||||
return require('data.func').is_window_wide_enough(40)
|
return require('data.func').is_window_wide_enough(40)
|
||||||
end,
|
end,
|
||||||
on_click = function()
|
-- on_click = function()
|
||||||
vim.cmd('Telescope grep_string')
|
-- vim.cmd('Telescope grep_string')
|
||||||
end,
|
-- end,
|
||||||
},
|
},
|
||||||
{ -- Selection
|
{ -- Selection
|
||||||
'selection_count',
|
'selection_count',
|
||||||
@@ -470,19 +473,19 @@ return { -- Lualine
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
extensions = {
|
extensions = {
|
||||||
'neo-tree',
|
-- 'neo-tree',
|
||||||
'lazy',
|
-- 'lazy',
|
||||||
'aerial',
|
-- 'aerial',
|
||||||
'fugitive',
|
-- 'fugitive',
|
||||||
'fzf',
|
-- 'fzf',
|
||||||
'mason',
|
-- 'mason',
|
||||||
'overseer',
|
-- 'overseer',
|
||||||
'toggleterm',
|
-- 'toggleterm',
|
||||||
'nvim-dap-ui',
|
-- 'nvim-dap-ui',
|
||||||
'quickfix',
|
-- 'quickfix',
|
||||||
'symbols-outline',
|
-- 'symbols-outline',
|
||||||
'trouble',
|
-- 'trouble',
|
||||||
minimap_extension,
|
-- minimap_extension,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user