treewide: adapt icon theme colors #157

Kasper24 · 2023-10-01T17:34:46Z

I've been using this in my personal configuration for a bit, but not sure if you guys will be interested in this. The script is a modified and stripped down version of color-manager.

One issue that I'm having is with parent themes. They should always be accessible in propagatedbuildinputs, but I'm unsure how to dynamically adjust them. Additionally, this script could potentially be expanded to recolor wallpapers, but that would require some adjustments as well.

Examples:
Gruvbox:

Nord:

Custom cyberpunk color scheme
mode = "palette"

Custom cyberpunk color scheme
mode = "monochrome"

Same settings, but icon theme is numix circle:

SomeGuyNamedMay · 2023-10-02T04:21:33Z

if were going to add a new package to stylix we might want to reorganise were it and the palate generator are place, ie putting them both into ./pkgs or something

danth · 2023-10-03T09:05:18Z

modules/icon-theme/hm.nix

+    };
+
+    config = cfg.enable {
+      home-manager.users.${config.modules.user.name} = {


This shouldn't be here, Stylix will import the module directly into Home Manager.

It was meant to be mkIf cfg.enable. Should I remove it completely?

I meant the home-manager.users.${config.modules.user.name} part. The way the modules are loaded means that anything in hm.nix is already inside Home Manager, so you can remove that line.

Oh right, I based this off a module that lives in my own nix flake, so I must have forgotten to change it

modules/icon-theme/hm.nix

danth · 2023-10-03T09:23:51Z

modules/icon-theme/hm.nix

+          iconTheme = lib.mkMerge [
+            {
+              name = cfg.name;
+            }
+
+            (lib.mkIf (!cfg.adjustColorScheme.enable) {
+              package = cfg.package;
+            })
+            (lib.mkIf (cfg.adjustColorScheme.enable) {


I think it's fine to use a normal if statement here rather than mkMerge.

This just me gives me an error. I'm stilla little new to nix, so not sure how to do it

iconTheme = { name = cfg.name; (lib.mkIf (!cfg.recolor.enable) { .... }) (lib.mkIf (cfg.recolor.enable) { ... });

Something like

iconTheme = { name = cfg.name; package = if cfg.recolor.enable then ... else ...; };

danth · 2023-10-03T09:28:36Z

modules/icon-theme/hm.nix

+      colors = lib.mkOption {
+        description = "The color to use when mode is set to color";
+        type = lib.types.listOf (lib.types.str);
+        default =
+          if cfg.adjustColorScheme.mode == "color" then
+            config.lib.stylix.colors.withHashtag.base09
+          else if cfg.adjustColorScheme.mode == "color-from-palette" then
+            with config.lib.stylix.colors.withHashtag; [
+              base08
+              base09
+              base0A
+              base0B
+              base0C
+              base0D
+              base0E
+              base0F
+            ]
+          else
+            with config.lib.stylix.colors.withHashtag; [
+              base00
+              base01
+              base02
+              base03
+              base04
+              base05
+              base06
+              base07
+              base08
+              base09
+              base0A
+              base0B
+              base0C
+              base0D
+              base0E
+              base0F
+            ];


Does this need to be an option? It looks more like an implementation detail.

I added it in 32da08c. Before that commit, it was only possible to customize the color when the mode was set to "color" which just sets all the icons to a single color. I thought it the other modes should be customizable as well, as someone might want to use different colors. Maybe for some color-schemes only some colors work well.

modules/icon-theme/hm.nix

Co-authored-by: Daniel Thwaites <[email protected]>

Kasper24 · 2023-10-05T02:02:01Z

I'm wondering how we should add support for recoloring the wallpaper as well? @danth

danth · 2023-10-05T09:40:42Z

After #102 is finished we should be able to add that as a function which takes in an image and a color scheme, and outputs the recoloured wallpaper.

Kasper24 · 2023-10-06T20:35:24Z

@danth What about recoloring the parent icon themes? For example in the "Numix Circle" theme the folder icons come from the parent "Numix" theme and those don't get recolored and look out of place. Surely there's a way?

danth · 2023-10-08T18:09:16Z

I'm not too familiar with how icon themes are packaged in NixOS. If the parent theme is a separate package then we would need to override it from there. Does the Numix Circle theme depend on Numix or do you install them separately?

Kasper24 · 2023-10-12T06:18:39Z

@danth https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/data/icons/numix-icon-theme-circle/default.nix#L40
Every parent theme that the child theme inherits from should be part of propagatedBuildInputs. Is there some magic we can do to override those as well?

danth · 2023-10-12T07:02:50Z

If they're the only thing in propagatedBuildInputs you could map the override function over that as part of the override

Kasper24 · 2023-10-27T19:32:35Z

If they're the only thing in propagatedBuildInputs you could map the override function over that as part of the override

Could you help me with that? I'm not quite sure how

donovanglover · 2024-01-03T02:07:35Z

Any example configs on how to use this branch? The icon theme colors look great.

Kasper24 · 2024-02-10T17:10:27Z

@donovanglover
The modes property works as follows:
-- monochrome: A monochromatic variant, colored by appropriate shades of the provided base color.
-- palette: A multichromatic variant, where all colors are replaced by their nearest perceived equivalent that adheres to the provided color palette.

stylix.targets.iconTheme = {
    enable = true;
    name = "Zafiro-icons-Dark";
    package = pkgs.zafiro-icons;
    recolor = {
      enable = true;
      mode = "palette";
      colors = with config.lib.stylix.colors.withHashtag; [
        base08
        base09
        base0A
        base0B
        base0C
        base0D
        base0E
        base0F
      ];
      smooth = false;
    };
  };
};

Really useful for colorschemes that don't work well with some icons, causing poor contrast

* Use str_float type rather than checking each arguement is not null and conveting to float * Update the way color modifications work. Now, saturation/light can be changed for both accent and foreground colors * Currently color modifications only work for SVGs as it's too slow for images

* It was checking for the new color, rather than the old color for detecting if it's an accent/foreground color * There's no need to check for the distance between the color and white, checking the light value is enough * Update the foregroundThreshold value and default for the new method * Now using custom saturation/light values for images will also work, checking for the distance for each color in each image is too slow so couldn't be enabled before

Kasper24 · 2024-02-20T15:14:16Z

@danth I added lots of options to better allow for adjusting the output, which helps icons that previously had very poor contrast when they got recolored. You can look at the new pics for examples.
I'm wondering what needs to be done to get this merged?

danth · 2024-02-27T13:26:00Z

When rebased on master, this branch causes an infinite recursion with my config:

error:
       … while calling the 'head' builtin

         at /nix/store/gzv0nsm8d5js3wzq2mr1sv9lfp1iyail-source/lib/attrsets.nix:960:11:

          959|         || pred here (elemAt values 1) (head values) then
          960|           head values
             |           ^
          961|         else

       … while evaluating the attribute 'value'

         at /nix/store/gzv0nsm8d5js3wzq2mr1sv9lfp1iyail-source/lib/modules.nix:809:9:

          808|     in warnDeprecation opt //
          809|       { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
             |         ^
          810|         inherit (res.defsFinal') highestPrio;

       (stack trace truncated; use '--show-trace' to show the full trace)

       error: infinite recursion encountered

       at /nix/store/gzv0nsm8d5js3wzq2mr1sv9lfp1iyail-source/lib/modules.nix:233:21:

          232|           (regularModules ++ [ internalModule ])
          233|           ({ inherit lib options config specialArgs; } // specialArgs);
             |                     ^
          234|         in mergeModules prefix (reverseList collected);

Kasper24 · 2024-02-29T05:41:15Z

@danth It's probably 53d1bb4. Any better way to do it?

modules/icon-theme/hm.nix

donovanglover · 2024-08-26T00:48:52Z

Got around to trying this out and it's pretty cool. Lots of options to play around with but would be great if it produced better results by default.

Not all themes will have propagatedBuildInputs so it shouldn't fail for those themes. I also had a few cases where certain icons would end up as circles with a single color, like the NixOS Manual for example.

danth · 2024-08-31T18:42:57Z

Anyone interested in this may also want to check #370, where I implemented this manually for parts of the Adwaita icon theme (the default in GNOME)

* Switched colormath to basic_colormath as the upstream project is using it now, should be faster too * Using the previous color lightness to prevent icons from ending up as a big circle of indistinguishable colors * Removed unused code

Kasper24 · 2024-11-22T20:24:35Z

@donovanglover I made some changes, it should not produce circles of indistinguishable colors anymore (or so I hope)

trueNAHO · 2024-11-23T15:31:00Z

For reference:

stylix: set GTK icon theme #603 might be related
There have been discussions to recolor using lutgen

Kasper24 added 3 commits October 1, 2023 20:25

Add module to adjust the icon theme colors

fade0d1

Make the color list configurable

32da08c

Fix typo

7bd051b

danth reviewed Oct 3, 2023

View reviewed changes

Kasper24 and others added 6 commits October 3, 2023 20:57

Update modules/icon-theme/hm.nix

5d77a04

Co-authored-by: Daniel Thwaites <[email protected]>

Update modules/icon-theme/hm.nix

694b60a

Co-authored-by: Daniel Thwaites <[email protected]>

Update modules/icon-theme/hm.nix

1193c58

Co-authored-by: Daniel Thwaites <[email protected]>

Rename adjustColorScheme to recolor

cf18247

Fix syntax error

a868210

Don't mess with the build inputs

6107356

danth mentioned this pull request Nov 4, 2023

Adaptive Cursor Theme #182

Open

donovanglover mentioned this pull request Jan 3, 2024

Recolored Icon Packs #131

Open

danth linked an issue Jan 3, 2024 that may be closed by this pull request

Recolored Icon Packs #131

Open

trueNAHO mentioned this pull request Jan 12, 2024

treewide: wallpaper refactor #102

Closed

4 tasks

trueNAHO changed the title ~~Add module to adjust the icon theme colors~~ treewide: adapt icon theme colors Feb 9, 2024

trueNAHO marked this pull request as draft February 9, 2024 21:36

Kasper24 added 4 commits February 14, 2024 07:47

Fix error when using the color-from-palette option

2731646

Code improvements + redo available recolor modes

601d25b

Add option to override icons saturation

0abbc5f

Add a lot of new configuration options

039eb4c

Really useful for colorschemes that don't work well with some icons, causing poor contrast

Kasper24 added 3 commits February 19, 2024 08:17

Fix some remaining issues

af8a3bb

Fix more issues

32439d8

Zafiro works better with recoloring

d4a5ca7

Kasper24 force-pushed the adjust-icontheme-colors branch from d1a69f2 to d4a5ca7 Compare February 19, 2024 08:25

Kasper24 added 5 commits February 19, 2024 10:30

Fix error

61fabb2

Make use of the foreground_threshold arg

c5c3620

Fix wrong conversions

172d2b0

Add option to recolor parent themes

53d1bb4

Kasper24 force-pushed the adjust-icontheme-colors branch from c88358b to 2c3993d Compare February 27, 2024 05:31

use optional string

9b1fbed

Kasper24 force-pushed the adjust-icontheme-colors branch from 2c3993d to 9b1fbed Compare February 27, 2024 05:31

danth reviewed Mar 4, 2024

View reviewed changes

modules/icon-theme/hm.nix Outdated Show resolved Hide resolved

Fix missing mkIf.enable

29ede00

Kasper24 closed this Oct 20, 2024

Kasper24 deleted the adjust-icontheme-colors branch October 20, 2024 01:31

Kasper24 restored the adjust-icontheme-colors branch October 20, 2024 01:31

Kasper24 reopened this Oct 20, 2024

Kasper24 added 2 commits November 23, 2024 01:01

fix error when trying to recolor image files

8fb9d8c

remove unused code

427a1fd

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

treewide: adapt icon theme colors #157

treewide: adapt icon theme colors #157

Kasper24 commented Oct 1, 2023 •

edited

Loading

SomeGuyNamedMay commented Oct 2, 2023

danth Oct 3, 2023

Kasper24 Oct 3, 2023

danth Oct 4, 2023

Kasper24 Oct 5, 2023

danth Oct 3, 2023

Kasper24 Oct 3, 2023 •

edited

Loading

danth Oct 4, 2023

danth Oct 3, 2023

Kasper24 Oct 3, 2023 •

edited

Loading

Kasper24 commented Oct 5, 2023 •

edited

Loading

danth commented Oct 5, 2023

Kasper24 commented Oct 6, 2023

danth commented Oct 8, 2023

Kasper24 commented Oct 12, 2023 •

edited

Loading

danth commented Oct 12, 2023

Kasper24 commented Oct 27, 2023

donovanglover commented Jan 3, 2024

Kasper24 commented Feb 10, 2024 •

edited

Loading

Kasper24 commented Feb 20, 2024 •

edited

Loading

danth commented Feb 27, 2024

Kasper24 commented Feb 29, 2024 •

edited

Loading

donovanglover commented Aug 26, 2024

danth commented Aug 31, 2024

Kasper24 commented Nov 22, 2024 •

edited

Loading

trueNAHO commented Nov 23, 2024

treewide: adapt icon theme colors #157

Are you sure you want to change the base?

treewide: adapt icon theme colors #157

Conversation

Kasper24 commented Oct 1, 2023 • edited Loading

SomeGuyNamedMay commented Oct 2, 2023

danth Oct 3, 2023

Choose a reason for hiding this comment

Kasper24 Oct 3, 2023

Choose a reason for hiding this comment

danth Oct 4, 2023

Choose a reason for hiding this comment

Kasper24 Oct 5, 2023

Choose a reason for hiding this comment

danth Oct 3, 2023

Choose a reason for hiding this comment

Kasper24 Oct 3, 2023 • edited Loading

Choose a reason for hiding this comment

danth Oct 4, 2023

Choose a reason for hiding this comment

danth Oct 3, 2023

Choose a reason for hiding this comment

Kasper24 Oct 3, 2023 • edited Loading

Choose a reason for hiding this comment

Kasper24 commented Oct 5, 2023 • edited Loading

danth commented Oct 5, 2023

Kasper24 commented Oct 6, 2023

danth commented Oct 8, 2023

Kasper24 commented Oct 12, 2023 • edited Loading

danth commented Oct 12, 2023

Kasper24 commented Oct 27, 2023

donovanglover commented Jan 3, 2024

Kasper24 commented Feb 10, 2024 • edited Loading

Kasper24 commented Feb 20, 2024 • edited Loading

danth commented Feb 27, 2024

Kasper24 commented Feb 29, 2024 • edited Loading

donovanglover commented Aug 26, 2024

danth commented Aug 31, 2024

Kasper24 commented Nov 22, 2024 • edited Loading

trueNAHO commented Nov 23, 2024

Kasper24 commented Oct 1, 2023 •

edited

Loading

Kasper24 Oct 3, 2023 •

edited

Loading

Kasper24 Oct 3, 2023 •

edited

Loading

Kasper24 commented Oct 5, 2023 •

edited

Loading

Kasper24 commented Oct 12, 2023 •

edited

Loading

Kasper24 commented Feb 10, 2024 •

edited

Loading

Kasper24 commented Feb 20, 2024 •

edited

Loading

Kasper24 commented Feb 29, 2024 •

edited

Loading

Kasper24 commented Nov 22, 2024 •

edited

Loading