clean up catppuccin color variables

This commit is contained in:
LordMZTE 2024-01-14 17:59:26 +01:00
parent 3f61065096
commit a8fc8858d9
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
4 changed files with 48 additions and 52 deletions

View file

@ -9,7 +9,7 @@ default-timeout=8000
anchor=top-left anchor=top-left
# Colors # Colors
background-color=<% opt.catppuccin.base %>E0 background-color=#<% opt.catppuccin.base %>E0
text-color=<% opt.catppuccin.text %>FF text-color=#<% opt.catppuccin.text %>FF
border-color=<% opt.catppuccin.red %>FF border-color=#<% opt.catppuccin.red %>FF
progress-color=source <% opt.catppuccin.surface0 %>E0 progress-color=source #<% opt.catppuccin.surface0 %>E0

View file

@ -1,20 +1,16 @@
<! function col(c)
return opt.catppuccin[c]:gsub("^#", "0x")
end !>
[general] [general]
corner-radius = 0; corner-radius = 0;
font-regular = <% opt.font %>:size=14; font-regular = <% opt.font %>:size=14;
font-large = <% opt.font %>:size=20; font-large = <% opt.font %>:size=20;
[colours] [colours]
background = <% col "mantle" %>; background = <% opt.catppuccin.mantle %>;
border = <% col "red" %>; border = <% opt.catppuccin.red %>;
text = <% col "text" %>; text = <% opt.catppuccin.text %>;
error-text = <% col "red" %>; error-text = <% opt.catppuccin.red %>;
pin-background = <% col "base" %>; pin-background = <% opt.catppuccin.base %>;
pin-border = <% col "green" %>; pin-border = <% opt.catppuccin.green %>;
pin-square = <% col "mauve" %>; pin-square = <% opt.catppuccin.mauve %>;
ok-button = <% col "blue" %>; ok-button = <% opt.catppuccin.blue %>;
not-ok-button = <% col "maroon" %>; not-ok-button = <% opt.catppuccin.maroon %>;
cancel-button = <% col "red" %>; cancel-button = <% opt.catppuccin.red %>;

View file

@ -14,10 +14,10 @@
hook: Hook(parent_anchor: TL, self_anchor: TL), hook: Hook(parent_anchor: TL, self_anchor: TL),
offset: Vec2(x: 25.0, y: 25.0), offset: Vec2(x: 25.0, y: 25.0),
params: NotificationBlock(( params: NotificationBlock((
background_color: Color(hex: "<% opt.catppuccin.mantle %>"), background_color: Color(hex: "#<% opt.catppuccin.mantle %>"),
border_color: Color(hex: "<% opt.catppuccin.red %>"), border_color: Color(hex: "#<% opt.catppuccin.red %>"),
border_color_critical: Color(hex: "<% opt.catppuccin.peach %>"), border_color_critical: Color(hex: "#<% opt.catppuccin.peach %>"),
border_color_low: Color(hex: "<% opt.catppuccin.sky %>"), border_color_low: Color(hex: "#<% opt.catppuccin.sky %>"),
border_rounding: 0.0, border_rounding: 0.0,
border_width: 4.0, border_width: 4.0,
gap: Vec2(x: 0.0, y: 12.0), gap: Vec2(x: 0.0, y: 12.0),
@ -32,7 +32,7 @@
hook: Hook(parent_anchor: TR, self_anchor: TL), hook: Hook(parent_anchor: TR, self_anchor: TL),
offset: Vec2(x: 0.0, y: 0.0), offset: Vec2(x: 0.0, y: 0.0),
params: ScrollingTextBlock(( params: ScrollingTextBlock((
color: Color(hex: "<% opt.catppuccin.red %>"), color: Color(hex: "#<% opt.catppuccin.red %>"),
ellipsize: End, ellipsize: End,
font: "<% opt.font %> Bold 12", font: "<% opt.font %> Bold 12",
lhs_dist: 25.0, lhs_dist: 25.0,
@ -52,7 +52,7 @@
offset: Vec2(x: 0.0, y: 0.0), offset: Vec2(x: 0.0, y: 0.0),
params: TextBlock(( params: TextBlock((
text: "%b", text: "%b",
color: Color(hex: "<% opt.catppuccin.text %>"), color: Color(hex: "#<% opt.catppuccin.text %>"),
ellipsize: End, ellipsize: End,
font: "<% opt.font %> Bold 12", font: "<% opt.font %> Bold 12",
padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0), padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0),
@ -85,10 +85,10 @@
render_criteria: [Or([Progress])], render_criteria: [Or([Progress])],
params: ProgressBlock(( params: ProgressBlock((
background_color: Color(hex: "#00000000"), background_color: Color(hex: "#00000000"),
border_color: Color(hex: "<% opt.catppuccin.surface0 %>"), border_color: Color(hex: "#<% opt.catppuccin.surface0 %>"),
border_rounding: 0.0, border_rounding: 0.0,
border_width: 0.4, border_width: 0.4,
fill_color: Color(hex: "<% opt.catppuccin.teal %>"), fill_color: Color(hex: "#<% opt.catppuccin.teal %>"),
fill_rounding: 0.0, fill_rounding: 0.0,
height: 10.0, height: 10.0,
padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0), padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0),

View file

@ -63,32 +63,32 @@ opts.gamemode = {
opts.dev_dir = os.getenv "HOME" .. "/dev" opts.dev_dir = os.getenv "HOME" .. "/dev"
opts.catppuccin = { opts.catppuccin = {
base = "#1e1e2e", base = "1e1e2e",
blue = "#89b4fa", blue = "89b4fa",
crust = "#11111b", crust = "11111b",
flamingo = "#f2cdcd", flamingo = "f2cdcd",
green = "#a6e3a1", green = "a6e3a1",
lavender = "#b4befe", lavender = "b4befe",
mantle = "#181825", mantle = "181825",
maroon = "#eba0ac", maroon = "eba0ac",
mauve = "#cba6f7", mauve = "cba6f7",
overlay0 = "#6c7086", overlay0 = "6c7086",
overlay1 = "#7f849c", overlay1 = "7f849c",
overlay2 = "#9399b2", overlay2 = "9399b2",
peach = "#fab387", peach = "fab387",
pink = "#f5c2e7", pink = "f5c2e7",
red = "#f38ba8", red = "f38ba8",
rosewater = "#f5e0dc", rosewater = "f5e0dc",
sapphire = "#74c7ec", sapphire = "74c7ec",
sky = "#89dceb", sky = "89dceb",
subtext0 = "#a6adc8", subtext0 = "a6adc8",
subtext1 = "#bac2de", subtext1 = "bac2de",
surface0 = "#313244", surface0 = "313244",
surface1 = "#45475a", surface1 = "45475a",
surface2 = "#585b70", surface2 = "585b70",
teal = "#94e2d5", teal = "94e2d5",
text = "#cdd6f4", text = "cdd6f4",
yellow = "#f9e2af", yellow = "f9e2af",
} }
return opts return opts