fish: move type declarations to top of mkOptions

A closer match to the style of the definitions in the bash program.
This commit is contained in:
Ryan Orendorff 2019-09-22 23:53:08 -07:00 committed by Robert Helgesson
parent c22f3e1d29
commit 2eb1cb077d
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89

View file

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