From 2eb1cb077d00f1668ad997e892b719856c7c9b93 Mon Sep 17 00:00:00 2001
From: Ryan Orendorff <ryan@orendorff.io>
Date: Sun, 22 Sep 2019 23:53:08 -0700
Subject: [PATCH] fish: move type declarations to top of mkOptions

A closer match to the style of the definitions in the bash program.
---
 modules/programs/fish.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 8e06dda59..bdd0c870e 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -51,62 +51,62 @@ in
       enable = mkEnableOption "fish friendly interactive shell";
 
       package = mkOption {
+        type = types.package;
         default = pkgs.fish;
         defaultText = literalExample "pkgs.fish";
         description = ''
           The fish package to install. May be used to change the version.
         '';
-        type = types.package;
       };
 
       shellAliases = mkOption {
+        type = types.attrs;
         default = {};
         description = ''
           Set of aliases for fish shell. See
           <option>environment.shellAliases</option> for an option
           format description.
         '';
-        type = types.attrs;
       };
 
       shellAbbrs = mkOption {
+        type = types.attrs;
         default = {};
         description = ''
           Set of abbreviations for fish shell.
         '';
-        type = types.attrs;
       };
 
       shellInit = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Shell script code called during fish shell initialisation.
         '';
-        type = types.lines;
       };
 
       loginShellInit = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Shell script code called during fish login shell initialisation.
         '';
-        type = types.lines;
       };
 
       interactiveShellInit = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Shell script code called during interactive fish shell initialisation.
         '';
-        type = types.lines;
       };
 
       promptInit = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Shell script code used to initialise fish prompt.
         '';
-        type = types.lines;
       };
     };