zoey/config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

686 current 2024-05-26 14:31:34 24.11.20240526.8debaa1 6.9.1-zen1 *

Browse source
This commit is contained in:
zackartz 2024-05-26 14:31:43 -04:00
parent 41561e81c8
commit 9cc2434150
No known key found for this signature in database
GPG key ID: 5B53E53A9A514DBA
2 changed files with 41 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/home/apps/tools/neovim/config/lua/plugins/ui/lualine.lua
View file

@ -3,13 +3,8 @@ local sources = require("plugins.utils.lualine_sources")
return {
"nvim-lualine/lualine.nvim",
event = { "BufReadPost", "BufNewFile" },
dependencies = { "nvim-tree/nvim-web-devicons" },
dependencies = { "nvim-tree/nvim-web-devicons", "folke/noice.nvim" },
config = function(_, opts)
-- local colors = require("tokyonight.colors")
-- local tokyonight = require("lualine.themes.catppuccin")
--
-- vim.opt.laststatus = 3
-- tokyonight.normal.c.bg = colors.night.bg
opts.options.theme = "catppuccin"
require("lualine").setup(opts)
@ -20,20 +15,12 @@ return {
section_separators = { left = "", right = "" },
},
sections = {
lualine_x = {
"rest",
{
require("noice").api.statusline.mode.get,
cond = require("noice").api.statusline.mode.has,
color = { fg = "#ff9e64" },
},
},
-- lualine_a = { sources.mode },
-- lualine_b = { sources.branch, sources.diff },
-- lualine_c = { sources.filetype, sources.macro },
-- lualine_x = { sources.lsp, sources.diagnostics },
-- lualine_y = { sources.indentation, sources.encoding, sources.fileformat },
-- lualine_z = { sources.progress, sources.location },
lualine_a = { sources.mode },
lualine_b = { sources.branch, sources.diff },
lualine_c = { sources.filetype, sources.macro },
lualine_x = { sources.lsp, sources.diagnostics },
lualine_y = { sources.indentation, sources.encoding, sources.fileformat },
lualine_z = { sources.progress, sources.location },
},
},
}

68
modules/home/apps/tools/neovim/config/lua/plugins/utils/lualine_sources.lua
View file

@ -21,22 +21,22 @@ M.mode = {
return icon .. " " .. name
end,
color = function()
local colors = require("tokyonight.colors")
local colors = require("catppuccin.palettes").get_palette()
local mode = vim.fn.mode()
local map = {
n = colors.default.blue,
i = colors.default.green,
c = colors.default.yellow,
t = colors.default.cyan,
R = colors.default.red,
v = colors.default.magenta,
V = colors.default.magenta,
s = colors.default.magenta,
S = colors.default.magenta,
n = colors.sapphire,
i = colors.green,
c = colors.yellow,
t = colors.mauve,
R = colors.maroon,
v = colors.lavender,
V = colors.lavender,
s = colors.sky,
S = colors.sky,
}
return {
fg = map[mode] or colors.default.magenta,
bg = colors.night.bg,
fg = map[mode] or colors.lavender,
bg = colors.base,
}
end,
}
@ -45,8 +45,8 @@ M.branch = {
"branch",
icon = icons.GitBranch,
color = function()
local colors = require("tokyonight.colors")
return { bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { bg = colors.base }
end,
}
@ -58,8 +58,8 @@ M.diff = {
removed = fmt("Removed", ""),
},
color = function()
local colors = require("tokyonight.colors")
return { bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { bg = colors.base }
end,
}
@ -68,24 +68,24 @@ M.filetype = { "filetype" }
M.diagnostics = {
"diagnostics",
color = function()
local colors = require("tokyonight.colors")
return { bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { bg = colors.base }
end,
}
M.encoding = {
"encoding",
color = function()
local colors = require("tokyonight.colors")
return { fg = colors.default.blue, bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { fg = colors.blue, bg = colors.base }
end,
}
M.fileformat = {
"fileformat",
color = function()
local colors = require("tokyonight.colors")
return { fg = colors.default.blue, bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { fg = colors.blue, bg = colors.base }
end,
}
@ -97,8 +97,8 @@ M.indentation = {
return type .. ": " .. value
end,
color = function()
local colors = require("tokyonight.colors")
return { fg = colors.default.blue, bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { fg = colors.blue, bg = colors.base }
end,
}
@ -108,8 +108,8 @@ M.progress = {
return vim.trim(location)
end,
color = function()
local colors = require("tokyonight.colors")
return { fg = colors.default.purple, bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { fg = colors.lavender, bg = colors.base }
end,
}
@ -119,8 +119,8 @@ M.location = {
return vim.trim(location)
end,
color = function()
local colors = require("tokyonight.colors")
return { fg = colors.default.purple, bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { fg = colors.lavender, bg = colors.base }
end,
}
@ -130,8 +130,8 @@ M.macro = {
end,
icon = icons.Recording,
color = function()
local colors = require("tokyonight.colors")
return { fg = colors.default.red }
local colors = require("catppuccin.palettes").get_palette()
return { fg = colors.red, bg = colors.base }
end,
}
@ -149,8 +149,8 @@ M.lsp = {
end,
icon = icons.Braces,
color = function()
local colors = require("tokyonight.colors")
return { fg = colors.default.comment, bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { fg = colors.overlay0, bg = colors.base }
end,
}
@ -159,8 +159,8 @@ M.gap = {
return " "
end,
color = function()
local colors = require("tokyonight.colors")
return { bg = colors.night.bg }
local colors = require("catppuccin.palettes").get_palette()
return { bg = colors.base }
end,
padding = 0,
}