From eb4cb1c3672dda182582b307dc740b5b384f0a86 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:06:23 +0800
Subject: [PATCH] chore(fonts): update

---
 flake.lock                 | 48 +++++++++++++++++++-------------------
 home/fonts.nix             |  5 ++--
 modules/homebrew.nix       |  5 +++-
 overlays/ryan-mono-bin.nix | 10 ++++----
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index 603d7cd..23984c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694401087,
-        "narHash": "sha256-caHN3IemZMTsaH7J0AyhIbvXjie2iJUlmWSuXcht2k8=",
+        "lastModified": 1694611702,
+        "narHash": "sha256-lMf0iLYHKJqclNYI9JkWpw1VKBL0WnOMeENuChKFIB0=",
         "owner": "ryanccn",
         "repo": "am",
-        "rev": "e61ba0ce88183d680e20e23762dbd1bb0ed0df7b",
+        "rev": "3fcc5fece4831e8461429bfa0111b2b039a677e2",
         "type": "github"
       },
       "original": {
@@ -127,11 +127,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1694326764,
-        "narHash": "sha256-qNCKsVu9qxootyx/00MnUHHTNg+Zk4FKU0LLVlOddVI=",
+        "lastModified": 1694586081,
+        "narHash": "sha256-DNAohcMcTJNiFJ2hTTS6R+yaqVU+QVzp1uRsz0Ctiac=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "7d054170988547aadae58d146e51b9e9dcc95ba0",
+        "rev": "b16b1f21654b9490c662f6fd0a8fe3774a4b1606",
         "type": "github"
       },
       "original": {
@@ -188,11 +188,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1692799911,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -208,11 +208,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694375657,
-        "narHash": "sha256-32X8dcty4vPXx+D4yJPQZBo5hJ1NQikALhevGv6elO4=",
+        "lastModified": 1694585439,
+        "narHash": "sha256-70BlfEsdURx5f8sioj8JuM+R4/SZFyE8UYrULMknxlI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f7848d3e5f15ed02e3f286029697e41ee31662d7",
+        "rev": "a0ddf43b6268f1717afcda54133dea30435eb178",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692248770,
-        "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
+        "lastModified": 1694497842,
+        "narHash": "sha256-z03v/m0OwcLBok97KcUgMl8ZFw5Xwsi2z+n6nL7JdXY=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
+        "rev": "4496ab26628c5f43d2a5c577a06683c753e32fe2",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694343207,
-        "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=",
+        "lastModified": 1694593561,
+        "narHash": "sha256-WSaIQZ5s9N9bDFkEMTw6P9eaZ9bv39ZhsiW12GtTNM0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "78058d810644f5ed276804ce7ea9e82d92bee293",
+        "rev": "1697b7d480449b01111e352021f46e5879e47643",
         "type": "github"
       },
       "original": {
@@ -338,11 +338,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1694264019,
-        "narHash": "sha256-wVKOQWx9CYJRRA1F6UMxVh4F//Ns4rO8DIb3jW60yEw=",
+        "lastModified": 1694553088,
+        "narHash": "sha256-vnPa/OueHI+Dx7NKB34f5SI7Mmz/VSrP+IAoGNKueU0=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "994df3d6a31d39f11600f30a6df0b744b13937c1",
+        "rev": "15e13561499dbe90ef07cf37a90c1cedafc53e28",
         "type": "github"
       },
       "original": {
@@ -362,11 +362,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694398298,
-        "narHash": "sha256-Hi904+2V5DJhFdEy9DcARSRrGJOlYSILHUC6CgTtuZU=",
+        "lastModified": 1694571081,
+        "narHash": "sha256-VRA+gxhe4aciWTQ5uCKVY2ubOclk18h2aRlLzPbLqMw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6c520f2e31f4bebeb29cc4563543de7187013575",
+        "rev": "0282ed291f0e25f30770df5d3f1ca33908ce44a4",
         "type": "github"
       },
       "original": {
diff --git a/home/fonts.nix b/home/fonts.nix
index 339e658..0e25ab4 100644
--- a/home/fonts.nix
+++ b/home/fonts.nix
@@ -4,9 +4,10 @@
     public-sans
     inriafonts
     ibm-plex
-    monocraft
     ryan-mono-bin
     ryan-term-bin
-    (nerdfonts.override {fonts = ["CascadiaCode"];})
+    (nerdfonts.override {
+      fonts = ["CascadiaCode"];
+    })
   ];
 }
diff --git a/modules/homebrew.nix b/modules/homebrew.nix
index 40a862b..70c2696 100644
--- a/modules/homebrew.nix
+++ b/modules/homebrew.nix
@@ -28,6 +28,9 @@ _: {
       "1password/tap/1password-cli"
     ];
 
-    taps = ["1password/tap"];
+    taps = [
+      "1password/tap"
+      "ryanccn/tap"
+    ];
   };
 }
diff --git a/overlays/ryan-mono-bin.nix b/overlays/ryan-mono-bin.nix
index b05b722..2a5b6f5 100644
--- a/overlays/ryan-mono-bin.nix
+++ b/overlays/ryan-mono-bin.nix
@@ -1,9 +1,9 @@
 (_: prev: let
-  version = "2023.09.04";
+  version = "2023.09.14";
 
   mkFontVariant = {
     variant,
-    sha256,
+    hash,
   }:
     prev.callPackage ({
       lib,
@@ -24,7 +24,7 @@
           mv $postDir/*.ttf $out/share/fonts/truetype
         '';
 
-        inherit sha256;
+        inherit hash;
 
         meta = with lib; {
           homepage = "https://github.com/ryanccn/ryan-mono";
@@ -35,11 +35,11 @@
 in {
   ryan-mono-bin = mkFontVariant {
     variant = "ryan-mono";
-    sha256 = "sha256-q3VU2RvkIi67s048D03yxwGCDxW80JPRJCf6jy5pnNc=";
+    hash = "sha256-T5S9tfJZz/5YDXKTir+NHHxwyJZt+z1fkgzpT7sJyEU=";
   };
 
   ryan-term-bin = mkFontVariant {
     variant = "ryan-term";
-    sha256 = "sha256-i9+xDfpEHPjLANarS3zFiACuTmw6P1h45EYgudy5QZE=";
+    hash = "sha256-RY7l/RG35fE0AkOHSSwbw3vi2ru++J5Wo/43hmNAySg=";
   };
 })