From bdbbafaf2a2f1161dfc063eefd37457b9523a20c Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter.kurfer@googlemail.com>
Date: Wed, 25 Oct 2023 08:25:33 +0200
Subject: [PATCH] fix: MacOS paths

---
 .../zsh/{01-env.zsh => 01-env.zsh.tmpl}       | 39 ++++++++-----------
 dot_zshrc.tmpl                                | 18 +++++++--
 2 files changed, 31 insertions(+), 26 deletions(-)
 rename dot_config/zsh/{01-env.zsh => 01-env.zsh.tmpl} (71%)

diff --git a/dot_config/zsh/01-env.zsh b/dot_config/zsh/01-env.zsh.tmpl
similarity index 71%
rename from dot_config/zsh/01-env.zsh
rename to dot_config/zsh/01-env.zsh.tmpl
index 049ee29..208128a 100644
--- a/dot_config/zsh/01-env.zsh
+++ b/dot_config/zsh/01-env.zsh.tmpl
@@ -1,24 +1,17 @@
-# Directories {{{ #
-export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-export XDG_CACHE_HOME=$HOME/.cache
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_STATE_HOME=$HOME/.local/state
-# }}} Directories #
-
-# Wayland {{{{ #
+# Wayland  #
 export _JAVA_AWT_WM_NONREPARENTING=1
-# }}}} Wayland
+#  Wayland
 
-# Libvirt {{{{
+# Libvirt 
 export LIBVIRT_DEFAULT_URI="qemu:///session"
-# }}}} Libvirt #
+#  Libvirt #
 
-# dotnet {{{ #
+# dotnet  #
 export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-# }}} dotnet #
+#  dotnet #
 
 
-#  Env Programs {{{ #
+#  Env Programs #
 export EDITOR=nvim
 export BROWSER=/usr/bin/firefox
 export GIT_EDITOR=nvim
@@ -27,14 +20,14 @@ export TERMINAL=alacritty
 export SOPS_GPG_EXEC=gpg2
 export CHROME_EXECUTABLE=/usr/bin/chromium
 export TERM="xterm-256color"
-#  }}} Env Programs #
+#  Env Programs #
 
-# bat settings {{{ #
+# bat settings #
 export BAT_THEME="Solarized (dark)"
 export BAT_STYLE="full"
-# }}} bat #
+# bat #
 
-#  fzf settings {{{ #
+#  fzf settings  #
 _fzf_compgen_path() {
     fd --hidden --follow --exclude ".git" --exclude ".wine" . "$1"
 }
@@ -49,15 +42,15 @@ export FZF_TMUX_HEIGHT=30\%
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 export FZF_ALT_C_COMMAND='command cat <(fd -t d --exclude .git --exclude .wine) <(fd -t d --hidden --follow --exclude .git --exclude .wine . ~)'
 export FZF_ALT_C_OPTS="--preview '(highlight -O ansi -l {} 2> /dev/null || cat {} || tree -C {}) 2> /dev/null | head -200'"
-#  }}} fzf settings #
+#   fzf settings #
 
-# History {{{ #
+# History  #
 [ -z "$HISTFILE" ] && HISTFILE="$HOME/.cache/zsh/history"
 [ ! -d "$(dirname "$HISTFILE")" ] && mkdir -p "$(dirname "$HISTFILE")"
 export HISTSIZE=10000
 export SAVEHIST=10000
-# }}} History #
+#  History #
 
-# ZSH options {{{{ #
+# ZSH options #
 setopt autocd
-# }}}} ZSH options #
+#  ZSH options #
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index 84d2d81..e27802a 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -1,4 +1,16 @@
-export ZSH_CACHE_DIR=$HOME/.config/zsh/cache
+{{- if eq .chezmoi.os "darwin" }}
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export XDG_CACHE_HOME="$HOME/Library/Caches"
+export XDG_DATA_HOME="$HOME/Library"
+export XDG_STATE_HOME="$HOME/Library/state"
+{{- else if eq .chezmoi.os "linux" }}
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export XDG_CACHE_HOME=$HOME/.cache
+export XDG_DATA_HOME=$HOME/.local/share
+export XDG_STATE_HOME=$HOME/.local/state
+{{end}}
+
+export ZSH_CACHE_DIR="$XDG_CACHE_HOME/zsh"
 
 {{- if eq .chezmoi.os "darwin" }}
 export PATH="$PATH:/opt/homebrew/bin"
@@ -48,9 +60,9 @@ fi
 export PATH="$PATH:$HOME/.dotnet/tools"
 
 # Znap
-export ZNAP_HOME=$HOME/.local/share/znap
+export ZNAP_HOME="$XDG_DATA_HOME/znap"
 
-for file in $HOME/.config/zsh/*.zsh; do
+for file in $XDG_CONFIG_HOME/zsh/*.zsh; do
     source "$file"
 done