diff --git a/flake.lock b/flake.lock
index e2ef97e..ae8a706 100755
--- a/flake.lock
+++ b/flake.lock
@@ -221,6 +221,24 @@
         "type": "github"
       }
     },
+    "nh": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1753313428,
+        "narHash": "sha256-fNDa4IX3AWg3URUoZeefyClsqwX1nF9ilOa75/bSH+c=",
+        "owner": "nix-community",
+        "repo": "nh",
+        "rev": "706dcb8c99a2a9ee8c64fffac168e2f8bf1d9bfb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nh",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1753122741,
@@ -301,6 +319,22 @@
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1752436162,
+        "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1752866191,
         "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=",
@@ -316,7 +350,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1752077645,
         "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@@ -332,7 +366,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1744868846,
         "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
@@ -351,7 +385,7 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nuschtosSearch": "nuschtosSearch",
         "systems": "systems_3"
       },
@@ -423,8 +457,9 @@
         "deploy-rs": "deploy-rs",
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
+        "nh": "nh",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-pr-feishin": "nixpkgs-pr-feishin",
         "nixpkgs-pr-fluffychat": "nixpkgs-pr-fluffychat",
         "nixvim": "nixvim",
@@ -472,7 +507,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1752544651,
diff --git a/flake.nix b/flake.nix
index 336fd09..6136ca5 100755
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware"; # Hardware specific config.
     sops-nix.url = "github:Mic92/sops-nix"; # Secrets management.
     nixvim.url = "github:nix-community/nixvim"; # Neovim.
+    nh.url = "github:nix-community/nh"; # Yet another Nix CLI helper.
 
     # Home manager.
     home-manager = {
diff --git a/overlay.nix b/overlay.nix
index de2aa20..2c15c9e 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -14,6 +14,9 @@ with inputs;
     # Dymo label printer drivers.
     cups-dymo = prev.pkgs.callPackage ./packages/cups-dymo {};
 
+    # Latest nh from git.
+    nh = nh.packages.${system}.nh;
+
     # Latest FluffyChat.
     fluffychat =
       (import nixpkgs-pr-fluffychat