From d45e1c4adc68dcda504cfc13ea894b308e552807 Mon Sep 17 00:00:00 2001
From: Ryan Orendorff <ryan@orendorff.io>
Date: Mon, 23 Sep 2019 22:00:23 -0700
Subject: [PATCH] fish: functions type to attrsOf lines, load by text

Functions in fish are now defined in terms of adding the appropriate
files and `files.text` sets to `xdg.configFile`.
---
 modules/programs/fish.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index abc1bfea..9ae350c2 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -127,14 +127,12 @@ in
     };
 
     programs.fish.functions = mkOption {
-      type = types.attrsOf (fileType (name: body: ''
-            function ${name}
-              ${body}
-            end
-            ''));
+      type = types.attrsOf types.lines;
       default = {};
+      example = { gitignore = "curl -sL https://www.gitignore.io/api/$argv"; };
       description = ''
-        Functions to add to fish.
+        Basic functions to add to fish. For more information see
+        <link xlink:href="https://fishshell.com/docs/current/commands.html#function"/>.
       '';
     };
 
@@ -253,7 +251,14 @@ in
       end
     '';
   } {
-      xdg.configFile = map (n: { target = "fish/functions/${n}.fish"; source = cfg.functions.${n}.source; }) (attrNames cfg.functions);
+      xdg.configFile = mapAttrs' (f_name: f_body: {
+        name = "fish/functions/${f_name}.fish";
+        value = {"text" = ''
+          function ${f_name}
+            ${f_body}
+          end
+        '';};
+      }) cfg.functions;
     } (
     let
       wrappedPkgVersion = lib.getVersion pkgs.fish;