From b0671d39e7e14d1c976f2f98fbcd60a7b9ff6118 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Thu, 31 Aug 2023 23:07:36 +0100
Subject: [PATCH] Fix ZSH prompt

---
 roles/home-cli/files/profile | 12 ++++++------
 roles/home-cli/files/shrc    |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile
index 1bb368f..39d9a27 100644
--- a/roles/home-cli/files/profile
+++ b/roles/home-cli/files/profile
@@ -91,6 +91,11 @@ then
 fi
 unset _flatpak_xdg_path
 
+# Basic exports.
+export HISTFILE=""
+export PS1='\u@\h\$ '
+export TIME_STYLE=long-iso  # Used by GNU 'ls'.
+
 # Bash-specific settings that will not work in other Bourne-compatible shells.
 if [ -n "$BASH_VERSION" ]
 then
@@ -123,7 +128,7 @@ then
     bindkey "^[OA" history-beginning-search-backward-end
     bindkey "^[OB" history-beginning-search-forward-end
 
-    PS1="%B%n@%m%#%b "
+    PS1="%n@%m%# "
 
 else
     # POSIX-compatible prompt.
@@ -184,11 +189,6 @@ do
     _acp_add_path "$dir"
 done
 
-# Other exports.
-export HISTFILE=""
-export PS1='\u@\h\$ '
-export TIME_STYLE=long-iso  # Used by GNU 'ls'.
-
 if [ "$XDG_SESSION_TYPE" = "wayland" ]
 then
     export MOZ_ENABLE_WAYLAND=1
diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc
index 54e94f3..8ba0d9a 100644
--- a/roles/home-cli/files/shrc
+++ b/roles/home-cli/files/shrc
@@ -11,7 +11,10 @@ case "$-" in
     then
         . /etc/profile.d/bash_completion.sh
     fi
-    set -o emacs
+    if [ -z "$ZSH_VERSION" ]
+    then
+        set -o emacs
+    fi
     usermotd
     ;;
 *)