fix(gui): fix catppuccin palette

home/gui/catppuccin/home.nix

@@ -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;
   };
 }

home/gui/catppuccin/nixos.nix

@@ -8,10 +8,10 @@ in {
   options.home.catppuccin = {
     enable = mkEnableOption "catppuccin colour scheme" // { default = gui; };
 
-    sway = mkOption {
+    palette = mkOption {
       type = with types; str;
       default = "frappe";
-      description = "colour palette used in sway";
+      description = "colour palette in use";
     };
 
     gtk = {

home/gui/catppuccin/palette.nix

@@ -1,5 +1,4 @@
 {
-  sway = {
   latte = {
     rosewater = "#dc8a78";
     flamingo  = "#dd7878";
@@ -115,91 +114,4 @@
     mantle    = "#181825";
     crust     = "#11111b";
   };
-  };
-
-  foot = {
-    latte = {
-      foreground = "4c4f69"; # Text
-      background = "eff1f5"; # Base
-      regular0 = "5c5f77";   # Subtext 1
-      regular1 = "d20f39";   # red
-      regular2 = "40a02b";   # green
-      regular3 = "df8e1d";   # yellow
-      regular4 = "1e66f5";   # blue
-      regular5 = "ea76cb";   # pink
-      regular6 = "179299";   # teal
-      regular7 = "acb0be";   # Surface 2
-      bright0 = "6c6f85";    # Subtext 0
-      bright1 = "d20f39";    # red
-      bright2 = "40a02b";    # green
-      bright3 = "df8e1d";    # yellow
-      bright4 = "1e66f5";    # blue
-      bright5 = "ea76cb";    # pink
-      bright6 = "179299";    # teal
-      bright7 = "bcc0cc";    # Surface 1
-    };
-
-    frappe = {
-      foreground = "c6d0f5"; # Text
-      background = "303446"; # Base
-      regular0 = "51576d";   # Surface 1
-      regular1 = "e78284";   # red
-      regular2 = "a6d189";   # green
-      regular3 = "e5c890";   # yellow
-      regular4 = "8caaee";   # blue
-      regular5 = "f4b8e4";   # pink
-      regular6 = "81c8be";   # teal
-      regular7 = "b5bfe2";   # Subtext 1
-      bright0 = "626880";    # Surface 2
-      bright1 = "e78284";    # red
-      bright2 = "a6d189";    # green
-      bright3 = "e5c890";    # yellow
-      bright4 = "8caaee";    # blue
-      bright5 = "f4b8e4";    # pink
-      bright6 = "81c8be";    # teal
-      bright7 = "a5adce";    # Subtext 0
-    };
-
-    macchiato = {
-      foreground = "cad3f5"; # Text
-      background = "24273a"; # Base
-      regular0 = "494d64";   # Surface 1
-      regular1 = "ed8796";   # red
-      regular2 = "a6da95";   # green
-      regular3 = "eed49f";   # yellow
-      regular4 = "8aadf4";   # blue
-      regular5 = "f5bde6";   # pink
-      regular6 = "8bd5ca";   # teal
-      regular7 = "b8c0e0";   # Subtext 1
-      bright0 = "5b6078";    # Surface 2
-      bright1 = "ed8796";    # red
-      bright2 = "a6da95";    # green
-      bright3 = "eed49f";    # yellow
-      bright4 = "8aadf4";    # blue
-      bright5 = "f5bde6";    # pink
-      bright6 = "8bd5ca";    # teal
-      bright7 = "a5adcb";    # Subtext 0
-    };
-
-    mocha = {
-      foreground = "cdd6f4"; # Text
-      background = "1e1e2e"; # Base
-      regular0 = "45475a";   # Surface 1
-      regular1 = "f38ba8";   # red
-      regular2 = "a6e3a1";   # green
-      regular3 = "f9e2af";   # yellow
-      regular4 = "89b4fa";   # blue
-      regular5 = "f5c2e7";   # pink
-      regular6 = "94e2d5";   # teal
-      regular7 = "bac2de";   # Subtext 1
-      bright0 = "585b70";    # Surface 2
-      bright1 = "f38ba8";    # red
-      bright2 = "a6e3a1";    # green
-      bright3 = "f9e2af";    # yellow
-      bright4 = "89b4fa";    # blue
-      bright5 = "f5c2e7";    # pink
-      bright6 = "94e2d5";    # teal
-      bright7 = "a6adc8";    # Subtext 0
-    };
-  };
 }