From bc1f3c9465173f15cf3c1466b05bca1c58e739b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 13 Sep 2023 14:01:04 +0200
Subject: [PATCH] feat: add fh

---
 flake.lock              | 37 +++++++++++++------------------------
 flake.nix               |  8 +++++++-
 home/felschr-server.nix |  2 +-
 home/felschr-work.nix   |  2 ++
 home/felschr.nix        |  2 ++
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8cfb84e..11a3200 100644
--- a/flake.lock
+++ b/flake.lock
@@ -239,18 +239,20 @@
         "fenix": "fenix_2",
         "flake-compat": "flake-compat_4",
         "naersk": "naersk",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "narHash": "sha256-9dWd0syDzoyjnhVoOCazRVA4pAAXud+cxggVlxXzJFg=",
-        "path": "/nix/store/rg7l0383cxb616879vd42f3fcspcxiwl-source",
         "rev": "674317344239e9ec768bcfe5254a16cd907c15d1",
         "revCount": 119,
-        "type": "path"
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.3/018a6194-af07-7c06-aefe-4ece2331835b/source.tar.gz"
       },
       "original": {
-        "id": "fh",
-        "type": "indirect"
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/fh/0.1.tar.gz"
       }
     },
     "flake-compat": {
@@ -501,15 +503,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=",
-        "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780",
-        "revCount": 519597,
+        "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=",
+        "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24",
+        "revCount": 490791,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.519597%2Brev-a999c1cc0c9eb2095729d5aa03e0d8f7ed256780/018a3d35-4db5-76c3-aca2-de1920cf506f/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2305.490791+rev-e5f018cf150e29aac26c61dac0790ea023c46b24/018a8d07-c9a0-7f15-a8ce-f5c7d95cc2c9/source.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/NixOS/nixpkgs/0.1.514192.tar.gz"
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2305.tar.gz"
       }
     },
     "nixpkgs-unstable": {
@@ -525,19 +527,6 @@
         "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=",
-        "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24",
-        "revCount": 490791,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2305.490791+rev-e5f018cf150e29aac26c61dac0790ea023c46b24/018a8d07-c9a0-7f15-a8ce-f5c7d95cc2c9/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2305.tar.gz"
-      }
-    },
     "nur": {
       "locked": {
         "lastModified": 1694601892,
@@ -609,7 +598,7 @@
         "home-manager": "home-manager",
         "matrix-appservices": "matrix-appservices",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "nvim-kitty-navigator": "nvim-kitty-navigator",
diff --git a/flake.nix b/flake.nix
index f9f473e..9cfb98c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,11 @@
     nixos-hardware.url =
       "https://flakehub.com/f/NixOS/nixos-hardware/0.1.tar.gz";
 
+    fh = {
+      url = "https://flakehub.com/f/DeterminateSystems/fh/0.1.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
@@ -57,7 +62,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-parts
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, fh, flake-parts
     , flake-utils, home-manager, nur, agenix, deploy-rs, pre-commit-hooks
     , nvim-kitty-navigator, ... }@inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
@@ -95,6 +100,7 @@
             inherit (prev) system;
             config.allowUnfree = true;
           };
+          inherit (fh.packages.${prev.system}) fh;
           inherit (self.packages.${prev.system}) deconz brlaser;
           vimPlugins = prev.vimPlugins
             // final.callPackage ./pkgs/vim-plugins { inherit inputs; };
diff --git a/home/felschr-server.nix b/home/felschr-server.nix
index c7c64e4..79ed7ac 100644
--- a/home/felschr-server.nix
+++ b/home/felschr-server.nix
@@ -7,7 +7,7 @@
     ./git.nix
   ];
 
-  home.packages = with pkgs; [ ncurses ];
+  home.packages = with pkgs; [ fh ncurses ];
 
   programs.gpg.enable = true;
   services.gpg-agent = {
diff --git a/home/felschr-work.nix b/home/felschr-work.nix
index 783bdbc..55398b2 100644
--- a/home/felschr-work.nix
+++ b/home/felschr-work.nix
@@ -40,6 +40,8 @@ with pkgs; {
   '';
 
   home.packages = with pkgs; [
+    fh
+
     # system
     gparted
     gnome-firmware-updater
diff --git a/home/felschr.nix b/home/felschr.nix
index 017a683..3f3d1c7 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -46,6 +46,8 @@
   '';
 
   home.packages = with pkgs; [
+    fh
+
     # system
     gparted
     gnome-firmware-updater