feat: use local version of nix-fast-build

common/default.nix

@@ -30,14 +30,16 @@
   boot.tmp.useTmpfs = true;
 
   nix = {
-    # Allow deleting store files with '.' in the name
+    # FIXME: https://github.com/nix-community/home-manager/issues/4692#issuecomment-2054003365
-    package = pkgs.nix.overrideAttrs (o: {
+    package = pkgs.nixVersions.unstable.overrideAttrs (o: {
-      patches =
+      src = pkgs.fetchFromGitHub {
-        (o.patches or [])
+        owner = "NixOS";
-        ++ [
+        repo = "nix";
-          ./overlays/nix/patch
+        rev = "60824fa97c588a0faf68ea61260a47e388b0a4e5";
-        ];
+        sha256 = "10z/SoidVl9/lh56cMLj7ntJZHtVrumFvmn1YEqXmaM=";
+      };
     });
+
     # Edit nix.conf
     settings = {
       # Store

common/home/neovim/default.nix

@@ -10,7 +10,7 @@
   ...
 }: let
   inherit (config.vars) hostName mainUser neovimIde;
-  inherit (lib) fileContents hasPrefix mdDoc optionalAttrs optionals removePrefix;
+  inherit (lib) fileContents hasPrefix optionalAttrs optionals removePrefix;
 
   javaSdk = pkgs.temurin-bin-17;
   coc-stylelintplus-flake = coc-stylelintplus.packages.${pkgs.system}.default;

devices/servivi/modules/binary-cache.nix

@@ -1,14 +1,19 @@
 {
   config,
+  nix-eval-jobs,
+  nix-fast-build,
   pkgs,
   ...
 }: let
   inherit (config.vars) mainUser;
   inherit (config.sops) secrets;
 
-  nix-fast-buildPkg = pkgs.writeShellApplication {
+  nixPkg = {
-    name = "nix-fast-build";
+    nix = config.nix.package;
-    text = "nix run github:Mic92/nix-fast-build \"$@\"";
+  };
+  nix-fast-buildPkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
+    nix-eval-jobs =
+      nix-eval-jobs.packages.${pkgs.system}.default.override nixPkg // nixPkg;
   };
 in {
   services.nix-serve = {
@@ -31,7 +36,6 @@ in {
 
       path = with pkgs; [
         git
-        nix
         nix-fast-buildPkg
         openssh
       ];