From e9925d0c420a4638bdb3c196cb357e007be0565f Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:32:41 +0800
Subject: [PATCH] chore: update inputs and packages

---
 flake.lock                 | 44 +++++++++++++++++-----------------
 home/programs/glamour.nix  |  4 +---
 modules/nix.nix            |  1 -
 overlays/ctp-glamour.nix   | 48 --------------------------------------
 overlays/default.nix       |  1 -
 overlays/ryan-mono-bin.nix |  6 ++---
 6 files changed, 27 insertions(+), 77 deletions(-)
 delete mode 100644 overlays/ctp-glamour.nix

diff --git a/flake.lock b/flake.lock
index 0f9f037..070662a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -62,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697208677,
-        "narHash": "sha256-1z4XJhidXiKcYAKDzzwjV8WhdNlcKDdcJlwTITYyIco=",
+        "lastModified": 1698002908,
+        "narHash": "sha256-Bge0FHsAQx1SQZyzpFl0EdgLC/RaYEToU2YVUMDlFvw=",
         "owner": "Stonks3141",
         "repo": "ctp-nix",
-        "rev": "4ade2040125e692e90204a073a07a6c7f3063ded",
+        "rev": "5713b478b10c5ef703fd921d96ca6a3057c457b5",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697677553,
-        "narHash": "sha256-ozj7HFo/1iQdzZ2U6tHP4QBW59eUbDZ/5HI8lLe9wos=",
+        "lastModified": 1697840921,
+        "narHash": "sha256-zXHwu104SQOxogkMgg+w22c3+zI/FvK83TAkfLmeKw0=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "bc5fa8cd53ef32b9b827f24b993c42a8c4dd913b",
+        "rev": "758ae442227103fa501276e8225609a11c99718e",
         "type": "github"
       },
       "original": {
@@ -118,11 +118,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1697782927,
-        "narHash": "sha256-OikLtn3e0kR5ztHJbLzS/5mUMadXfgRGKA1BDgcTa60=",
+        "lastModified": 1698042153,
+        "narHash": "sha256-X6qAg4SAMyi0Bg6HPeHkAufmYUeW/6N+ikIIVYOBu58=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "e5f13bd304140705f6aba0f121cee7775d861897",
+        "rev": "0fbf5652c9596038c0f4784d3e93d1f1a543e24b",
         "type": "github"
       },
       "original": {
@@ -147,6 +147,7 @@
         ]
       },
       "locked": {
+        "lastModified": 1697489714,
         "narHash": "sha256-gyxlVSraZIVAyOaJk90fub4b8g1w4KXwqa1ecNAC7xA=",
         "rev": "d72db6283e6b6bef7216c8586c16d9f648652400",
         "revCount": 353,
@@ -199,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697688028,
-        "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=",
+        "lastModified": 1697964592,
+        "narHash": "sha256-fua0LKNLkYYK2Dgdm9P+VPdqrVgDXUIx+EkQAQByhuc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19",
+        "rev": "219d268a69512ff520fe8da1739ac22d95d52355",
         "type": "github"
       },
       "original": {
@@ -274,11 +275,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697730408,
-        "narHash": "sha256-Ww//zzukdTrwTrCUkaJA/NsaLEfUfQpWZXBdXBYfhak=",
+        "lastModified": 1697915759,
+        "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ff0a5a776b56e0ca32d47a4a47695452ec7f7d80",
+        "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
         "type": "github"
       },
       "original": {
@@ -295,6 +296,7 @@
         ]
       },
       "locked": {
+        "lastModified": 1695906663,
         "narHash": "sha256-6gC3C0sYD9p706XZjRXvrCyH2x5vpLUKehxvbnHKZec=",
         "rev": "3bde992e4dd222078ce068a9313a86ff9bafab6e",
         "revCount": 130,
@@ -329,11 +331,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1697733402,
-        "narHash": "sha256-G5P/bwympglxbmgHbCSz9wQxn4TV5wwaXE5Pzsjgrrw=",
+        "lastModified": 1698006371,
+        "narHash": "sha256-/SkkJSywaPESyqCRIwmDNRNlons+uP8bUDCU4EjYWb4=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "0cae1ca656f181ce78af7a25007f96b3ef5c166f",
+        "rev": "10872952c03947124f8ccda7d7aa7930b7da32fe",
         "type": "github"
       },
       "original": {
@@ -353,11 +355,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697767917,
-        "narHash": "sha256-9+FjCVE1Y7iUKohBF43yD05KoQB+FPcw/XL2rlKkjqY=",
+        "lastModified": 1697940838,
+        "narHash": "sha256-eyk92QqAoRNC0V99KOcKcBZjLPixxNBS0PRc4KlSQVs=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "679ea0878edc749f23516ea6d7ffa974c6304bf5",
+        "rev": "a3e829c06eadf848f13d109c7648570ce37ebccd",
         "type": "github"
       },
       "original": {
diff --git a/home/programs/glamour.nix b/home/programs/glamour.nix
index 032a24e..2a30542 100644
--- a/home/programs/glamour.nix
+++ b/home/programs/glamour.nix
@@ -3,7 +3,5 @@
   config,
   ...
 }: {
-  home.sessionVariables = {
-    GLAMOUR_STYLE = "${pkgs.ctp-glamour.${config.catppuccin.flavour}}/default.json";
-  };
+  programs.glamour.catppuccin.enable = true;
 }
diff --git a/modules/nix.nix b/modules/nix.nix
index f8c74c5..a112c79 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -36,7 +36,6 @@ in {
       inputs.fh.overlays.default
       flakeOverlays.ryan-mono-bin
       flakeOverlays.ibm-plex
-      flakeOverlays.ctp-glamour
     ];
 
     config.allowUnfree = true;
diff --git a/overlays/ctp-glamour.nix b/overlays/ctp-glamour.nix
deleted file mode 100644
index 7a8640f..0000000
--- a/overlays/ctp-glamour.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-(_: prev: let
-  flavors = [
-    {
-      flavor = "latte";
-      hash = "sha256-V0LsRStF1vL+Tz8G6VaKiwiY/ZIsSkMc+f1WJAITYXU=";
-    }
-    {
-      flavor = "frappe";
-      hash = "sha256-YOatgYCJKuesVERHZVmF1xtzuLjyxCYstoWYqATq+NU=";
-    }
-    {
-      flavor = "macchiato";
-      hash = "sha256-CeSJvhjzHVTtlqgQLKOrdLXtp2OQlMh24IaA1QQiQCk=";
-    }
-    {
-      flavor = "mocha";
-      hash = "sha256-Tx2fQteL4wxhV+qHYZibakiYoEhS4HjyMO0yBcU/F6Q=";
-    }
-  ];
-in {
-  ctp-glamour = builtins.listToAttrs (builtins.map ({
-      flavor,
-      hash,
-    }: {
-      name = flavor;
-      value = prev.callPackage (
-        {
-          stdenvNoCC,
-          fetchurl,
-        }:
-          stdenvNoCC.mkDerivation rec {
-            pname = "ctp-glamour-${flavor}";
-            version = "1.0.0";
-
-            src = fetchurl {
-              url = "https://github.com/catppuccin/glamour/releases/download/v${version}/${flavor}.json";
-              inherit hash;
-            };
-
-            unpackPhase = ''
-              mkdir -p $out
-              cp $src $out/default.json
-            '';
-          }
-      ) {};
-    })
-    flavors);
-})
diff --git a/overlays/default.nix b/overlays/default.nix
index 0568e13..ee064dd 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,5 +1,4 @@
 {
   ibm-plex = import ./ibm-plex.nix;
   ryan-mono-bin = import ./ryan-mono-bin.nix;
-  ctp-glamour = import ./ctp-glamour.nix;
 }
diff --git a/overlays/ryan-mono-bin.nix b/overlays/ryan-mono-bin.nix
index 5265286..aed8b64 100644
--- a/overlays/ryan-mono-bin.nix
+++ b/overlays/ryan-mono-bin.nix
@@ -1,5 +1,5 @@
 (_: prev: let
-  version = "2023.09.28";
+  version = "2023.10.22";
 
   mkFontVariant = {
     variant,
@@ -35,11 +35,11 @@
 in {
   ryan-mono-bin = mkFontVariant {
     variant = "ryan-mono";
-    hash = "sha256-uDr7A1gEEazQWcqpH4YTNKycX6buE8QerECCrHXVbD8=";
+    hash = "sha256-qF0dWDlhWZVIi/HIuRMpmQM+fD6pdQViwehHe6WXTmo=";
   };
 
   ryan-term-bin = mkFontVariant {
     variant = "ryan-term";
-    hash = "sha256-91pS9CzbYKywOIrUwWJpXnl5lJKZVH4nSadCh8PQscU=";
+    hash = "sha256-X6u5A0CnaZvAw/yP/3ERWUYM9USFAaHj8akayedwnLM=";
   };
 })