diff --git a/home-manager/home-manager b/home-manager/home-manager index 0a89057c..c3f8e0b5 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -180,8 +180,7 @@ function doSwitch() { else doBuildAttr \ --out-link "$generation" \ - --no-build-output \ - --attr activationPackage > /dev/null \ + --attr activationPackage \ && "$generation/activate" || exitCode=1 fi diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix index 1f0211a1..e1654309 100644 --- a/modules/programs/direnv.nix +++ b/modules/programs/direnv.nix @@ -29,6 +29,14 @@ in Whether to enable Zsh integration. ''; }; + + enableFishIntegration = mkOption { + default = true; + type = types.bool; + description = '' + Whether to enable Fish integration. + ''; + }; }; config = mkIf cfg.enable { @@ -46,5 +54,9 @@ in programs.zsh.initExtra = mkIf cfg.enableZshIntegration '' eval "$(${pkgs.direnv}/bin/direnv hook zsh)" ''; + + programs.fish.shellInit = mkIf cfg.enableFishIntegration '' + eval (${pkgs.direnv}/bin/direnv hook fish) + ''; }; }