From 5f1a24d6e128e01d6789ffaa6c01bb0ed41069a0 Mon Sep 17 00:00:00 2001
From: Kyler Clay <kylerclay@proton.me>
Date: Wed, 2 Oct 2024 03:41:18 -0400
Subject: [PATCH] Commit for generation 158

---
 glasshouse-desktop/modules/zshell.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/glasshouse-desktop/modules/zshell.nix b/glasshouse-desktop/modules/zshell.nix
index 01c0991..268428c 100644
--- a/glasshouse-desktop/modules/zshell.nix
+++ b/glasshouse-desktop/modules/zshell.nix
@@ -131,7 +131,7 @@ ls() {
 
 # cd and ls after
 cd() {
-	builtin cd "$@" && command ls --group-directories-first --color=always -F1 "$@" | sort -f -k1
+	command ls --group-directories-first --color=always -F1 "$@" | sort -f -k1 && builtin cd "$@"
 	sounds_enabled && (aplay ~/sound/sys/cd.wav > /dev/null 2>&1 &)
 }
 src() {
@@ -184,8 +184,9 @@ safe_rm() {
             fi
 
             # Perform the removal if no checks or confirmation is "y"
+			played_sound=0
             if [ "$check" = false ] || [ "$confirm" = "y" ]; then
-				sounds_enabled && (aplay ~/sound/sys/rm.wav > /dev/null 2>&1 &)
+				[ $played_sound -eq 0 ] && sounds_enabled && (aplay ~/sound/sys/rm.wav > /dev/null 2>&1 &) && played_sound=1
                 /run/current-system/sw/bin/rm -rfv "$dir"
             else
                 echo "Operation cancelled for '$dir'."