diff --git a/home/.chezmoi.yaml.tmpl b/home/.chezmoi.yaml.tmpl index fa4a4032..aef0480a 100644 --- a/home/.chezmoi.yaml.tmpl +++ b/home/.chezmoi.yaml.tmpl @@ -207,7 +207,6 @@ data: username: "{{ default "user" (env "USER") }}" weatherZipCode: 07960 diff: - command: delta pager: delta format: git args: diff --git a/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl b/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl index cb41e68f..62567383 100644 --- a/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl @@ -18,8 +18,14 @@ applyFontsToSystem() { ### macOS logg info 'Copying fonts from ~/Library/Fonts and ~/.local/share/fonts to /Library/Fonts to make them available globally' FONT_DIR='/Library/Fonts' - sudo rsync -av "$HOME/Library/Fonts" "$FONT_DIR" - sudo rsync -av "${XDG_DATA_HOME:-$HOME/.local/share}/fonts" "$FONT_DIR" + ### ~/Library/Fonts + if [ -d "$HOME/Library/Fonts" ]; then + logg info "Syncing $HOME/Library/Fonts to $FONT_DIR" && sudo rsync -av "$HOME/Library/Fonts" "$FONT_DIR" + fi + ### ~/.local/share/fonts + if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/fonts" ]; then + logg info "Syncing ${XDG_DATA_HOME:-$HOME/.local/share}/fonts to $FONT_DIR" && sudo rsync -av "${XDG_DATA_HOME:-$HOME/.local/share}/fonts" "$FONT_DIR" + fi else ### Linux ### Copy fonts diff --git a/home/dot_config/docker/config.json.tmpl b/home/dot_config/docker/config.json.tmpl index f8122a0f..1b382f37 100644 --- a/home/dot_config/docker/config.json.tmpl +++ b/home/dot_config/docker/config.json.tmpl @@ -4,4 +4,4 @@ }, "credsStore": "{{ if (eq .host.distro.id "darwin") }}osxkeychain{{ else }}{{ if (eq .host.distro.id "windows") }}wincred{{ else }}secretservice{{ end }}{{ end }}", "currentContext": "desktop-linux" -} +} \ No newline at end of file