plumjam/nixos - Change AFZGWREHKFKOPC56DWX4PTWR2EM2PUEXESLTHMZ5SQDHRZ6DPRDQC

treewide.theme: Simplify and deduplicate theme system.

Created by PlumJam on February 5, 2026

AFZGWREHKFKOPC56DWX4PTWR2EM2PUEXESLTHMZ5SQDHRZ6DPRDQC

Dependencies

In channels

main

Change contents

Replacement in modules/window-manager.nix at line 36 [10.63765]

B:BD[8.393] → [8.393:454]

                opacity ${toString cfg.theme.opacity.opaque}

[8.393]

[8.454]

                opacity 1.0

Replacement in modules/window-manager.nix at line 44 [10.63765]

B:BD[8.758] → [8.758:819]

                opacity ${toString cfg.theme.opacity.opaque}

[8.758]

[8.819]

                opacity 1.0

Replacement in modules/window-manager.nix at line 50 [10.63765]

B:BD[8.965] → [8.965:1026]

                opacity ${toString cfg.theme.opacity.opaque}

[8.965]

[8.1026]

                opacity 1.0

Replacement in modules/window-manager.nix at line 59 [10.63765]

B:BD[8.1203] → [8.1203:1264]

                opacity ${toString cfg.theme.opacity.opaque}

[8.1203]

[8.1264]

                opacity 1.0

Replacement in modules/window-manager.nix at line 87 [10.63765]

B:BD[8.2006] → [8.2006:2067]

                opacity ${toString cfg.theme.opacity.opaque}

[8.2006]

[11.1556]

                opacity 1.0

Replacement in modules/window-manager.nix at line 92 [10.63765]

B:BD[8.2155] → [8.2155:2216]

                opacity ${toString cfg.theme.opacity.opaque}

[8.2155]

[8.2216]

                opacity 1.0

Replacement in modules/window-manager.nix at line 165 [10.63765]

B:BD[8.4262] → [8.4262:4336]

              //     duration-ms ${toString cfg.theme.duration.ms.normal}

[8.4262]

[8.4336]

              //     duration-ms 150

Replacement in modules/window-manager.nix at line 170 [10.63765]

B:BD[8.4435] → [8.4435:4508]

              //     duration-ms ${toString cfg.theme.duration.ms.short}

[8.4435]

[8.4508]

              //     duration-ms 150

Replacement in modules/theme.nix at line 4 [14.82]
∅:D[12.110] → [13.296:331]
B:BD[13.296] → [13.296:331]
```
  inherit (lib.attrsets) mapAttrs;
```
[12.110]
[13.331]
```
  inherit (lib.attrsets) mapAttrs listToAttrs elemAt;
```
Deletion in modules/theme.nix at line 7 [14.82]
B:BD[13.399] → [2.77:122]
```
  inherit (lib.attrsets) listToAttrs elemAt;
```
Deletion in modules/theme.nix at line 55 [14.82]
∅:D[2.705] → [14.1481:1482]
B:BD[14.1481] → [14.1481:1482]
B:BD[14.1482] → [15.1517:1601]
```
      pywalColorsRaw = if pathExists pywalCache then readFile pywalCache else null;
```

Replacement in modules/theme.nix at line 57 [14.82]

B:BD[15.1622] → [15.1622:1718]

        if pywalColorsRaw != null then parsePywalColors pywalColorsRaw else gruvboxColors.dark;

[15.1622]

[14.1713]

        if pathExists pywalCache then parsePywalColors (readFile pywalCache) else gruvboxColors.dark;

Replacement in modules/theme.nix at line 122 [14.82]

B:BD[9.175] → [9.175:281]

          size.small = 12;
          size.term = 12;
          size.normal = 16;
          size.big = 20;

[9.175]

[9.281]

          size.normal = 12;
          size.big = 16;

Deletion in modules/theme.nix at line 135 [14.82]
B:BD[14.3295] → [16.76:95]
```
          off = 0;
```
Replacement in modules/theme.nix at line 137 [14.82]
B:BD[14.3338] → [14.3338:3380]
```
          big = 6;
          verybig = 8;
```
[14.3338]
[14.3380]
```
          big = 8;
```
Deletion in modules/theme.nix at line 143 [14.82]
B:BD[14.3454] → [14.3454:3473]
```
          big = 6;
```
Deletion in modules/theme.nix at line 148 [14.82]
B:BD[14.3547] → [14.3547:3567]
```
          big = 32;
```

Deletion in modules/theme.nix at line 153 [14.82]

B:BD[14.3642] → [14.3642:4064]

        };
        opacity = {
          opaque = 1.00;
          veryhigh = 0.99;
          high = 0.97;
          medium = 0.94;
          low = 0.90;
          verylow = 0.80;
        };
        duration = {
          s = {
            short = 0.5;
            normal = 1.0;
            long = 1.5;
          };
          ms = {
            short = 150;
            normal = 200;
            long = 300;
          };

Replacement in modules/theme.nix at line 224 [14.82]
B:BD[14.5725] → [14.5725:5730]
B:BD[14.5730] → [17.3930:3961]
```
in
{
  flake.modules.darwin.theme =
```
[14.5725]
[17.3961]
```
  # Shared theme module configuration (used by both nixos and darwin)
  themeModule =
```

Insertion in modules/theme.nix at line 229 [14.82]

[17.4035]

      themedApps = [
        "icons"
        "alacritty"
        "ghostty"
        "rio"
        "zellij"
        "starship"
        "vivid"
        "nushell"
        "helix"
        "gtk"
        "qt"
      ];

Replacement in modules/theme.nix at line 251 [14.82]

B:BD[17.4205] → [17.4205:5083]

        theme = theme.designSystem // {
          inherit (theme)
            themes
            isDark
            colorScheme
            variant
            colors
            ;
          withHash = mapAttrs (_name: value: "#${value}") theme.colors;
          with0x = mapAttrs (_name: value: "0x${value}") theme.colors;
          withRgb = mapAttrs (_name: value: theme.hexToRgb value) theme.colors;
          icons = theme.getTheme "icons";
          alacritty = theme.getTheme "alacritty";
          ghostty = theme.getTheme "ghostty";
          rio = theme.getTheme "rio";
          zellij = theme.getTheme "zellij";
          starship = theme.getTheme "starship";
          vivid = theme.getTheme "vivid";
          nushell = theme.getTheme "nushell";
          helix = theme.getTheme "helix";
          gtk = theme.getTheme "gtk";
          qt = theme.getTheme "qt";

[17.4205]

[17.5245]

        theme =
          theme.designSystem
          // {
            inherit (theme)
              themes
              isDark
              colorScheme
              variant
              colors
              ;

Replacement in modules/theme.nix at line 262 [14.82]

B:BD[17.5498] → [17.5498:5509]

};

[17.5246]

[17.5509]

            withHash = mapAttrs (_: v: "#${v}") theme.colors;
            with0x = mapAttrs (_: v: "0x${v}") theme.colors;
            withRgb = mapAttrs (_: v: theme.hexToRgb v) theme.colors;
          }
          // (listToAttrs (
            map (app: {
              name = app;
              value = theme.getTheme app;
            }) themedApps
          ));

Deletion in modules/theme.nix at line 274 [14.82]
B:BD[17.5525] → [17.5525:5526]
∅:D[17.5526] → [18.800:830]
B:BD[14.8408] → [18.800:830]
B:BD[18.830] → [3.106:125]
∅:D[19.100] → [14.8472:8480]
∅:D[3.125] → [14.8472:8480]
∅:D[12.168] → [14.8472:8480]
B:BD[14.8472] → [14.8472:8480]
B:BD[14.8480] → [13.1153:1200]
∅:D[13.1200] → [14.8531:8577]
B:BD[14.8531] → [14.8531:8577]
B:BD[14.8577] → [13.1201:1223]
∅:D[13.1223] → [14.8605:8689]
B:BD[14.8605] → [14.8605:8689]
```
  flake.modules.nixos.theme =
    { pkgs, ... }:
    let
      theme = mkThemeConfig { inherit pkgs; };
    in
    {
      options.theme = mkOption {
        type = attrs;
        default = { };
        description = "Global theme configuration";
      };
```

Replacement in modules/theme.nix at line 275 [14.82]

B:BD[14.8690] → [12.169:186]

∅:D[12.186] → [15.2685:2725]

B:BD[14.8784] → [15.2685:2725]

∅:D[15.2725] → [20.291:336]

B:BD[14.8825] → [20.291:336]

B:BD[20.336] → [15.2726:2769]

∅:D[15.2769] → [20.381:434]

B:BD[20.381] → [20.381:434]

      config = {
        theme = theme.designSystem // {
          inherit (theme)
            themes
            isDark
            colorScheme
            variant
            colors
            ;

[14.8690]

[14.8973]

in
{
  flake.modules.darwin.theme = themeModule;
  flake.modules.nixos.theme = themeModule;

Deletion in modules/theme.nix at line 280 [14.82]

B:BD[14.8974] → [21.299:522]

∅:D[21.522] → [14.9206:9207]

∅:D[13.1444] → [14.9206:9207]

B:BD[14.9206] → [14.9206:9207]

B:BD[14.9207] → [15.2770:3242]

B:BD[14.10111] → [14.10111:10139]

          withHash = mapAttrs (_name: value: "#${value}") theme.colors;
          with0x = mapAttrs (_name: value: "0x${value}") theme.colors;
          withRgb = mapAttrs (_name: value: theme.hexToRgb value) theme.colors;
          icons = theme.getTheme "icons";
          alacritty = theme.getTheme "alacritty";
          ghostty = theme.getTheme "ghostty";
          rio = theme.getTheme "rio";
          zellij = theme.getTheme "zellij";
          starship = theme.getTheme "starship";
          vivid = theme.getTheme "vivid";
          nushell = theme.getTheme "nushell";
          helix = theme.getTheme "helix";
          gtk = theme.getTheme "gtk";
          qt = theme.getTheme "qt";
        };
      };
    };

Replacement in modules/status-bar.nix at line 33 [10.3517]
B:BD[22.413] → [22.413:465]
```
            "height": ${toString theme.margin.big},
```
[22.413]
[23.272]
```
            "height": 32,
```

Replacement in modules/status-bar.nix at line 166 [10.3517]

B:BD[10.8134] → [10.8134:8194]

            font-size: ${toString theme.font.size.small}px;

[10.8134]

[10.8194]

            font-size: ${toString theme.font.size.normal}px;

Replacement in modules/kitty.nix at line 24 [10.80532]

B:BD[6.516] → [6.516:558]

        font_size = theme.font.size.term;

[6.516]

[6.558]

        font_size = theme.font.size.normal;

Replacement in modules/ghostty.nix at line 43 [24.118]
B:BD[7.908] → [7.908:944]
```
        font-size = font.size.term;
```
[7.908]
[7.944]
```
        font-size = font.size.normal;
```

Replacement in modules/desktop-gui.nix at line 39 [10.99309]

B:BD[5.383] → [5.383:465]

          gtk-font-name=${theme.font.sans.name} ${toString theme.font.size.small}

[5.383]

[5.465]

          gtk-font-name=${theme.font.sans.name} ${toString theme.font.size.normal}

Replacement in modules/desktop-gui.nix at line 47 [10.99309]

B:BD[5.660] → [5.660:742]

          gtk-font-name=${theme.font.sans.name} ${toString theme.font.size.small}

[5.660]

[5.742]

          gtk-font-name=${theme.font.sans.name} ${toString theme.font.size.normal}

Replacement in modules/app-launcher.nix at line 18 [10.106323]

B:BD[10.106527] → [10.106527:106598]

          font = "${font.sans.name}:size=${toString font.size.small}";

[10.106527]

[10.106598]

          font = "${font.sans.name}:size=${toString font.size.normal}";

Replacement in modules/app-launcher.nix at line 38 [10.106323]
∅:D[4.378] → [10.107255:107290]
B:BD[10.107255] → [10.107255:107290]
```
          radius = radius.verybig;
```
[4.378]
[10.107290]
```
          radius = radius.big;
```

Replacement in modules/_to-migrate/foot.nix at line 11 [25.26048]

B:BD[13.16424] → [13.16424:16486]

            font = "${mono.name}:size=${toString size.term}";

[13.16424]

[13.16486]

            font = "${mono.name}:size=${toString size.normal}";

treewide.theme: Simplify and deduplicate theme system.

Dependencies

In channels

Change contents

Replacement in modules/window-manager.nix at line 36 [10.63765]

Replacement in modules/window-manager.nix at line 44 [10.63765]

Replacement in modules/window-manager.nix at line 50 [10.63765]

Replacement in modules/window-manager.nix at line 59 [10.63765]

Replacement in modules/window-manager.nix at line 87 [10.63765]

Replacement in modules/window-manager.nix at line 92 [10.63765]

Replacement in modules/window-manager.nix at line 165 [10.63765]

Replacement in modules/window-manager.nix at line 170 [10.63765]

Replacement in modules/theme.nix at line 4 [14.82]

Deletion in modules/theme.nix at line 7 [14.82]

Deletion in modules/theme.nix at line 55 [14.82]

Replacement in modules/theme.nix at line 57 [14.82]

Replacement in modules/theme.nix at line 122 [14.82]

Deletion in modules/theme.nix at line 135 [14.82]

Replacement in modules/theme.nix at line 137 [14.82]

Deletion in modules/theme.nix at line 143 [14.82]

Deletion in modules/theme.nix at line 148 [14.82]