fish: link /share/fish when enabled

1 files changed, 7 insertions, 8 deletions

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 698bc32..ba0f67d 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";
-
   };
 
 }