From 3a43ad343bba42d7aa39a5fc9e5c5426082b52fd Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Tue, 30 Sep 2025 13:09:07 +0200
Subject: [PATCH] Disable extended glob

---
 modules/cli/zsh/default.nix | 3 +--
 modules/cli/zsh/init.zsh    | 5 -----
 modules/cli/zsh/prompt.zsh  | 6 +++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix
index e8b16a4..e1826a1 100644
--- a/modules/cli/zsh/default.nix
+++ b/modules/cli/zsh/default.nix
@@ -73,7 +73,7 @@
 
       # Misc
       dc = "docker compose";
-      dcd = "docker compose -f (../)#docker-compose.dev.yml";
+      dcd = "docker compose -f $(setopt extendedglob; echo (../)#docker-compose.dev.yml)";
       op =
         if pkgs.stdenv.isLinux
         then "xdg-open"
@@ -206,7 +206,6 @@
             setopt rm_star_silent
             setopt interactivecomments
             setopt autopushd
-            setopt extendedglob
 
             # disable space between right prompt and end of line
             ZLE_RPROMPT_INDENT=0
diff --git a/modules/cli/zsh/init.zsh b/modules/cli/zsh/init.zsh
index 9241559..c68939f 100644
--- a/modules/cli/zsh/init.zsh
+++ b/modules/cli/zsh/init.zsh
@@ -84,11 +84,6 @@ touchp() {
 	mkdir -p "$(dirname "$1")" && touch "$1"
 }
 
-proxy() {
-	echo "Proxying port $1 to http://proxy.sdg.moe"
-	ssh -NR "5000:localhost:$1" zoriya@ssh.sdg.moe
-}
-
 s() {
 	git status 2>/dev/null
 	if [[ $? -ne 0 ]]; then
diff --git a/modules/cli/zsh/prompt.zsh b/modules/cli/zsh/prompt.zsh
index 2eeb5a9..18715ae 100644
--- a/modules/cli/zsh/prompt.zsh
+++ b/modules/cli/zsh/prompt.zsh
@@ -45,13 +45,13 @@ NEWLINE=$'\n'
 WORKDIR='%B%F{blue}%~%b%f'
 RO='%F{red}$([ -w . ] || echo ':ro")%f"
 # from gitstatusd, sourced before this prompt script
-GIT='($GITSTATUS_PROMPT)'
-KUBE='%F{cyan}$KCTX/$KNS%f'
+GIT='${GITSTATUS_PROMPT:+ ($GITSTATUS_PROMPT)}'
+KUBE='%F{cyan}$KCTX${KNS:+/$KNS}%f'
 PROMPT_SHLVL='%(?.%F{green}.%F{red})$(printf "❯%.0s" {1..$SHLVL})%f'
 
 EXEC_TIME=""
 EXIT_CODE=' %(?..%F{red}x${(j[|])pipestatus}%f)'
 JOBS=' %F{cyan}%(1j.&%j.)%f'
 
-export PROMPT="${FILL}${NEWLINE}$WORKDIR$RO $GIT $KUBE $PROMPT_SHLVL "
+export PROMPT="${FILL}${NEWLINE}${WORKDIR}$RO$GIT $KUBE $PROMPT_SHLVL "
 export RPROMPT="\${EXEC_TIME}${EXIT_CODE}${JOBS}"