fix(gui): fix catppuccin palette

This commit is contained in:
514fpv 2024-02-14 14:40:48 +08:00
parent 278bae388b
commit 03af7d5c18
Signed by: koishi
SSH key fingerprint: SHA256:axz0uIzzY+5W19i7QOUuiw5LSqhKfCBKPf3L4xFRxLw
3 changed files with 129 additions and 209 deletions

View file

@ -3,7 +3,7 @@
, config
, ... }: with lib; let
cfg = config.passthrough.catppuccin;
palette = import ./palette.nix;
palette = (import ./palette.nix).${cfg.palette};
in mkIf cfg.enable {
# cursor theme
home.pointerCursor = { inherit (cfg.cursor) package name; };
@ -14,7 +14,7 @@ in mkIf cfg.enable {
# sway colour palette override
wayland.windowManager.sway.config = {
colors = with palette.sway.${cfg.sway}; {
colors = with palette; {
focused = { border = lavender; background = base; text = text; indicator = rosewater; childBorder = lavender; };
focusedInactive = { border = overlay0; background = base; text = text; indicator = rosewater; childBorder = overlay0; };
unfocused = { border = overlay0; background = base; text = text; indicator = rosewater; childBorder = overlay0; };
@ -25,7 +25,7 @@ in mkIf cfg.enable {
bars = mkForce [ {
colors = let
p = palette.sway.${cfg.sway};
p = palette;
in {
background = p.base;
statusline = p.text;
@ -57,7 +57,7 @@ in mkIf cfg.enable {
gaps.bottom = 0;
};
programs.swaylock.settings = with palette.sway.${cfg.sway}; let
programs.swaylock.settings = with palette; let
transparent = "00000000";
in {
color = base;
@ -91,16 +91,24 @@ in mkIf cfg.enable {
text-wrong-color = maroon;
};
programs.i3status.general = with palette.sway.${cfg.sway}; {
programs.i3status.general = with palette; {
color_good = lavender;
color_degraded = yellow;
color_bad = red;
};
# foot colour palette override
programs.foot.settings.colors = {
inherit (palette.foot.${cfg.sway}) foreground background
regular0 regular1 regular2 regular3 regular4 regular5 regular6 regular7
bright0 bright1 bright2 bright3 bright4 bright5 bright6 bright7;
programs.foot.settings.colors = with palette; let
c = substring 1 7;
in {
foreground = c text; background = c base;
regular0 = c subtext1; regular1 = c red;
regular2 = c green; regular3 = c yellow;
regular4 = c blue; regular5 = c pink;
regular6 = c teal; regular7 = c surface2;
bright0 = c subtext0; bright1 = c red;
bright2 = c green; bright3 = c yellow;
bright4 = c blue; bright5 = c pink;
bright6 = c teal; bright7 = c surface1;
};
}