overlays/nix-monitored: don't override globally

Overriding globally would break nix-shell shebangs
This commit is contained in:
Primrose 2026-01-01 16:28:05 +01:00
parent a3884f79fd
commit 54ce4cf229
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
4 changed files with 21 additions and 11 deletions

View file

@ -44,8 +44,6 @@ in
]; ];
}; };
nix.package = pkgs.nix-monitored;
system.nixos = system.nixos =
let let
rev = lib.substring 0 8 sources.nixpkgs.revision; rev = lib.substring 0 8 sources.nixpkgs.revision;

View file

@ -49,8 +49,6 @@ in
]; ];
}; };
nix.package = pkgs.nix-monitored;
system.nixos = system.nixos =
let let
rev = lib.substring 0 8 sources.nixpkgs.revision; rev = lib.substring 0 8 sources.nixpkgs.revision;

View file

@ -74,8 +74,6 @@ in
]; ];
}; };
nix.package = pkgs.nix-monitored;
system.nixos = system.nixos =
let let
rev = lib.substring 0 8 sources.nixpkgs.revision; rev = lib.substring 0 8 sources.nixpkgs.revision;

View file

@ -1,10 +1,26 @@
let let
sources = import ../../npins; sources = import ../../npins;
in in
# The final nix is lix in this case final: prev:
final: prev: { let
nix-monitored = sources.nix-monitored.asFlake.packages.${final.stdenv.hostPlatform.system}.default.override { nix-monitored-noisy =
inherit (final) nix; sources.nix-monitored.asFlake.packages.${final.stdenv.hostPlatform.system}.default.override
withNotify = false; # noisy, spams "command completed" even for nix shells {
inherit (final)
nix # Use the nix the user wants, whether it's lix or nix
nix-output-monitor # don't use the nom pinned by nix-monitored
;
};
nix-monitored = nix-monitored-noisy.override {
withNotify = false;
};
in
{
nixos-rebuild = prev.nixos-rebuild.override {
nix = nix-monitored-noisy;
};
nix-direnv = prev.nix-direnv.override {
nix = nix-monitored;
}; };
} }