[2024-05-20] Merging conflicting changes to feline.lua
This commit is contained in:
commit
2929e4211f
3 changed files with 29 additions and 3 deletions
|
@ -53,7 +53,6 @@ status_components.active[3][1] = {
|
|||
}
|
||||
status_components.active[3][2] = {
|
||||
provider = 'position'
|
||||
|
||||
}
|
||||
status_components.active[3][3] = {
|
||||
provider = 'line_percentage',
|
||||
|
@ -72,7 +71,7 @@ status_components.active[3][4] = {
|
|||
}
|
||||
local custom_providers = {
|
||||
time = function()
|
||||
return tostring(vim.fn.strftime('%H:%M'))
|
||||
return tostring(vim.fn.strftime('%H:%M'))
|
||||
end,
|
||||
git_add = function()
|
||||
return git_diff('added'), ' '
|
||||
|
@ -85,7 +84,13 @@ local custom_providers = {
|
|||
end,
|
||||
word_count = function()
|
||||
return vim.fn.wordcount().words .. 'W '
|
||||
end
|
||||
end,
|
||||
date = function()
|
||||
return tostring(vim.fn.strftime('%Y-%m-%d'))
|
||||
end,
|
||||
battery = function()
|
||||
return require('battery').get_status_line()
|
||||
end
|
||||
}
|
||||
status_config.components = status_components
|
||||
status_config.custom_providers = custom_providers
|
||||
|
@ -180,6 +185,24 @@ win_components.active[3][4] = {
|
|||
right_sep = 'right_rounded'
|
||||
}
|
||||
win_components.active[3][5] = {
|
||||
provider = 'battery',
|
||||
left_sep = {
|
||||
str = 'block'
|
||||
},
|
||||
right_sep = {
|
||||
str = 'block'
|
||||
}
|
||||
}
|
||||
win_components.active[3][6] = {
|
||||
provider = 'date',
|
||||
left_sep = {
|
||||
str = 'block'
|
||||
},
|
||||
right_sep = {
|
||||
str = 'block'
|
||||
}
|
||||
}
|
||||
win_components.active[3][7] = {
|
||||
provider = 'time',
|
||||
left_sep = {
|
||||
str = 'block'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue