From 1c30a6ab2d1c587195c9c6b6aced7d427d90386c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 13 May 2017 15:05:36 +0200
Subject: [PATCH] fish: link /share/fish when enabled

---
 modules/programs/fish.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 698bc322..ba0f67d2 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -111,6 +111,13 @@ in
 
   config = mkIf cfg.enable {
 
+    environment.systemPackages = [ pkgs.fish ];
+
+    environment.pathsToLink = [ "/share/fish" ];
+
+    environment.loginShell = mkDefault "${shell}/bin/fish -l";
+    environment.variables.SHELL = mkDefault "${shell}/bin/fish";
+
     environment.etc."fish/config.fish".text = ''
       # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
 
@@ -141,14 +148,6 @@ in
       end
     '';
 
-    # include programs that bring their own completions
-    # FIXME: environment.pathsToLink = [ "/share/fish/vendor_completions.d" ];
-
-    environment.systemPackages = [ pkgs.fish ];
-
-    environment.loginShell = mkDefault "${shell}/bin/fish -l";
-    environment.variables.SHELL = mkDefault "${shell}/bin/fish";
-
   };
 
 }