diff --git a/darwin/general.nix b/darwin/general.nix index 38c7921..593ac0a 100644 --- a/darwin/general.nix +++ b/darwin/general.nix @@ -7,6 +7,7 @@ fonts.fontDir.enable = true; fonts.fonts = with pkgs; [ borg-sans-mono + ia-writer-family inter recursive source-sans-pro @@ -15,7 +16,6 @@ enableWindowsFonts = false; fonts = [ "CascadiaCode" - "iA-Writer" "Inconsolata" "FiraCode" "Lilex" diff --git a/flake.lock b/flake.lock index 4c3e306..7d6a879 100644 --- a/flake.lock +++ b/flake.lock @@ -305,6 +305,22 @@ "type": "github" } }, + "ia-writer-family-src": { + "flake": false, + "locked": { + "lastModified": 1663752357, + "narHash": "sha256-sgYsOn6iXE9f0hlDZX1uA3WnTAY1zc5/U9JOcjn5uGw=", + "owner": "iaolo", + "repo": "iA-Fonts", + "rev": "8548eea983611993db2d6f65bd3ae1609f62dcbd", + "type": "github" + }, + "original": { + "owner": "iaolo", + "repo": "iA-Fonts", + "type": "github" + } + }, "kitty-icon": { "flake": false, "locked": { @@ -459,6 +475,7 @@ "home-manager": "home-manager", "home-manager-atemu": "home-manager-atemu", "homebrew-enabled": "homebrew-enabled", + "ia-writer-family-src": "ia-writer-family-src", "kitty-icon": "kitty-icon", "kitty-themes": "kitty-themes", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 745ab06..5a4062c 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,8 @@ helix.inputs.nixpkgs.follows = "nixpkgs-unstable"; dark-mode-notify-src.url = "github:bouk/dark-mode-notify"; dark-mode-notify-src.flake = false; + ia-writer-family-src.url = "github:iaolo/iA-Fonts"; + ia-writer-family-src.flake = false; kitty-icon.url = "github:DinkDonk/kitty-icon"; kitty-icon.flake = false; kitty-themes.url = "github:kovidgoyal/kitty-themes"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 083ed79..6148c06 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,6 +4,7 @@ sdkVersion = "14.1"; inherit (inputs) dark-mode-notify-src; }; + ia-writer-family = callPackage ./ia-writer-family.nix { inherit (inputs) ia-writer-family-src; }; helix-flake = inputs.helix.packages.${system}.default; yubiswitch = callPackage ./yubiswitch.nix { }; } diff --git a/pkgs/ia-writer-family.nix b/pkgs/ia-writer-family.nix new file mode 100644 index 0000000..8bc5745 --- /dev/null +++ b/pkgs/ia-writer-family.nix @@ -0,0 +1,24 @@ +{ ia-writer-family-src, lib, stdenv }: + +let + version = "20181224"; +in +stdenv.mkDerivation { + name = "ia-writer-family-${version}"; + + src = ia-writer-family-src; + + installPhase = '' + ls + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/fonts/truetype + cp "iA Writer Duospace/OTF (Mac)/"*.otf $out/share/fonts/opentype/ + cp "iA Writer "{Mono,Duo,Quattro}/Variable/*.ttf $out/share/fonts/truetype/ + ''; + + meta = with lib; { + description = "iA Writer Typeface Family"; + license = licenses.ofl; + platforms = platforms.all; + }; +}