Miscellaneous updates

Update flake inputs for newer version of Iosevka

Fix lower-chi in build plan: semi-chancery-straight ->
semi-chancery-straight-serifless

Rename default.nix -> derivation.nix

Add Iosevka Etoile back again, simply slab variant of Aile

Move names to separate files so they can be reused in both font
definition and names output of flake

Makefile

@@ -1,7 +1,9 @@
 .PHONY: build copy
 
 build:
-	nix build --max-jobs 1 .#iosevka-custom-aile	\
+	nix build --max-jobs 1 \
+		.#iosevka-custom-aile \
+		.#iosevka-custom-etoile \
 		.#iosevka-custom-nerdfont
 
 copy: build

custom-build-plan.nix

@@ -1,5 +1,5 @@
 {
-  noCvSs = true;
+  noCvSs = false;
   exportGlyphNames = false;
   ligations.inherits = "dlig";
   weights = {
@@ -42,7 +42,7 @@
     lower-delta = "flat-top";
     lower-lambda = "tailed-turn";
     lower-xi = "flat-top";
-    lower-chi = "semi-chancery-straight";
+    lower-chi = "semi-chancery-straight-serifless";
     zero = "tall-slashed";
     one = "no-base";
     two = "straight-neck-serifless";

default.nix

@@ -1,37 +0,0 @@
-{
-  stdenv,
-  iosevka,
-  nerd-font-patcher,
-}: let
-  customBuildPlan = import ./custom-build-plan.nix;
-in {
-  iosevka-custom-aile = iosevka.override {
-    set = "aile";
-    privateBuildPlan = {
-      inherit (customBuildPlan) noCvSs exportGlyphNames variants weights;
-      family = "Iosevka Custom Aile";
-      spacing = "quasi-proportional";
-      serifs = "sans";
-    };
-  };
-  iosevka-custom-nerdfont = let
-    monospace = iosevka.override {
-      set = "custom";
-      privateBuildPlan = {
-        inherit (customBuildPlan) noCvSs exportGlyphNames variants weights;
-        family = "Iosevka Custom";
-        spacing = "normal";
-        serifs = "sans";
-      };
-    };
-  in
-    stdenv.mkDerivation {
-      name = "${monospace.name}-nerd-font-patched";
-      src = monospace;
-      nativeBuildInputs = [nerd-font-patcher];
-      buildPhase = ''
-        find \( -name \*.ttf -o -name \*.otf \) -execdir nerd-font-patcher -c {} \;
-      '';
-      installPhase = "cp -a . $out";
-    };
-}

derivation.nix

@@ -0,0 +1,47 @@
+{
+  stdenv,
+  iosevka,
+  nerd-font-patcher,
+}:
+let
+  custom-build-plan = import ./custom-build-plan.nix;
+  names = import ./names.nix;
+in
+{
+  iosevka-custom-aile = iosevka.override {
+    set = "aile";
+    privateBuildPlan = custom-build-plan // {
+      family = names.iosevka-custom-aile;
+      spacing = "quasi-proportional";
+      serifs = "sans";
+    };
+  };
+  iosevka-custom-etoile = iosevka.override {
+    set = "etoile";
+    privateBuildPlan = custom-build-plan // {
+      family = names.iosevka-custom-etoile;
+      spacing = "quasi-proportional";
+      serifs = "slab";
+    };
+  };
+  iosevka-custom-nerdfont =
+    let
+      monospace = iosevka.override {
+        set = "custom";
+        privateBuildPlan = custom-build-plan // {
+          family = names.iosevka-custom-nerdfont;
+          spacing = "normal";
+          serifs = "sans";
+        };
+      };
+    in
+    stdenv.mkDerivation {
+      name = "${monospace.name}-nerd-font-patched";
+      src = monospace;
+      nativeBuildInputs = [ nerd-font-patcher ];
+      buildPhase = ''
+        find \( -name \*.ttf -o -name \*.otf \) -execdir nerd-font-patcher -c {} \;
+      '';
+      installPhase = "cp -a . $out";
+    };
+}

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717602782,
+        "lastModified": 1726937504,
-        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
+        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
+        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,30 +2,26 @@
   description = "My customised build of Iosevka font";
 
   nixConfig = {
-    extra-substituters = ["https://nix.xenia.me.uk"];
+    extra-substituters = [ "https://nix.xenia.me.uk" ];
-    extra-trusted-public-keys = ["nix.xenia.me.uk:VaQu+8hshk7aSbW3z91pgkKbYeAcO3Q0AomqP8RaaLc="];
+    extra-trusted-public-keys = [ "nix.xenia.me.uk:VaQu+8hshk7aSbW3z91pgkKbYeAcO3Q0AomqP8RaaLc=" ];
   };
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
   };
 
-  outputs = {
+  outputs =
-    self,
+    { nixpkgs, ... }:
-    nixpkgs,
+    let
-  }: let
+      system = "x86_64-linux";
-    system = "x86_64-linux";
+      pkgs = import nixpkgs { inherit system; };
-    pkgs = import nixpkgs {inherit system;};
+      result = pkgs.callPackage ./derivation.nix { };
-  in {
+    in
-    names = {
+    {
-      iosevka-custom-aile = "Iosevka Custom Aile";
+      names = import ./names.nix;
-      iosevka-custom-nerdfont = "IosevkaCustomNerdFont";
+      packages.${system} = {
+        inherit (result) iosevka-custom-aile iosevka-custom-etoile iosevka-custom-nerdfont;
+        default = result.iosevka-custom-nerdfont;
+      };
     };
-    packages.${system} = let
-      inherit (pkgs.callPackage ./default.nix {}) iosevka-custom-aile iosevka-custom-nerdfont;
-    in {
-      inherit iosevka-custom-aile iosevka-custom-nerdfont;
-      default = iosevka-custom-nerdfont;
-    };
-  };
 }

names.nix

@@ -0,0 +1,5 @@
+{
+  iosevka-custom-aile = "Iosevka Custom Aile";
+  iosevka-custom-etoile = "Iosevka Custom Etoile";
+  iosevka-custom-nerdfont = "IosevkaCustomNerdFont";
+}