From 621b09bd8f25cd6203f7ee7a9361016b2efa46b6 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Sun, 3 Sep 2023 21:53:28 +0800
Subject: [PATCH] feat: manage fonts with hm

---
 flake.lock         | 47 +++++++++++++++++++---------------------------
 flake.nix          | 15 ++++++++++++---
 home.nix           |  9 ++++-----
 programs/fonts.nix | 12 ++++++++++++
 4 files changed, 47 insertions(+), 36 deletions(-)
 create mode 100644 programs/fonts.nix

diff --git a/flake.lock b/flake.lock
index fdd7cfe..5e74381 100644
--- a/flake.lock
+++ b/flake.lock
@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693163878,
-        "narHash": "sha256-HXuyMUVaRSoIA602jfFuYGXt6AMZ+WUxuvLq8iJmYTA=",
+        "lastModified": 1693608196,
+        "narHash": "sha256-qs1rDvXXjrKdobPvTdn9qKjV0/RE2uqCCTHD/c6AAo8=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "43db881168bc65b568d36ceb614a0fc8b276191b",
+        "rev": "80432e15452e55a72403da3bc91837508a4ccae3",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@
     },
     "darwin-custom-icons": {
       "locked": {
-        "lastModified": 1693410124,
-        "narHash": "sha256-DXjBumqDVHoTgB4JOZeDWMhYpgHmk9qoSziYFLclfL0=",
+        "lastModified": 1693410673,
+        "narHash": "sha256-oHw98kktSorqgd73tOskTkE7AfWfNee7QTxJeMkd640=",
         "owner": "ryanccn",
         "repo": "nix-darwin-custom-icons",
-        "rev": "9095bdc551000d789ea0e829c98ec3d5c7a9e9d9",
+        "rev": "347800c2704b4adb76aaf06fbf0be7831431785b",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693399033,
-        "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=",
+        "lastModified": 1693646047,
+        "narHash": "sha256-VsuXtCGOhrzp1qb1CSoV/cO+5f+GPtA4J/SFYqqLyfo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10",
+        "rev": "fae8af43e201a8929ce45a5ea46192bbd1ffff18",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693355128,
-        "narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=",
+        "lastModified": 1693626178,
+        "narHash": "sha256-Rpiy6lIOu4zny8tfGuIeN1ji9eSz9nPmm9yBhh/4IOM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9",
+        "rev": "bfb7dfec93f3b5d7274db109f2990bc889861caf",
         "type": "github"
       },
       "original": {
@@ -211,25 +211,16 @@
     },
     "nyoom": {
       "inputs": {
-        "crane": [
-          "crane"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "rust-overlay": [
-          "rust-overlay"
         ]
       },
       "locked": {
-        "narHash": "sha256-51XzimvuTezhbKBg7/U+6QFl/RXor3iumy9GAXdA6l4=",
-        "rev": "7fb2b2be7a07718e0b49d8222f563cd25257cded",
-        "revCount": 109,
+        "narHash": "sha256-fEgGb/WwElJ6GFiwa4dFMdx/8yc4A8Z8qKJZQJWNgqc=",
+        "rev": "4cf0278ee6818538a5f82f983565b0ebd21906b4",
+        "revCount": 121,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.6.5/018a203b-daba-72a1-9e8b-44c62cc3acf1/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.0/018a5964-350b-746e-b614-5a927a72b5c1/source.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -262,11 +253,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693361441,
-        "narHash": "sha256-TRFdMQj9wSKMduNqe/1xF8TzcPWEdcn/hKWcVcZ5fO8=",
+        "lastModified": 1693707092,
+        "narHash": "sha256-HR1EnynBSPqbt+04/yxxqsG1E3n6uXrOl7SPco/UnYo=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "1fb2aa49635e9f30b6fa211ab7c454f7175e1ba3",
+        "rev": "98ccb73e6eefc481da6039ee57ad8818d1ca8d56",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index cdb16ac..7f7c3ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,9 +39,6 @@
     nyoom = {
       url = "https://flakehub.com/f/ryanccn/nyoom/0.*.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.crane.follows = "crane";
-      inputs.rust-overlay.follows = "rust-overlay";
-      inputs.flake-utils.follows = "flake-utils";
     };
 
     rust-overlay = {
@@ -73,6 +70,7 @@
   };
 
   outputs = {
+    self,
     nix-darwin,
     home-manager,
     darwin-custom-icons,
@@ -87,5 +85,16 @@
 
       specialArgs = {inherit inputs;};
     };
+
+    checks = {
+      aarch64-darwin =
+        builtins.mapAttrs (
+          _: v:
+            builtins.seq
+            v.config.system.build.toplevel
+            v.pkgs.emptyFile
+        )
+        self.darwinConfigurations;
+    };
   };
 }
diff --git a/home.nix b/home.nix
index 1a96adf..d0f34f3 100644
--- a/home.nix
+++ b/home.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   ctpModule,
   discord-applemusic-rich-presence,
@@ -10,10 +9,14 @@
   imports = [
     ctpModule
     discord-applemusic-rich-presence
+
     ./programs/variables.nix
+    ./programs/fonts.nix
+
     ./programs/zsh.nix
     ./programs/fish.nix
     ./programs/starship.nix
+
     ./programs/git.nix
     ./programs/bat.nix
     ./programs/helix.nix
@@ -23,10 +26,6 @@
   ];
 
   programs.home-manager.enable = true;
-  home.packages = with pkgs; [
-    ryan-mono-bin
-    ryan-term-bin
-  ];
 
   services.discord-applemusic-rich-presence = {
     enable = true;
diff --git a/programs/fonts.nix b/programs/fonts.nix
new file mode 100644
index 0000000..339e658
--- /dev/null
+++ b/programs/fonts.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    inter
+    public-sans
+    inriafonts
+    ibm-plex
+    monocraft
+    ryan-mono-bin
+    ryan-term-bin
+    (nerdfonts.override {fonts = ["CascadiaCode"];})
+  ];
+}