From a9557c127e355b4cc56ea59142848d4cc7ce82e1 Mon Sep 17 00:00:00 2001
From: Loic Nageleisen <loic.nageleisen@gmail.com>
Date: Tue, 8 Aug 2023 09:17:11 +0200
Subject: [PATCH] Disable rprompt + handle disabled rprompt case

---
 bash/ext    |  6 +++++-
 bash/prompt |  6 +++++-
 zsh/prompt  | 18 +++++++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/bash/ext b/bash/ext
index fa5c492..16221bf 100644
--- a/bash/ext
+++ b/bash/ext
@@ -101,7 +101,11 @@ function apply_prompt_rprompt() {
     local prompt=$(echo "${PROMPT}" | sub_prompt_colors_sized)
     #local rprompt=$(echo "${RPROMPT}" | strip_prompt_colors)
     #local prompt=$(echo "${PROMPT}" | strip_prompt_colors)
-    PS1="$(printf "\[%*s\r\]%s" "${COLUMNS}" "${rprompt:-}" "${prompt:-}")"
+    if [[ -n "${RPROMPT}" ]]; then
+        PS1="$(printf "\[%*s\r\]%s" "${COLUMNS}" "${rprompt:-}" "${prompt:-}")"
+    else
+        PS1="${prompt:-}"
+    fi
 }
 
 # vim: ft=bash
diff --git a/bash/prompt b/bash/prompt
index e635b36..5a22a6e 100644
--- a/bash/prompt
+++ b/bash/prompt
@@ -116,7 +116,11 @@ set_prompt() {
 
     [[ ${CMD_RC} -ne 0 ]] && rbuffer=" %F{red}${CMD_RC}${rbuffer}"
 
-    RPROMPT="${rbuffer}%f"
+    if [[ -n "${rbuffer}" ]]; then
+      RPROMPT="${rbuffer}%f"
+    else
+      RPROMPT=""
+    fi
 }
 
 # vim: ft=bash
diff --git a/zsh/prompt b/zsh/prompt
index 65d7788..1a9f56b 100644
--- a/zsh/prompt
+++ b/zsh/prompt
@@ -179,15 +179,19 @@ set_prompt() {
 
     local rbuffer=""
 
-    if [[ ${CMD_DURATION:-0} -gt 0 ]]; then
-        printf -v formatted_duration "%.3f" "${CMD_DURATION}"
+    # if [[ ${CMD_DURATION:-0} -gt 0 ]]; then
+    #     printf -v formatted_duration "%.3f" "${CMD_DURATION}"
 
-        rbuffer=" %F{yellow}${formatted_duration}s${rbuffer}"
+    #     rbuffer=" %F{yellow}${formatted_duration}s${rbuffer}"
+    # fi
+
+    # [[ ${CMD_RC} -ne 0 ]] && rbuffer=" %F{red}${CMD_RC}${rbuffer}"
+
+    if [[ -n "${rbuffer}" ]]; then
+        RPROMPT="${rbuffer}%f"
+    else
+        RPROMPT=""
     fi
-
-    [[ ${CMD_RC} -ne 0 ]] && rbuffer=" %F{red}${CMD_RC}${rbuffer}"
-
-    RPROMPT="${rbuffer}%f"
 }
 
 # vim: ft=zsh