From 3e4fedc1d9c53a0fad0a4e5b63880ab13d1e249d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 21 Oct 2021 22:18:50 +0200
Subject: [PATCH] direnv: make fish enable flag read-only

We cannot disable direnv for Fish since the functionality is
automatically loaded when the package is installed.

Fixes #2357
---
 modules/programs/direnv.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index 383cff3a..9974a28f 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -66,8 +66,11 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
+      readOnly = true;
       description = ''
-        Whether to enable Fish integration.
+        Whether to enable Fish integration. Note, enabling the direnv module
+        will always active its functionality for Fish since the direnv package
+        automatically gets loaded in Fish.
       '';
     };
 
@@ -106,9 +109,5 @@ in {
     programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
       eval "$(${pkgs.direnv}/bin/direnv hook zsh)"
     '';
-
-    programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
-      ${pkgs.direnv}/bin/direnv hook fish | source
-    '';
   };
 }