fix: Remains of merge conflict.

sketchybar/plugins/clock.sh

@@ -4,5 +4,4 @@
 # the item invoking this script:
 # https://felixkratz.github.io/SketchyBar/config/events#events-and-scripting
 
-sketchybar --set "$NAME" label="$(date '+%d/%m %H:%M')"
-
+sketchybar --set "$NAME" label="$(date '+%m/%d %H:%M')"

zsh/config/.zshrc

@@ -216,7 +216,6 @@ source <(kubectl completion zsh)
 #       I tried sourcing them in the the `.zshenv` files, but did not work.
 _source_if "$ZDOTDIR/.zshrc-local"
 _source_if "$LOCAL_ENV"
-<<<<<<< HEAD
 
 # pnpm
 export PNPM_HOME="/Users/michael/.local/share/pnpm"
@@ -230,4 +229,8 @@ esac
 fpath=(/Users/michael/.docker/completions $fpath)
 autoload -Uz compinit
 compinit
+
 # End of Docker CLI completions
+gpgconf --launch gpg-agent
+export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
+