From 380a546e8d9ac9512cffcc733b35cc445afca582 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Sat, 15 Apr 2023 23:16:14 +0000 Subject: [PATCH] Update 13 files - /home/.chezmoiscripts/linux/run_onchange_before_01-requirements.sh.tmpl - /home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.sh.tmpl - /home/.chezmoiscripts/linux/run_onchange_before_11-configure-swap.sh.tmpl - /home/.chezmoiscripts/linux/run_onchange_before_14-warp.sh.tmpl - /home/.chezmoiscripts/universal/run_onchange_before_01-requirements.sh.tmpl - /home/.chezmoiscripts/universal/run_onchange_before_10-system-tweaks.sh.tmpl - /home/.chezmoiscripts/universal/run_onchange_before_11-configure-swap.sh.tmpl - /home/.chezmoiscripts/universal/run_onchange_before_14-warp.sh.tmpl - /home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.sh.tmpl - /home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.sh.tmpl - /home/.chezmoiscripts/darwin/run_onchange_after_21-set-wallpaper.sh.tmpl - /home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.sh.tmpl - /home/.chezmoiscripts/darwin/run_onchange_after_10-configure-macos.sh.tmpl --- .../darwin/run_onchange_after_10-configure-macos.sh.tmpl | 2 ++ .../darwin/run_onchange_after_20-ensure-zsh-macos.sh.tmpl | 2 ++ .../darwin/run_onchange_after_21-set-wallpaper.sh.tmpl | 2 ++ .../run_onchange_before_10-install-darwin-dependencies.sh.tmpl | 2 ++ .../darwin/run_onchange_before_20-ensure-user-group.sh.tmpl | 2 ++ .../run_onchange_before_01-requirements.sh.tmpl | 0 .../run_onchange_before_10-system-tweaks.sh.tmpl | 0 .../run_onchange_before_11-configure-swap.sh.tmpl | 0 .../{linux => universal}/run_onchange_before_14-warp.sh.tmpl | 0 9 files changed, 10 insertions(+) rename home/.chezmoiscripts/{linux => universal}/run_onchange_before_01-requirements.sh.tmpl (100%) rename home/.chezmoiscripts/{linux => universal}/run_onchange_before_10-system-tweaks.sh.tmpl (100%) rename home/.chezmoiscripts/{linux => universal}/run_onchange_before_11-configure-swap.sh.tmpl (100%) rename home/.chezmoiscripts/{linux => universal}/run_onchange_before_14-warp.sh.tmpl (100%) diff --git a/home/.chezmoiscripts/darwin/run_onchange_after_10-configure-macos.sh.tmpl b/home/.chezmoiscripts/darwin/run_onchange_after_10-configure-macos.sh.tmpl index 22862444..a033bafe 100644 --- a/home/.chezmoiscripts/darwin/run_onchange_after_10-configure-macos.sh.tmpl +++ b/home/.chezmoiscripts/darwin/run_onchange_after_10-configure-macos.sh.tmpl @@ -1,3 +1,4 @@ +{{- if (ne .host.distro.family "darwin") -}} #!/usr/bin/env bash # @file macOS System Settings # @brief Applies an optimized set of macOS system configurations intended to provide more sensible system defaults @@ -952,3 +953,4 @@ done logg success 'Done applying macOS settings' logg info 'Some of these changes may require a logout/restart to take effect' +{{ end -}} diff --git a/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.sh.tmpl b/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.sh.tmpl index c7bc8b48..4f4cedfd 100644 --- a/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.sh.tmpl +++ b/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.sh.tmpl @@ -1,3 +1,4 @@ +{{- if (ne .host.distro.family "darwin") -}} #!/usr/bin/env bash # @file macOS Ensure ZSH Default Shell # @brief Ensures ZSH is configured to be used as the default command-line shell @@ -20,3 +21,4 @@ if [[ ! -e /usr/local/bin/zsh ]]; then fi {{- end -}} {{- end }} +{{ end -}} diff --git a/home/.chezmoiscripts/darwin/run_onchange_after_21-set-wallpaper.sh.tmpl b/home/.chezmoiscripts/darwin/run_onchange_after_21-set-wallpaper.sh.tmpl index 3faa5815..1db93b85 100644 --- a/home/.chezmoiscripts/darwin/run_onchange_after_21-set-wallpaper.sh.tmpl +++ b/home/.chezmoiscripts/darwin/run_onchange_after_21-set-wallpaper.sh.tmpl @@ -1,3 +1,4 @@ +{{- if (ne .host.distro.family "darwin") -}} #!/usr/bin/env bash # @file macOS Set Wallpaper # @brief Ensures the macOS wallpaper is set to the Betelgeuse wallpaper for macOS. @@ -13,3 +14,4 @@ if command -v m > /dev/null && [ -f "$HOME/.local/src/betelgeuse/share/wallpaper else logg warn 'Either `m` or the macOS default wallpaper is missing.' fi +{{ end -}} diff --git a/home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.sh.tmpl b/home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.sh.tmpl index c9becb0e..4ab59997 100644 --- a/home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.sh.tmpl +++ b/home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.sh.tmpl @@ -1,3 +1,4 @@ +{{- if (ne .host.distro.family "darwin") -}} #!/usr/bin/env bash # @file macOS Common Dependencies # @brief Ensures common system dependencies are installed via Homebrew on macOS @@ -21,3 +22,4 @@ if command -v brew > /dev/null; then else logg error '`brew` was not found in the PATH' fi +{{ end -}} diff --git a/home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.sh.tmpl b/home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.sh.tmpl index 07137a9a..e76eec3b 100644 --- a/home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.sh.tmpl +++ b/home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.sh.tmpl @@ -1,3 +1,4 @@ +{{- if (ne .host.distro.family "darwin") -}} #!/usr/bin/env bash # @file macOS Ensure User Group # @brief Ensures that the provisioning user has a group on the system with the same name @@ -10,3 +11,4 @@ ### Ensure user has group of same name (required for Macports) logg info 'Ensuring user has a group with the same name and that it is a member. Sudo privileges may be required' echo y | sudo dseditgroup -o create "$USER" > /dev/null +{{ end -}} diff --git a/home/.chezmoiscripts/linux/run_onchange_before_01-requirements.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_01-requirements.sh.tmpl similarity index 100% rename from home/.chezmoiscripts/linux/run_onchange_before_01-requirements.sh.tmpl rename to home/.chezmoiscripts/universal/run_onchange_before_01-requirements.sh.tmpl diff --git a/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_10-system-tweaks.sh.tmpl similarity index 100% rename from home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.sh.tmpl rename to home/.chezmoiscripts/universal/run_onchange_before_10-system-tweaks.sh.tmpl diff --git a/home/.chezmoiscripts/linux/run_onchange_before_11-configure-swap.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_11-configure-swap.sh.tmpl similarity index 100% rename from home/.chezmoiscripts/linux/run_onchange_before_11-configure-swap.sh.tmpl rename to home/.chezmoiscripts/universal/run_onchange_before_11-configure-swap.sh.tmpl diff --git a/home/.chezmoiscripts/linux/run_onchange_before_14-warp.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_14-warp.sh.tmpl similarity index 100% rename from home/.chezmoiscripts/linux/run_onchange_before_14-warp.sh.tmpl rename to home/.chezmoiscripts/universal/run_onchange_before_14-warp.sh.tmpl