update was needed

1 files changed, 179 insertions, 187 deletions

diff --git a/common/overlays/ioskeleyInput.nix b/common/overlays/ioskeleyInput.nix
index b9e1145..3915f14 100644
--- a/common/overlays/ioskeleyInput.nix
+++ b/common/overlays/ioskeleyInput.nix
@@ -1,195 +1,187 @@
 final: prev: {
   ioskeley-input = prev.iosevka.override {
-    set = "IosevkaInput";
-    privateBuildPlan = {
-      family = "IosevkaInput";
-      spacing = "fixed";
-      serifs = "sans";
-      noLigation = true;
-      exportGlyphNames = false;
+  # set = "Input";
+  privateBuildPlan = ''
+    [buildPlans.IosevkaInput]
+    family = "IosevkaInput"
+    spacing = "fixed"
+    serifs = "sans"
+    exportGlyphNames = false
+    noLigation = true
 
-      variants.design = {
-        one = "base";
-        two = "curly-neck-serifless";
-        three = "flat-top-serifless";
-        four = "closed-serifless";
-        five = "upright-flat-serifless";
-        six = "closed-contour";
-        seven = "straight-serifless";
-        eight = "two-circles";
-        nine = "closed-contour";
-        zero = "oval-long-dotted";
-        capital-a = "straight-serifless";
-        capital-b = "standard-serifless";
-        capital-c = "bilateral-inward-serifed";
-        capital-d = "standard-serifless";
-        capital-e = "serifless";
-        capital-f = "serifless";
-        capital-g = "toothless-corner-serifless-hooked";
-        capital-h = "serifless";
-        capital-i = "serifed";
-        capital-j = "serifless";
-        capital-k = "symmetric-connected-serifless";
-        capital-l = "serifless";
-        capital-m = "hanging-serifless";
-        capital-n = "standard-serifless";
-        capital-p = "closed-serifless";
-        capital-q = "crossing-curly-tailed";
-        capital-r = "straight-serifless";
-        capital-s = "bilateral-inward-serifed";
-        capital-t = "serifless";
-        capital-u = "toothless-rounded-serifless";
-        capital-v = "curly-serifless";
-        capital-w = "straight-vertical-sides-serifless";
-        capital-x = "curly-serifless";
-        capital-y = "curly-serifless";
-        capital-z = "straight-serifed";
-        a = "double-storey-toothless-corner";
-        b = "toothless-corner-serifless";
-        c = "serifless";
-        d = "toothless-corner-serifless";
-        e = "flat-crossbar";
-        f = "flat-hook-serifless-crossbar-at-x-height";
-        g = "double-storey";
-        h = "straight-serifless";
-        i = "zshaped";
-        j = "flat-hook-serifed";
-        k = "straight-serifless";
-        l = "zshaped";
-        m = "earless-rounded-double-arch-short-leg-serifless";
-        n = "earless-corner-straight-serifless";
-        p = "earless-corner-serifless";
-        q = "earless-corner-straight-serifless";
-        r = "earless-corner-serifless";
-        s = "serifless";
-        t = "flat-hook";
-        u = "toothless-corner-serifless";
-        v = "straight-serifless";
-        w = "rounded-vertical-sides-serifless";
-        x = "straight-serifless";
-        y = "straight-turn-serifless";
-        z = "straight-serifless";
-        capital-eszet = "corner-serifless";
-        long-s = "bent-hook-serifless";
-        eszet = "sulzbacher-serifless";
-        lower-eth = "straight-bar";
-        capital-thorn = "serifless";
-        lower-thorn = "serifless";
-        lower-alpha = "crossing";
-        lower-beta = "standard";
-        capital-gamma = "serifless";
-        lower-gamma = "casual";
-        capital-delta = "straight";
-        lower-delta = "flat-top";
-        lower-eta = "earless-corner-serifless";
-        lower-theta = "capsule";
-        lower-iota = "serifed-semi-tailed";
-        lower-kappa = "straight-serifless";
-        capital-lambda = "straight-serifless";
-        lower-lambda = "straight";
-        lower-mu = "toothless-corner-serifless";
-        lower-nu = "casual";
-        lower-xi = "flat-top";
-        lower-pi = "tailless";
-        lower-tau = "semi-tailed";
-        lower-upsilon = "casual-serifless";
-        lower-phi = "cursive";
-        lower-chi = "semi-chancery-straight-serifless";
-        lower-psi = "flat-top-serifless";
-        partial-derivative = "straight-bar";
-        cyrl-a = "single-storey-earless-corner-tailed";
-        cyrl-ve = "standard-serifless";
-        cyrl-capital-zhe = "symmetric-connected";
-        cyrl-zhe = "symmetric-connected";
-        cyrl-capital-ze = "bilateral-inward-serifed";
-        cyrl-ze = "serifless";
-        cyrl-capital-ka = "symmetric-connected-bottom-right-serifed";
-        cyrl-ka = "symmetric-connected-serifless";
-        cyrl-el = "straight";
-        cyrl-em = "flat-bottom-serifless";
-        cyrl-capital-en = "serifed";
-        cyrl-en = "serifless";
-        cyrl-capital-er = "closed-serifed";
-        cyrl-er = "eared-serifed";
-        cyrl-capital-u = "cursive-serifless";
-        cyrl-u = "cursive-serifless";
-        cyrl-ef = "serifless";
-        cyrl-che = "standard";
-        cyrl-yeri = "corner";
-        cyrl-yery = "corner";
-        cyrl-capital-e = "bilateral-inward-serifed";
-        cyrl-e = "serifless";
-        cyrl-capital-ya = "standing-serifless";
-        cyrl-ya = "standing-serifless";
-        tittle = "round";
-        diacritic-dot = "round";
-        punctuation-dot = "round";
-        braille-dot = "square";
-        tilde = "low";
-        asterisk = "hex-low";
-        underscore = "above-baseline";
-        caret = "medium";
-        ascii-grave = "straight";
-        ascii-single-quote = "straight";
-        paren = "normal";
-        brace = "curly-flat-boundary";
-        guillemet = "straight";
-        number-sign = "upright";
-        ampersand = "closed";
-        at = "fourfold";
-        dollar = "through";
-        cent = "through";
-        percent = "rings-continuous-slash";
-        bar = "force-upright";
-        question = "corner";
-        pilcrow = "high";
-        micro-sign = "tailed-serifless";
-        decorative-angle-brackets = "middle";
-      };
+    [buildPlans.IosevkaInput.variants.design]
+    one = "base"
+    two = "curly-neck-serifless"
+    three = "flat-top-serifless"
+    four = "closed-serifless"
+    five = "upright-flat-serifless"
+    six = "closed-contour"
+    seven = "straight-serifless"
+    eight = "two-circles"
+    nine = "closed-contour"
+    zero = "oval-long-dotted"
+    capital-a = "straight-serifless"
+    capital-b = "standard-serifless"
+    capital-c = "bilateral-inward-serifed"
+    capital-d = "standard-serifless"
+    capital-e = "serifless"
+    capital-f = "serifless"
+    capital-g = "toothless-corner-serifless-hooked"
+    capital-h = "serifless"
+    capital-i = "serifed"
+    capital-j = "serifless"
+    capital-k = "symmetric-connected-serifless"
+    capital-l = "serifless"
+    capital-m = "hanging-serifless"
+    capital-n = "standard-serifless"
+    capital-p = "closed-serifless"
+    capital-q = "crossing-curly-tailed"
+    capital-r = "straight-serifless"
+    capital-s = "bilateral-inward-serifed"
+    capital-t = "serifless"
+    capital-u = "toothless-rounded-serifless"
+    capital-v = "curly-serifless"
+    capital-w = "straight-vertical-sides-serifless"
+    capital-x = "curly-serifless"
+    capital-y = "curly-serifless"
+    capital-z = "straight-serifed"
+    a = "double-storey-toothless-corner"
+    b = "toothless-corner-serifless"
+    c = "serifless"
+    d = "toothless-corner-serifless"
+    e = "flat-crossbar"
+    f = "flat-hook-serifless-crossbar-at-x-height"
+    g = "double-storey"
+    h = "straight-serifless"
+    i = "zshaped"
+    j = "flat-hook-serifed"
+    k = "straight-serifless"
+    l = "zshaped"
+    m = "earless-rounded-double-arch-short-leg-serifless"
+    n = "earless-corner-straight-serifless"
+    p = "earless-corner-serifless"
+    q = "earless-corner-straight-serifless"
+    r = "earless-corner-serifless"
+    s = "serifless"
+    t = "flat-hook"
+    u = "toothless-corner-serifless"
+    v = "straight-serifless"
+    w = "rounded-vertical-sides-serifless"
+    x = "straight-serifless"
+    y = "straight-turn-serifless"
+    z = "straight-serifless"
+    capital-eszet = "corner-serifless"
+    long-s = "bent-hook-serifless"
+    eszet = "sulzbacher-serifless"
+    lower-eth = "straight-bar"
+    capital-thorn = "serifless"
+    lower-thorn = "serifless"
+    lower-alpha = "crossing"
+    lower-beta = "standard"
+    capital-gamma = "serifless"
+    lower-gamma = "casual"
+    capital-delta = "straight"
+    lower-delta = "flat-top"
+    lower-eta = "earless-corner-serifless"
+    lower-theta = "capsule"
+    lower-iota = "serifed-semi-tailed"
+    lower-kappa = "straight-serifless"
+    capital-lambda = "straight-serifless"
+    lower-lambda = "straight"
+    lower-mu = "toothless-corner-serifless"
+    lower-nu = "casual"
+    lower-xi = "flat-top"
+    lower-pi = "tailless"
+    lower-tau = "semi-tailed"
+    lower-upsilon = "casual-serifless"
+    lower-phi = "cursive"
+    lower-chi = "semi-chancery-straight-serifless"
+    lower-psi = "flat-top-serifless"
+    partial-derivative = "straight-bar"
+    cyrl-a = "double-storey-hook-inward-serifed-tailed"
+    cyrl-ve = "standard-serifless"
+    cyrl-capital-zhe = "symmetric-connected"
+    cyrl-zhe = "symmetric-connected"
+    cyrl-capital-ze = "bilateral-inward-serifed"
+    cyrl-ze = "serifless"
+    cyrl-capital-ka = "symmetric-connected-bottom-right-serifed"
+    cyrl-ka = "symmetric-connected-serifless"
+    cyrl-el = "straight"
+    cyrl-em = "flat-bottom-serifless"
+    cyrl-capital-en = "serifed"
+    cyrl-en = "serifless"
+    cyrl-capital-er = "closed-serifed"
+    cyrl-er = "eared-serifed"
+    cyrl-capital-u = "cursive-serifless"
+    cyrl-u = "cursive-serifless"
+    cyrl-ef = "serifless"
+    cyrl-che = "standard"
+    cyrl-yeri = "corner"
+    cyrl-yery = "corner"
+    cyrl-capital-e = "bilateral-inward-serifed"
+    cyrl-e = "serifless"
+    cyrl-capital-ya = "standing-serifless"
+    cyrl-ya = "standing-serifless"
+    tittle = "round"
+    diacritic-dot = "round"
+    punctuation-dot = "round"
+    braille-dot = "square"
+    tilde = "low"
+    asterisk = "hex-low"
+    underscore = "above-baseline"
+    caret = "medium"
+    ascii-grave = "straight"
+    ascii-single-quote = "straight"
+    paren = "normal"
+    brace = "curly-flat-boundary"
+    guillemet = "straight"
+    number-sign = "upright"
+    ampersand = "closed"
+    at = "fourfold"
+    dollar = "through"
+    cent = "through"
+    percent = "rings-continuous-slash"
+    bar = "force-upright"
+    question = "corner"
+    pilcrow = "high"
+    micro-sign = "tailed-serifless"
+    decorative-angle-brackets = "middle"
 
-      weights = {
-        W360 = {
-          shape = 360;
-          menu = 360;
-          css = 360;
-        };
-        Heavy = {
-          shape = 900;
-          menu = 900;
-          css = 900;
-        };
-      };
+    [buildPlans.IosevkaInput.weights.W360]
+    shape = 360
+    menu = 360
+    css = 360
 
-      slopes = {
-        Upright = {
-          angle = 0;
-          shape = "upright";
-          menu = "upright";
-          css = "normal";
-        };
-        Oblique = {
-          angle = 15;
-          shape = "oblique";
-          menu = "oblique";
-          css = "oblique";
-        };
-      };
+    [buildPlans.IosevkaInput.weights.Heavy]
+    shape = 900
+    menu = 900
+    css = 900
 
-      widths.Normal = {
-        shape = 575;
-        menu = 5;
-        css = "normal";
-      };
+    [buildPlans.IosevkaInput.slopes.Upright]
+    angle = 0
+    shape = "upright"
+    menu = "upright"
+    css = "normal"
 
-      metricOverride = {
-        leading = 1100;
-        parenSize = 950;
-        cap = 800;
-        ascender = 800;
-        xHeight = 600;
-        dotSize = "blend(weight, [100, 50], [360, 140], [900, 190])";
-        periodSize = "blend(weight, [100, 55], [360, 160], [900, 215])";
-      };
-    };
-  };
+    [buildPlans.IosevkaInput.slopes.Oblique]
+    angle = 15
+    shape = "oblique"
+    menu = "oblique"
+    css = "oblique"
+
+    [buildPlans.IosevkaInput.widths.Normal]
+    shape = 575
+    menu = 5
+    css = "normal"
+
+    [buildPlans.IosevkaInput.metricOverride]
+    leading = 1100
+    parenSize = 950
+    cap = 800
+    ascender = 800
+    xHeight = 600
+    dotSize = "blend(weight, [100, 50], [360, 140], [900, 190])"
+    periodSize = "blend(weight, [100, 55], [360, 160], [900, 215])"
+  '';
+};
 }