From 847a8207066602be2a04fa8b91f56185c5c6de9f Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Mon, 24 May 2021 22:13:15 +0200
Subject: [PATCH] zsh: Explicitly disable prompt in user config

Otherwise starship does not work in 21.05.
---
 users/simon/modules/zsh.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/users/simon/modules/zsh.nix b/users/simon/modules/zsh.nix
index e06b442..f11485f 100644
--- a/users/simon/modules/zsh.nix
+++ b/users/simon/modules/zsh.nix
@@ -64,17 +64,22 @@ in
       envExtra = ''
         export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
       '';
-      initExtra = lib.mkAfter ''
-        eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolors-solarized}/dircolors.ansi-universal)
+      initExtra = lib.mkMerge [
+        (lib.mkBefore ''
+          prompt off # collides with starship
+        '')
+        (lib.mkAfter ''
+          eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolors-solarized}/dircolors.ansi-universal)
 
-        # no sad smiley (starship shows exit status)
-        zstyle ':prompt:grml:right:setup' items
+          # no sad smiley (starship shows exit status)
+          zstyle ':prompt:grml:right:setup' items
 
-        # do not glob # (conflicts with nix flakes)
-        disable -p '#'
+          # do not glob # (conflicts with nix flakes)
+          disable -p '#'
 
-        source ${../files/zsh/pass-wrappers.zsh}
-      '';
+          source ${../files/zsh/pass-wrappers.zsh}
+        '')
+      ];
     };
   };
 }