diff --git a/.local/share/chezmoi/home/.chezmoiignore b/.local/share/chezmoi/home/.chezmoiignore index 8639efd7..f95672e3 100644 --- a/.local/share/chezmoi/home/.chezmoiignore +++ b/.local/share/chezmoi/home/.chezmoiignore @@ -11,6 +11,10 @@ chezmoi.txt.age Library {{- end }} +{{- if ne .host.distro.id "linux" }} +dot_Xresources +{{- end }} + {{- if ne .host.distro.id "windows" }} AppData/ {{- end }} diff --git a/.local/share/chezmoi/home/.chezmoiremove b/.local/share/chezmoi/home/.chezmoiremove index b1ee9809..d0161622 100644 --- a/.local/share/chezmoi/home/.chezmoiremove +++ b/.local/share/chezmoi/home/.chezmoiremove @@ -34,3 +34,7 @@ Brewfile .zsh_sessions .zprofile .zshrc.zwc + +{{- if ne .host.distro.id "darwin" }} +.Xresources +{{- end }} diff --git a/.local/share/chezmoi/home/dot_local/bin/executable_provision b/.local/share/chezmoi/home/dot_local/bin/executable_provision index bf15c880..5a891532 100644 --- a/.local/share/chezmoi/home/dot_local/bin/executable_provision +++ b/.local/share/chezmoi/home/dot_local/bin/executable_provision @@ -181,7 +181,7 @@ fi find /usr/local/src/hiawatha -maxdepth 1 -mindepth 1 -type d | while read FOLDER; do BASENAME="$(basename "$FOLDER")" # Prevent initial-scaffolding of OS-specific files since Chezmoi will handle them - if [[ "$BASENAME" != 'AppData' ]] && [[ "$BASENAME" != 'Library' ]]; then + if [[ "$BASENAME" != 'AppData' ]] && [[ "$BASENAME" != 'Library' ]] && [ "$BASENAME" != '.git' ]; then if [ ! -d "$HOME/$BASENAME" ]; then mkdir -p "$HOME/$BASENAME" fi