diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix
index bcdeb1c..75fb948 100644
--- a/modules/cli/zsh/default.nix
+++ b/modules/cli/zsh/default.nix
@@ -26,7 +26,6 @@
       bat = "bat -p";
 
       # git stuff
-      s = "git status";
       gs = "git status";
       gl = "git log";
       gu = "git pull";
diff --git a/modules/cli/zsh/init.zsh b/modules/cli/zsh/init.zsh
index 893d538..9241559 100644
--- a/modules/cli/zsh/init.zsh
+++ b/modules/cli/zsh/init.zsh
@@ -89,6 +89,13 @@ proxy() {
 	ssh -NR "5000:localhost:$1" zoriya@ssh.sdg.moe
 }
 
+s() {
+	git status 2>/dev/null
+	if [[ $? -ne 0 ]]; then
+		gfold
+	fi
+}
+
 # keep yq's output in yaml & colorizes it
 yq() {
 	# if `-r` is in the arguments, do not add the -Y flag because it breaks yq.