Merge branch 'master' of git://github.com/rycee/home-manager

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
 

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)
+    '';
   };
 }