From fc3cb7cef33fbf4d2d5f21ab9fa268909276b9f1 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Wed, 6 Sep 2023 22:35:31 +0800
Subject: [PATCH] feat(packages): add fh

---
 flake.lock           | 88 ++++++++++++++++++++++++++++++++++++++++++++
 flake.nix            | 18 +++++++++
 modules/nix.nix      |  1 +
 modules/packages.nix |  1 +
 4 files changed, 108 insertions(+)

diff --git a/flake.lock b/flake.lock
index b472fc9..1d1e3a4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -139,6 +139,54 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1693981270,
+        "narHash": "sha256-5Yv8grfUb5OAkSwuqmU9Ab+uusraku/Rmt2o8accn9I=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "b2f49e4f86582a8e3015f9cc4b869a9c9a28b3cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "fh": {
+      "inputs": {
+        "fenix": [
+          "fenix"
+        ],
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "naersk": [
+          "naersk"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "narHash": "sha256-9dWd0syDzoyjnhVoOCazRVA4pAAXud+cxggVlxXzJFg=",
+        "rev": "674317344239e9ec768bcfe5254a16cd907c15d1",
+        "revCount": 119,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.3/018a6194-af07-7c06-aefe-4ece2331835b/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/fh/%2A.tar.gz"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -193,6 +241,26 @@
         "type": "github"
       }
     },
+    "naersk": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1692351612,
+        "narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "78789c30d64dea2396c9da516bbcc8db3a475207",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -255,15 +323,35 @@
         "crane": "crane",
         "darwin-custom-icons": "darwin-custom-icons",
         "discord-applemusic-rich-presence": "discord-applemusic-rich-presence",
+        "fenix": "fenix",
+        "fh": "fh",
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "naersk": "naersk",
         "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs",
         "nyoom": "nyoom",
         "rust-overlay": "rust-overlay"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693944114,
+        "narHash": "sha256-FqQkL3OX6hapF2wSay6VJQNuJRK8Q3VfEukwLI7d4Pg=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "b9a9722bda8f1ff7d8691701b98a753f74e70c06",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "flake-utils": [
diff --git a/flake.nix b/flake.nix
index 409abf3..c278ed8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,12 +46,30 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    fh = {
+      url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.fenix.follows = "fenix";
+      inputs.naersk.follows = "naersk";
+      inputs.flake-compat.follows = "flake-compat";
+    };
+
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
 
+    naersk = {
+      url = "github:nix-community/naersk";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     crane = {
       url = "github:ipetkov/crane";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/nix.nix b/modules/nix.nix
index 0cfb706..a0cc866 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -29,6 +29,7 @@ in {
       inputs.discord-applemusic-rich-presence.overlays.default
       inputs.nyoom.overlays.default
       inputs.am.overlays.default
+      inputs.fh.overlays.default
       flakeOverlays.ryan-mono-bin
       flakeOverlays.ibm-plex
     ];
diff --git a/modules/packages.nix b/modules/packages.nix
index 5d28d55..c868529 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -11,6 +11,7 @@
     attic-client
     cachix
     direnv
+    fh
 
     rustc
     cargo