nezia/flocon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: fix packages affected by tinted-scheming's breaking changes

Browse source
This commit is contained in:
Anthony Rodriguez 2024-11-17 00:24:17 +01:00
parent 2cedd8b507
commit e69c0feab9
Signed by: nezia
GPG key ID: EE3BE97C040A86CE
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home/programs/niri/default.nix
View file

@ -6,7 +6,7 @@
osConfig, osConfig,
... ...
}: let }: let
colors = inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette; inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
inherit (lib) getExe mkIf; inherit (lib) getExe mkIf;
in { in {
imports = [./binds.nix]; imports = [./binds.nix];
@ -37,7 +37,7 @@ in {
layout = { layout = {
focus-ring = { focus-ring = {
enable = true; enable = true;
active.color = "#${colors.base0E}"; active.color = palette.base0E;
}; };
always-center-single-column = true; always-center-single-column = true;
}; };

41
home/terminal/emulators/foot.nix
View file

@ -14,28 +14,31 @@
shell = "${lib.getExe config.programs.fish.package}"; shell = "${lib.getExe config.programs.fish.package}";
}; };
colors = let 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 { in {
background = schemeData.palette.base00; background = palette.base00;
foreground = schemeData.palette.base05; foreground = palette.base05;
regular0 = schemeData.palette.base01; regular0 = palette.base01;
regular1 = schemeData.palette.base08; regular1 = palette.base08;
regular2 = schemeData.palette.base0B; regular2 = palette.base0B;
regular3 = schemeData.palette.base0A; regular3 = palette.base0A;
regular4 = schemeData.palette.base0D; regular4 = palette.base0D;
regular5 = schemeData.palette.base0E; regular5 = palette.base0E;
regular6 = schemeData.palette.base0C; regular6 = palette.base0C;
regular7 = schemeData.palette.base06; regular7 = palette.base06;
bright0 = schemeData.palette.base02; bright0 = palette.base02;
bright1 = schemeData.palette.base08; bright1 = palette.base08;
bright2 = schemeData.palette.base0B; bright2 = palette.base0B;
bright3 = schemeData.palette.base0A; bright3 = palette.base0A;
bright4 = schemeData.palette.base0D; bright4 = palette.base0D;
bright5 = schemeData.palette.base0E; bright5 = palette.base0E;
bright6 = schemeData.palette.base0C; bright6 = palette.base0C;
bright7 = schemeData.palette.base07; bright7 = palette.base07;
}; };
}; };
}; };