From 46e631c8c5d46bed2caa0cd0ec6b2ddf7ff6bd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Thu, 1 May 2025 22:37:04 +0200
Subject: [PATCH] treewide: use nh from master instead of nixpkgs

---
 flake.lock               | 17 +++++++++++++++++
 flake.nix                |  4 ++++
 modules/home/default.nix |  2 --
 nilla.nix                |  3 ++-
 pkgs/default.nix         |  6 ++++++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 14086e8..f849df2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -393,6 +393,22 @@
         "type": "gitlab"
       }
     },
+    "nh": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1746032033,
+        "narHash": "sha256-BCD0tfDNlQHFM75THRtXM3GegMg/KbREsYllg7Az9ao=",
+        "owner": "nix-community",
+        "repo": "nh",
+        "rev": "894bb7ebf3adb58f76d1f7d9f6b33f58758d40f0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nh",
+        "type": "github"
+      }
+    },
     "niko-nur": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -522,6 +538,7 @@
         "lix": "lix",
         "lix-module": "lix-module",
         "mailserver": "mailserver",
+        "nh": "nh",
         "niko-nur": "niko-nur",
         "nilla": "nilla",
         "nixpkgs": "nixpkgs_2",
diff --git a/flake.nix b/flake.nix
index 4df88d5..dddf8bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -91,5 +91,9 @@
       url = "github:nilla-nix/nilla";
       flake = false;
     };
+    nh = {
+      url = "github:nix-community/nh";
+      flake = false;
+    };
   };
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
index f11fcaa..cd62227 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,7 +1,6 @@
 # TODO: Make this module not rely on OS config being present
 {
   osConfig,
-  pkgs,
   lib,
   inputs',
   machineName,
@@ -59,7 +58,6 @@ in
 
   home.packages = [
     inputs'.settei.packages.base-packages
-    pkgs.nh
   ];
 
   home.sessionVariables.EDITOR = "hx";
diff --git a/nilla.nix b/nilla.nix
index fcf00e4..3a1a09e 100644
--- a/nilla.nix
+++ b/nilla.nix
@@ -57,6 +57,7 @@
               fish
               git-commit-last
               git-fixup
+              nh
             ];
           }
         );
@@ -126,7 +127,7 @@
           packages = [
             config.packages.agenix.result.${system}
             config.packages.attic-client.result.${system}
-            nh
+            config.packages.nh.result.${system}
           ];
         };
     };
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4e5cd0c..3efdd36 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -69,4 +69,10 @@ in
     builder = "custom-load";
     package = { system }: atticPkgs.${system}.attic-server;
   };
+
+  config.packages.nh = {
+    inherit systems builder;
+    package = import "${inputs.nh}/package.nix";
+    settings.args.rev = inputs.nh.shortRev;
+  };
 }