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

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

@@ -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 = {
+			lualine_a = { sources.mode },
-				"rest",
+			lualine_b = { sources.branch, sources.diff },
-				{
+			lualine_c = { sources.filetype, sources.macro },
-					require("noice").api.statusline.mode.get,
+			lualine_x = { sources.lsp, sources.diagnostics },
-					cond = require("noice").api.statusline.mode.has,
+			lualine_y = { sources.indentation, sources.encoding, sources.fileformat },
-					color = { fg = "#ff9e64" },
+			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 },
 		},
 	},
 }

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

@@ -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,
+			n = colors.sapphire,
-			i = colors.default.green,
+			i = colors.green,
-			c = colors.default.yellow,
+			c = colors.yellow,
-			t = colors.default.cyan,
+			t = colors.mauve,
-			R = colors.default.red,
+			R = colors.maroon,
-			v = colors.default.magenta,
+			v = colors.lavender,
-			V = colors.default.magenta,
+			V = colors.lavender,
-			s = colors.default.magenta,
+			s = colors.sky,
-			S = colors.default.magenta,
+			S = colors.sky,
 		}
 		return {
-			fg = map[mode] or colors.default.magenta,
+			fg = map[mode] or colors.lavender,
-			bg = colors.night.bg,
+			bg = colors.base,
 		}
 	end,
 }
@@ -45,8 +45,8 @@ M.branch = {
 	"branch",
 	icon = icons.GitBranch,
 	color = function()
-		local colors = require("tokyonight.colors")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { bg = colors.night.bg }
+		return { bg = colors.base }
 	end,
 }
 
@@ -58,8 +58,8 @@ M.diff = {
 		removed = fmt("Removed", ""),
 	},
 	color = function()
-		local colors = require("tokyonight.colors")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { bg = colors.night.bg }
+		return { bg = colors.base }
 	end,
 }
 
@@ -68,24 +68,24 @@ M.filetype = { "filetype" }
 M.diagnostics = {
 	"diagnostics",
 	color = function()
-		local colors = require("tokyonight.colors")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { bg = colors.night.bg }
+		return { bg = colors.base }
 	end,
 }
 
 M.encoding = {
 	"encoding",
 	color = function()
-		local colors = require("tokyonight.colors")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.default.blue, bg = colors.night.bg }
+		return { fg = colors.blue, bg = colors.base }
 	end,
 }
 
 M.fileformat = {
 	"fileformat",
 	color = function()
-		local colors = require("tokyonight.colors")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.default.blue, bg = colors.night.bg }
+		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")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.default.blue, bg = colors.night.bg }
+		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")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.default.purple, bg = colors.night.bg }
+		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")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.default.purple, bg = colors.night.bg }
+		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")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.default.red }
+		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")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.default.comment, bg = colors.night.bg }
+		return { fg = colors.overlay0, bg = colors.base }
 	end,
 }
 
@@ -159,8 +159,8 @@ M.gap = {
 		return " "
 	end,
 	color = function()
-		local colors = require("tokyonight.colors")
+		local colors = require("catppuccin.palettes").get_palette()
-		return { bg = colors.night.bg }
+		return { bg = colors.base }
 	end,
 	padding = 0,
 }