mirror of
https://github.com/nix-community/home-manager.git
synced 2025-11-22 10:19:39 +01:00
direnv: fix silent option after update to direnv v2.36.0
see https://github.com/direnv/direnv/issues/68 (bottom of thread)
This commit is contained in:
parent
5a096a8822
commit
ae5fcad746
1 changed files with 81 additions and 66 deletions
|
|
@ -118,11 +118,26 @@ in
|
||||||
silent = mkEnableOption "silent mode, that is, disabling direnv logging";
|
silent = mkEnableOption "silent mode, that is, disabling direnv logging";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config =
|
||||||
|
let
|
||||||
|
packageVersion = lib.getVersion cfg.package;
|
||||||
|
isVersion236orHigher = lib.versionAtLeast packageVersion "2.36.0";
|
||||||
|
in
|
||||||
|
mkIf cfg.enable {
|
||||||
home.packages = [ cfg.package ];
|
home.packages = [ cfg.package ];
|
||||||
|
|
||||||
xdg.configFile."direnv/direnv.toml" = mkIf (cfg.config != { }) {
|
xdg.configFile."direnv/direnv.toml" =
|
||||||
source = tomlFormat.generate "direnv-config" cfg.config;
|
mkIf (cfg.config != { } || (cfg.silent && isVersion236orHigher))
|
||||||
|
{
|
||||||
|
source = tomlFormat.generate "direnv-config" (
|
||||||
|
cfg.config
|
||||||
|
// lib.optionalAttrs (cfg.silent && isVersion236orHigher) {
|
||||||
|
global = {
|
||||||
|
log_format = "-";
|
||||||
|
log_filter = "^$";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.configFile."direnv/lib/hm-nix-direnv.sh" = mkIf cfg.nix-direnv.enable {
|
xdg.configFile."direnv/lib/hm-nix-direnv.sh" = mkIf cfg.nix-direnv.enable {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue