treewide: swatch proposal

stylix/darwin/default.nix

@@ -11,6 +11,7 @@ in {
     ../target.nix
     ./fonts.nix
     (import ./palette.nix { inherit palette-generator base16; })
+    (import ../swatches.nix { inherit base16; })
     (import ../templates.nix inputs)
   ] ++ autoload;
 

stylix/hm/default.nix

@@ -12,6 +12,7 @@ in {
     ./cursor.nix
     ./fonts.nix
     (import ./palette.nix { inherit palette-generator base16; })
+    (import ../swatches.nix { inherit base16; })
     (import ../templates.nix inputs)
   ] ++ autoload;
 }

stylix/nixos/default.nix

@@ -13,6 +13,7 @@ in {
     ./cursor.nix
     ./fonts.nix
     (import ./palette.nix { inherit palette-generator base16; })
+    (import ../swatches.nix { inherit base16; })
     (import ../templates.nix inputs)
   ] ++ autoload;
 

stylix/swatches.nix

@@ -0,0 +1,239 @@
+{ base16, ... }: { config, lib, ... }:
+
+let
+
+  inherit (lib) findFirst foldl' getAttrFromPath hasAttrByPath hasSuffix literalMD mapAttrsRecursive max mdDoc min mkOption pipe removeSuffix setAttrByPath splitString stringToCharacters toHexString ;
+
+  inherit (lib.types) attrs attrsOf lines nullOr oneOf path submodule;
+
+  inherit (lib.types.numbers) between;
+
+  inherit (builtins) attrNames elem elemAt filter hasAttr listToAttrs typeOf;
+
+  constrainU8 = num: min (max num 0) 255;
+
+  hex01 = {
+    "0" = 0;
+    "1" = 1;
+    "2" = 2;
+    "3" = 3;
+    "4" = 4;
+    "5" = 5;
+    "6" = 6;
+    "7" = 7;
+    "8" = 8;
+    "9" = 9;
+    "a" = 10;
+    "b" = 11;
+    "c" = 12;
+    "d" = 13;
+    "e" = 14;
+    "f" = 15;
+    "A" = 10;
+    "B" = 11;
+    "C" = 12;
+    "D" = 13;
+    "E" = 14;
+    "F" = 15;
+  };
+
+  hex10 = {
+    "0" = 0;
+    "1" = 16;
+    "2" = 32;
+    "3" = 48;
+    "4" = 64;
+    "5" = 80;
+    "6" = 96;
+    "7" = 112;
+    "8" = 128;
+    "9" = 144;
+    "a" = 160;
+    "b" = 176;
+    "c" = 192;
+    "d" = 208;
+    "e" = 224;
+    "f" = 240;
+    "A" = 160;
+    "B" = 176;
+    "C" = 192;
+    "D" = 208;
+    "E" = 224;
+    "F" = 240;
+  };
+
+  to2HexStr = num: pipe num [
+    toHexString
+    (str: if num < 10 then "0" + str else str)
+  ];
+
+  genBaseAttrs = fn: listToAttrs (map (base: rec {
+    name = "base${base}";
+    value = fn name;
+  }) [
+    "00" "01" "02" "03" "04" "05" "06" "07"
+    "08" "09" "0A" "0B" "0C" "0D" "0E" "0F"
+  ]);
+
+  hexToRgb = str: pipe str [
+    (str: stringToCharacters str)
+    (chars: {
+      red = hex10.${elemAt chars 0} + hex01.${elemAt chars 1};
+      green = hex10.${elemAt chars 2} + hex01.${elemAt chars 3};
+      blue = hex10.${elemAt chars 4} + hex01.${elemAt chars 5};
+    })
+  ];
+
+  nestSwatchAttrs = path:
+    pipe path [
+      (toString)
+      (splitString "/")
+      (lib.last)
+      (removeSuffix ".nix")
+      (splitString "-")
+      (strs: setAttrByPath strs path)
+    ];
+
+  findSwatchFiles = (filter (hasSuffix ".nix") (lib.filesystem.listFilesRecursive ../swatches));
+
+  swatchGenerators =  { swatches = foldl' (acc: path: lib.recursiveUpdate acc (nestSwatchAttrs path)) {} findSwatchFiles; };
+
+  blendFactor = config.stylix.blendFactor;
+
+  wrappedColor = color: rec {
+    inherit (color) red blue green;
+    asRgbDec = "rgb(${toString red}, ${toString green}, ${toString blue})";
+    asRgbaDec = alphaDec: "rgba(${toString red}, ${toString green}, ${toString blue}, ${toString alphaDec})";
+    asHex = "${to2HexStr red}${to2HexStr green}${to2HexStr blue}";
+    asHexWithHash = "#${asHex}";
+    asHexAlpha = alphaHex: "${asHex}${alphaHex}";
+    asHexAlphaWithHash = alphaHex: "#${asHex}${alphaHex}";
+    asDecInt = red * 256 + green * 16 + blue;
+    asDecIntAlpha = decAlpha: asDecInt * 16 + decAlpha;
+    newFactored = factor: wrappedColor {
+      red = constrainU8 (red * factor);
+      green = constrainU8 (green * factor);
+      blue = constrainU8 (blue * factor);
+    };
+    newBlended = toBlend: wrappedColor {
+      red = constrainU8 ((red + toBlend.red) / 2);
+      green = constrainU8 ((green + toBlend.green) / 2);
+      blue = constrainU8 ((blue + toBlend.blue) / 2);
+    };
+    newBrighter = newFactored (blendFactor + 1.0);
+    newDarker = newFactored blendFactor;
+  };
+
+  wrappedSwatch = swatch: let
+    wrapped = hasAttr "asHex" swatch.foreground;
+  in rec {
+    foreground = if wrapped then swatch.foreground else wrappedColor swatch.foreground;
+    background = if wrapped then swatch.background else wrappedColor swatch.background;
+    outline = if wrapped then swatch.outline else wrappedColor swatch.outline;
+    newFactored = factor: wrappedSwatch {
+      foreground = foreground.newFactored factor;
+      background = background.newFactored factor;
+      outline = outline.newFactored factor;
+    };
+    newBlended = color: wrappedSwatch {
+      foreground = foreground.newBlended color;
+      background = background.newBlended color;
+      outline = outline.newBlended color;
+    };
+    newBrighter = color: newFactored (blendFactor + 1.0);
+    newDarker = color: newFactored blendFactor;
+  };
+
+  getSwatches = targetOrder: let
+      type = typeOf targetOrder;
+      target = if type == "list" then
+        findFirst (check: elem check (attrNames config.stylix.swatches)) "default" targetOrder
+      else if type == "string" then
+        if hasAttr targetOrder config.stylix.swatches then
+          targetOrder
+        else
+          "default"
+      else
+        "default";
+    in
+      getSwatchesFromOpts target;
+
+  getSwatchesFromOpts = target: let
+    opts = config.stylix.swatches.${target};
+    override = opts.override;
+    scheme = if opts.base16Scheme == null then
+      config.stylix.base16Scheme
+    else
+      opts.base16Scheme;
+    colors = if (findFirst (hasSuffix "base") null (attrNames override)) != null then
+          if scheme == config.stylix.base16Scheme then
+            config.lib.stylix.colors
+          else
+            base16.mkSchemeAttrs scheme
+        else
+          (base16.mkSchemeAttrs scheme).override override;
+    args = {
+      inherit lib config;
+      inherit (config.stylix) polarity;
+      colors = genBaseAttrs (base: hexToRgb colors.${base});
+      mkSwatch = foreground: background: outline: wrappedSwatch { inherit foreground background outline; };
+    };
+  in (mapAttrsRecursive (path: value:
+    if (hasAttrByPath path override) then
+      (getAttrFromPath path override) args
+    else
+      import value args
+  ) swatchGenerators) // { inherit colors; };
+
+in {
+  config = {
+    lib.stylix = {
+      inherit
+        swatchGenerators
+        hexToRgb
+        getSwatches;
+    };
+    stylix.swatches.default = {};
+  };
+
+  options.stylix = {
+    swatches = mkOption {
+      type = attrsOf (submodule {
+        options = {
+          base16Scheme = mkOption {
+            description = mdDoc ''
+              The scheme for the swatches.
+
+              This can be a path to a file, a string of YAML, or an attribute set.
+            '';
+            type = nullOr (oneOf [ path lines attrs ]);
+            default = null;
+            defaultText = literalMD ''
+              The colors used in the theming.
+
+              Those are automatically selected from the background image by default,
+              but could be overridden manually.
+            '';
+          };
+          override = mkOption {
+            description = mdDoc ''
+              An override that will be both be applied to the swatches' base16Scheme when generating
+              the $'{swatch}.colors,
+
+              Takes anything that a scheme generated by base16nix can take as argument
+              to override.
+            '';
+            type = attrs;
+            default = {};
+          };
+        };
+      });
+      description = "Attr set containing base16Schemes and overrides to build swatches from";
+    };
+    colors.blendFactor = lib.mkOption {
+      type = between 0 1;
+      description = mdDoc "Default amount to blend incremental highlights/color changes by. Range of 0.0 - 1.0.";
+      default = 0.2;
+    };
+  };
+}

swatches/tab-active-hovered.nix

@@ -0,0 +1 @@
+{ colors, mkSwatch, ... }: with colors; mkSwatch base00 base05 base03

swatches/tab-active-unhovered.nix

@@ -0,0 +1 @@
+{ colors, mkSwatch, ... }: with colors; mkSwatch base05 base03 base02