From e69c0feab964e26b752df03bfd4cf63818226c71 Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Sun, 17 Nov 2024 00:24:17 +0100
Subject: [PATCH] treewide: fix packages affected by tinted-scheming's breaking
 changes

---
 home/programs/niri/default.nix   |  4 ++--
 home/terminal/emulators/foot.nix | 41 +++++++++++++++++---------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/home/programs/niri/default.nix b/home/programs/niri/default.nix
index e77ab14..2e4910d 100644
--- a/home/programs/niri/default.nix
+++ b/home/programs/niri/default.nix
@@ -6,7 +6,7 @@
   osConfig,
   ...
 }: let
-  colors = inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette;
+  inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
   inherit (lib) getExe mkIf;
 in {
   imports = [./binds.nix];
@@ -37,7 +37,7 @@ in {
       layout = {
         focus-ring = {
           enable = true;
-          active.color = "#${colors.base0E}";
+          active.color = palette.base0E;
         };
         always-center-single-column = true;
       };
diff --git a/home/terminal/emulators/foot.nix b/home/terminal/emulators/foot.nix
index 099e3ec..beb6e21 100644
--- a/home/terminal/emulators/foot.nix
+++ b/home/terminal/emulators/foot.nix
@@ -14,28 +14,31 @@
         shell = "${lib.getExe config.programs.fish.package}";
       };
       colors = let
-        schemeData = inputs.basix.schemeData.base16.${osConfig.theme.scheme};
+        inherit (lib) mapAttrs;
+        inherit (lib.strings) removePrefix;
+        # because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b
+        palette = mapAttrs (_: color: removePrefix "#" color) inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette;
       in {
-        background = schemeData.palette.base00;
-        foreground = schemeData.palette.base05;
+        background = palette.base00;
+        foreground = palette.base05;
 
-        regular0 = schemeData.palette.base01;
-        regular1 = schemeData.palette.base08;
-        regular2 = schemeData.palette.base0B;
-        regular3 = schemeData.palette.base0A;
-        regular4 = schemeData.palette.base0D;
-        regular5 = schemeData.palette.base0E;
-        regular6 = schemeData.palette.base0C;
-        regular7 = schemeData.palette.base06;
+        regular0 = palette.base01;
+        regular1 = palette.base08;
+        regular2 = palette.base0B;
+        regular3 = palette.base0A;
+        regular4 = palette.base0D;
+        regular5 = palette.base0E;
+        regular6 = palette.base0C;
+        regular7 = palette.base06;
 
-        bright0 = schemeData.palette.base02;
-        bright1 = schemeData.palette.base08;
-        bright2 = schemeData.palette.base0B;
-        bright3 = schemeData.palette.base0A;
-        bright4 = schemeData.palette.base0D;
-        bright5 = schemeData.palette.base0E;
-        bright6 = schemeData.palette.base0C;
-        bright7 = schemeData.palette.base07;
+        bright0 = palette.base02;
+        bright1 = palette.base08;
+        bright2 = palette.base0B;
+        bright3 = palette.base0A;
+        bright4 = palette.base0D;
+        bright5 = palette.base0E;
+        bright6 = palette.base0C;
+        bright7 = palette.base07;
       };
     };
   };