From 99a0e2469bae1711b53bdf3fd20f88aa333f6655 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 27 Aug 2018 19:21:01 +0800
Subject: [PATCH 1/2] direnv: add fish support

---
 modules/programs/direnv.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

From 859c132ee29fe31ad30473855ca8e85c3150af97 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 28 Aug 2018 00:17:57 +0200
Subject: [PATCH 2/2] home-manager: enable build output during switch

Fixes #352
---
 home-manager/home-manager | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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