mirror of
https://codeberg.org/leana8959/.files.git
synced 2026-02-01 14:39:39 +00:00
overlays/nix-monitored: don't override globally
Overriding globally would break nix-shell shebangs
This commit is contained in:
parent
a3884f79fd
commit
54ce4cf229
4 changed files with 21 additions and 11 deletions
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue