From 481a5f5508ac42d07683d2e03421e443be92ff23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sat, 9 Apr 2022 18:12:16 +0200
Subject: flake.nix: use interactiveShellInit instead of loginShellInit

---
 flake.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index df7f45c..f0d7946 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,7 @@
       };
 
       config = mkIf config.programs.shellrc.enable {
-        environment.loginShellInit = ''
+        environment.interactiveShellInit = ''
             for sh in ${./shellrc.d}/*; do
                 [ -r "$sh" ] && . "$sh"
             done
@@ -47,17 +47,19 @@
             done
           '';
 
-        programs.bash.loginShellInit = ''
+        programs.bash.interactiveShellInit = ''
             for sh in ${./bashrc.d}/*; do
                 [ -r "$sh" ] && . "$sh"
             done
           '';
+        programs.bash.promptInit = ""; # Disable default prompt as we have our own
 
-        programs.zsh.loginShellInit = mkIf config.programs.zsh.enable ''
+        programs.zsh.interactiveShellInit = mkIf config.programs.zsh.enable ''
             for sh in ${./zshrc.d}/*; do
                 [ -r "$sh" ] && . "$sh"
             done
           '';
+        programs.zsh.promptInit = ""; # Disable default prompt as we have our own
 
         environment.systemPackages = [
           zsh-completion
-- 
cgit v1.2.3