Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions nixos/modules/programs/fish.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ in

{

imports = [
(mkRemovedOptionModule [ "programs" "fish" "promptInit" ] ''
Prompt is now configured through the
programs.fish.interactiveShellInit
option. Please change to use that instead.
'')
];

options = {

programs.fish = {
Expand Down Expand Up @@ -133,14 +141,6 @@ in
type = types.lines;
};

promptInit = mkOption {
default = "";
description = ''
Shell script code used to initialise fish prompt.
'';
type = types.lines;
};

};

};
Expand Down Expand Up @@ -227,7 +227,6 @@ in

${sourceEnv "interactiveShellInit"}

${cfg.promptInit}
${cfg.interactiveShellInit}

# and leave a note so we don't source this config section again from
Expand Down