From a8b47702751e5f53448c65ba1655747a88714445 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 7 Oct 2017 12:27:43 +0200
Subject: environment: include extraInit in set-environment script

---
 modules/programs/fish.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'modules/programs/fish.nix')

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 2848d3f..d5c0f44 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -9,7 +9,7 @@ let
 
   foreignEnv = pkgs.writeText "fish-foreign-env" ''
     # TODO: environment.shellInit
-    ${cfge.extraInit}
+    ${config.system.build.setEnvironment}
   '';
 
   loginForeignEnv = pkgs.writeText "fish-login-foreign-env" ''
@@ -125,8 +125,6 @@ in
 
       set PATH ${replaceStrings [":"] [" "] config.environment.systemPath}
 
-      ${config.system.build.setEnvironment}
-
       fenv source ${foreignEnv}
       ${cfg.shellInit}
 
-- 
cgit v1.2.3