From 666e4a2752788d03b61d9efd9279841f60d7b401 Mon Sep 17 00:00:00 2001
From: Kid <44045911+kidonng@users.noreply.github.com>
Date: Sun, 8 Aug 2021 16:15:16 +0000
Subject: [PATCH] nixos/programs/fish: remove `promptInit` in favor of
 `interactiveShellInit`

---
 nixos/modules/programs/fish.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 8dd7101947fae..dbe84c5bdb9bf 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -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 = {
@@ -133,14 +141,6 @@ in
         type = types.lines;
       };
 
-      promptInit = mkOption {
-        default = "";
-        description = ''
-          Shell script code used to initialise fish prompt.
-        '';
-        type = types.lines;
-      };
-
     };
 
   };
@@ -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