From 114904b70035708cce0b03f8ac59085944a16ccf Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Mon, 27 Nov 2023 19:20:49 +0800
Subject: [PATCH] feat: update fonts

---
 flake.lock                 | 30 +++++++++++++++---------------
 home/apps/vscode.nix       |  7 ++++---
 home/fonts.nix             |  2 +-
 home/programs/glamour.nix  |  2 +-
 overlays/ryan-mono-bin.nix |  6 +++---
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index f329f5e..ed068c7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -86,11 +86,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1700893250,
-        "narHash": "sha256-Dj+UarvFkqQyykEgPYLIB9U4Tyc4bsTkRgIZWmnZQwc=",
+        "lastModified": 1701066187,
+        "narHash": "sha256-WP2sUVcjM4uuCBnw2r++6Rnuqzd4iZ7oh/o7AarPjIM=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "4ef52d5432c4b1aff96c7c62349e63a1b04c934e",
+        "rev": "bec77b7f219319a49dc1885490236714b023d19c",
         "type": "github"
       },
       "original": {
@@ -168,11 +168,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700847865,
-        "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
+        "lastModified": 1701071203,
+        "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
+        "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700856099,
-        "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
+        "lastModified": 1701040486,
+        "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1",
+        "rev": "45827faa2132b8eade424f6bdd48d8828754341a",
         "type": "github"
       },
       "original": {
@@ -319,11 +319,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1700846068,
-        "narHash": "sha256-Pei4FtSmhZkkP5PUHMFToPbhLV5TpiZOOclJGBTH3gE=",
+        "lastModified": 1700997114,
+        "narHash": "sha256-pOz99NESIGosyt19tqNw7gfS6NQJtFY0kGF3rFV0bZ0=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "34cffbf1d75fb6b5cb6bc68a9854b20dc74f135d",
+        "rev": "237712fa314237e428e7ef2ab83b979f928a43a1",
         "type": "github"
       },
       "original": {
@@ -343,11 +343,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700878361,
-        "narHash": "sha256-O30hSOliHJhSdhZw5T8JFtxlL309mNLI+agYffuccIo=",
+        "lastModified": 1701051362,
+        "narHash": "sha256-3dXjewnLylWGZKNshIV0eiabhIDjcUNXC5zRKcm0TxY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0309d58c91c57e8d519de68312430074de3ef5f8",
+        "rev": "055d3d2ea161dfc6ca569f2f135a107f48cf483e",
         "type": "github"
       },
       "original": {
diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix
index e9ed3df..f3e1428 100644
--- a/home/apps/vscode.nix
+++ b/home/apps/vscode.nix
@@ -85,8 +85,9 @@ in {
       "git.suggestSmartCommit" = false;
       "diffEditor.ignoreTrimWhitespace" = false;
 
-      "editor.fontFamily" = "\"CaskaydiaCove NF\",  monospace";
-      "editor.fontLigatures" = "'calt', 'ss01'";
+      "editor.fontFamily" = "\"RyanMono Nerd Font\",  monospace";
+      "editor.fontLigatures" = true;
+      # "editor.fontLigatures" = "'calt', 'ss01'";
       "editor.fontSize" = 16;
       "editor.lineHeight" = 1.5;
       "editor.cursorSmoothCaretAnimation" = "on";
@@ -100,7 +101,7 @@ in {
       "editor.insertSpaces" = true;
       "editor.formatOnSave" = true;
 
-      "terminal.integrated.fontFamily" = "\"CaskaydiaCove NFM\",  monospace";
+      "terminal.integrated.fontFamily" = "\"RyanTerm Nerd Font\",  monospace";
       "terminal.integrated.fontSize" = 14;
       "terminal.integrated.lineHeight" = 1.5;
       "terminal.integrated.cursorBlinking" = true;
diff --git a/home/fonts.nix b/home/fonts.nix
index e7b59da..b4ab263 100644
--- a/home/fonts.nix
+++ b/home/fonts.nix
@@ -2,9 +2,9 @@
   home.packages = with pkgs; [
     inter
     public-sans
-    inriafonts
     ibm-plex
 
+    monaspace
     ryan-mono-bin
     ryan-term-bin
     commit-mono
diff --git a/home/programs/glamour.nix b/home/programs/glamour.nix
index 26efb88..bda1faa 100644
--- a/home/programs/glamour.nix
+++ b/home/programs/glamour.nix
@@ -1,3 +1,3 @@
-{...}: {
+_: {
   programs.glamour.catppuccin.enable = true;
 }
diff --git a/overlays/ryan-mono-bin.nix b/overlays/ryan-mono-bin.nix
index aed8b64..6866e20 100644
--- a/overlays/ryan-mono-bin.nix
+++ b/overlays/ryan-mono-bin.nix
@@ -1,5 +1,5 @@
 (_: prev: let
-  version = "2023.10.22";
+  version = "2023.11.26";
 
   mkFontVariant = {
     variant,
@@ -35,11 +35,11 @@
 in {
   ryan-mono-bin = mkFontVariant {
     variant = "ryan-mono";
-    hash = "sha256-qF0dWDlhWZVIi/HIuRMpmQM+fD6pdQViwehHe6WXTmo=";
+    hash = "sha256-hA9Z1SOD9Ij1sPSyHXg9SUMPuJqKnocYfXwCTMAgJJU=";
   };
 
   ryan-term-bin = mkFontVariant {
     variant = "ryan-term";
-    hash = "sha256-X6u5A0CnaZvAw/yP/3ERWUYM9USFAaHj8akayedwnLM=";
+    hash = "sha256-j/1wvyN60m7SlUV0c6tk2jgj53EEgWEJMcCOvbrAkVI=";
   };
 })